Integrate bash scripts into sbt (shadowsocks#692)

roke001 · May 23, 2016 · 505e40e · 505e40e
1 parent a1871f7
commit 505e40e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ addons:
             - libncurses5:i386
 
 scala:
-    - 2.11.7
+    - 2.11.8
 
 before_cache:
     - find $HOME/.sbt -name "*.lock" | xargs rm
@@ -34,5 +34,4 @@ before_install:
     - cp local.properties.travis local.properties
 
 script:
-    - ./build.sh > /dev/null
-    - sbt android:package-release
+    - sbt native-build android:package-release
diff --git a/README.md b/README.md
@@ -26,12 +26,9 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
 
 ```bash
     git submodule update --init
-
-    # Build native binaries
-    ./build.sh
 
     # Build the App
-    sbt clean android:package-release
+    sbt native-build clean android:package-release
 ```
 
 #### BUILD on Mac OS X (with HomeBrew)

diff --git a/build.sbt b/build.sbt
@@ -53,3 +53,13 @@ proguardOptions in Android ++= Seq("-keep class com.github.shadowsocks.** { <ini
           "-dontnote com.j256.ormlite.**",
           "-dontnote org.xbill.**",
           "-dontwarn org.xbill.**")
+
+lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables")
+lazy val launcher = TaskKey[Unit]("launcher", "Generate launcher icons")
+
+nativeBuild := {
+  "./build.sh" !
+}
+launcher := {
+  "./launcher.sh" !
+}
diff --git a/laucher.sh → launcher.sh b/laucher.sh → launcher.sh