Commit 505e40eb authored by Mygod's avatar Mygod Committed by Max Lv

Integrate bash scripts into sbt (#692)

parent a1871f79
...@@ -13,7 +13,7 @@ addons: ...@@ -13,7 +13,7 @@ addons:
- libncurses5:i386 - libncurses5:i386
scala: scala:
- 2.11.7 - 2.11.8
before_cache: before_cache:
- find $HOME/.sbt -name "*.lock" | xargs rm - find $HOME/.sbt -name "*.lock" | xargs rm
...@@ -34,5 +34,4 @@ before_install: ...@@ -34,5 +34,4 @@ before_install:
- cp local.properties.travis local.properties - cp local.properties.travis local.properties
script: script:
- ./build.sh > /dev/null - sbt native-build android:package-release
- sbt android:package-release
...@@ -26,12 +26,9 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala. ...@@ -26,12 +26,9 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
```bash ```bash
git submodule update --init git submodule update --init
# Build native binaries
./build.sh
# Build the App # Build the App
sbt clean android:package-release sbt native-build clean android:package-release
``` ```
#### BUILD on Mac OS X (with HomeBrew) #### BUILD on Mac OS X (with HomeBrew)
......
...@@ -53,3 +53,13 @@ proguardOptions in Android ++= Seq("-keep class com.github.shadowsocks.** { <ini ...@@ -53,3 +53,13 @@ proguardOptions in Android ++= Seq("-keep class com.github.shadowsocks.** { <ini
"-dontnote com.j256.ormlite.**", "-dontnote com.j256.ormlite.**",
"-dontnote org.xbill.**", "-dontnote org.xbill.**",
"-dontwarn 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" !
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment