update version

xmake-io · Apr 16, 2020 · b9a56a6 · b9a56a6
1 parent f19fad2
commit b9a56a6
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ XMake installed on the system. Available [here](https://github.com/xmake-io/xmak
 
 ```
 plugins {
-  id 'org.tboox.gradle-xmake-plugin' version '1.0.3'
+  id 'org.tboox.gradle-xmake-plugin' version '1.0.4'
 }
 ```
 
@@ -69,7 +69,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath 'org.tboox:gradle-xmake-plugin:1.0.3'
+    classpath 'org.tboox:gradle-xmake-plugin:1.0.4'
   }
   repositories {
     mavenCentral()
@@ -154,6 +154,9 @@ android {
             // set c++stl (optional), e.g. c++_static/c++_shared, gnustl_static/gnustl_shared, stlport_static/stlport_shared
             stl "c++_shared"
 
+            // set the given xmake program path (optional)
+            // program /usr/local/bin/xmake
+
             // disable stdc++ library (optional)
             // stdcxx false
 

diff --git a/README_zh.md b/README_zh.md
@@ -57,7 +57,7 @@ xmake-gradle是一个无缝整合xmake的gradle插件。
 
 ```
 plugins {
-  id 'org.tboox.gradle-xmake-plugin' version '1.0.3'
+  id 'org.tboox.gradle-xmake-plugin' version '1.0.4'
 }
 ```
 
@@ -71,7 +71,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath 'org.tboox:gradle-xmake-plugin:1.0.3'
+    classpath 'org.tboox:gradle-xmake-plugin:1.0.4'
   }
   repositories {
     mavenCentral()
@@ -156,6 +156,9 @@ android {
             // 指定c++ stl库，默认不指定会使用c++_static，其他值：c++_static/c++_shared, gnustl_static/gnustl_shared, stlport_static/stlport_shared
             stl "c++_shared"
 
+            // 设置xmake可执行程序路径（通常不用设置）
+            // program /usr/local/bin/xmake
+
             // 禁用stdc++库，默认是启用的
             // stdcxx false
 

diff --git a/gradle-xmake-plugin/build.gradle b/gradle-xmake-plugin/build.gradle
@@ -8,7 +8,7 @@ plugins {
 apply plugin: 'groovy'
 
 group = "org.tboox"
-version = "1.0.3"
+version = "1.0.4"
 
 repositories {
     // Use jcenter for resolving your dependencies.

diff --git a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeBuildTask.groovy b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeBuildTask.groovy
@@ -38,8 +38,8 @@ class XMakeBuildTask extends DefaultTask {
     // build command line
     private List<String> buildCmdLine() {
         List<String> parameters = new ArrayList<>();
-        parameters.add("xmake");
-        parameters.add("build");
+        parameters.add(taskContext.program)
+        parameters.add("build")
         switch (taskContext.logLevel) {
             case "warning":
                 parameters.add("-w")
@@ -65,8 +65,8 @@ class XMakeBuildTask extends DefaultTask {
     // build install command line
     private List<String> buildInstallCmdLine() {
         List<String> parameters = new ArrayList<>();
-        parameters.add("xmake");
-        parameters.add("install");
+        parameters.add(taskContext.program)
+        parameters.add("install")
         switch (taskContext.logLevel) {
             case "verbose":
                 parameters.add("-v")

diff --git a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeCleanTask.groovy b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeCleanTask.groovy
@@ -38,8 +38,8 @@ class XMakeCleanTask extends DefaultTask {
     // build command line
     private List<String> buildCmdLine() {
         List<String> parameters = new ArrayList<>();
-        parameters.add("xmake");
-        parameters.add("clean");
+        parameters.add(taskContext.program)
+        parameters.add("clean")
         switch (taskContext.logLevel) {
             case "verbose":
                 parameters.add("-v")

diff --git a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeConfigureTask.groovy b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeConfigureTask.groovy
@@ -38,9 +38,9 @@ class XMakeConfigureTask extends DefaultTask {
     // build command line
     private List<String> buildCmdLine() {
         List<String> parameters = new ArrayList<>();
-        parameters.add("xmake");
-        parameters.add("f");
-        parameters.add("-y");
+        parameters.add(taskContext.program)
+        parameters.add("f")
+        parameters.add("-y")
         switch (taskContext.logLevel) {
             case "verbose":
                 parameters.add("-v")

diff --git a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeInstallTask.groovy b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeInstallTask.groovy
@@ -40,7 +40,7 @@ class XMakeInstallTask extends DefaultTask {
     // build command line
     private List<String> buildCmdLine(File installArtifactsScriptFile) {
         List<String> parameters = new ArrayList<>();
-        parameters.add("xmake");
+        parameters.add(taskContext.program)
         parameters.add("lua");
         switch (taskContext.logLevel) {
             case "verbose":

diff --git a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakePluginExtension.groovy b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakePluginExtension.groovy
@@ -24,8 +24,8 @@ import com.sun.org.apache.xpath.internal.operations.Bool
 
 class XMakePluginExtension {
 
-    // TODO
     // xmake program
+    String program
 
     // the project path (e.g. jni/xmake.lua)
     String path

diff --git a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeRebuildTask.groovy b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeRebuildTask.groovy
@@ -38,8 +38,8 @@ class XMakeRebuildTask extends DefaultTask {
     // build command line
     private List<String> buildCmdLine() {
         List<String> parameters = new ArrayList<>();
-        parameters.add("xmake");
-        parameters.add("-r");
+        parameters.add(taskContext.program)
+        parameters.add("-r")
         switch (taskContext.logLevel) {
             case "warning":
                 parameters.add("-w")
@@ -65,8 +65,8 @@ class XMakeRebuildTask extends DefaultTask {
     // build install command line
     private List<String> buildInstallCmdLine() {
         List<String> parameters = new ArrayList<>();
-        parameters.add("xmake");
-        parameters.add("install");
+        parameters.add(taskContext.program)
+        parameters.add("install")
         switch (taskContext.logLevel) {
             case "verbose":
                 parameters.add("-v")

diff --git a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeTaskContext.groovy b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeTaskContext.groovy
@@ -51,6 +51,15 @@ class XMakeTaskContext {
         this.buildArch = buildArch
     }
 
+    // get xmake program
+    String getProgram() {
+        String program = extension.program
+        if (program == null) {
+            program = "xmake"
+        }
+        return program
+    }
+
     // get project file
     File getProjectFile() {
         String path = extension.path

diff --git a/nativelib/build.gradle b/nativelib/build.gradle
@@ -50,6 +50,7 @@ android {
         xmake {
             logLevel "verbose"
             path "jni/xmake.lua"
+            //program /usr/local/bin/xmake
             //stl "c++_shared"
             //stdcxx false
             //ndk "/Users/ruki/files/android-ndk-r20b/"