diff --git a/sample/.gitignore b/app/.gitignore similarity index 100% rename from sample/.gitignore rename to app/.gitignore diff --git a/sample/android.keystore b/app/android.keystore similarity index 100% rename from sample/android.keystore rename to app/android.keystore diff --git a/sample/build.gradle b/app/build.gradle similarity index 100% rename from sample/build.gradle rename to app/build.gradle diff --git a/sample/custom.txt b/app/custom.txt similarity index 100% rename from sample/custom.txt rename to app/custom.txt diff --git a/sample/gradle.properties b/app/gradle.properties similarity index 100% rename from sample/gradle.properties rename to app/gradle.properties diff --git a/sample/local.properties b/app/local.properties similarity index 100% rename from sample/local.properties rename to app/local.properties diff --git a/sample/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from sample/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/sample/src/main/gen/com/mcxiaoke/mpp/sample/BuildConfig.java b/app/src/main/gen/com/mcxiaoke/mpp/sample/BuildConfig.java similarity index 100% rename from sample/src/main/gen/com/mcxiaoke/mpp/sample/BuildConfig.java rename to app/src/main/gen/com/mcxiaoke/mpp/sample/BuildConfig.java diff --git a/sample/src/main/gen/com/mcxiaoke/mpp/sample/Manifest.java b/app/src/main/gen/com/mcxiaoke/mpp/sample/Manifest.java similarity index 100% rename from sample/src/main/gen/com/mcxiaoke/mpp/sample/Manifest.java rename to app/src/main/gen/com/mcxiaoke/mpp/sample/Manifest.java diff --git a/sample/src/main/gen/com/mcxiaoke/mpp/sample/R.java b/app/src/main/gen/com/mcxiaoke/mpp/sample/R.java similarity index 100% rename from sample/src/main/gen/com/mcxiaoke/mpp/sample/R.java rename to app/src/main/gen/com/mcxiaoke/mpp/sample/R.java diff --git a/sample/src/main/java/com/mcxiaoke/packer/samples/MainActivity.java b/app/src/main/java/com/mcxiaoke/packer/samples/MainActivity.java similarity index 100% rename from sample/src/main/java/com/mcxiaoke/packer/samples/MainActivity.java rename to app/src/main/java/com/mcxiaoke/packer/samples/MainActivity.java diff --git a/sample/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/huge_markets_test.py b/huge_markets_test.py index 071718e..7453547 100755 --- a/huge_markets_test.py +++ b/huge_markets_test.py @@ -4,11 +4,12 @@ # @Date: 2015-11-25 14:30:02 import subprocess import os +import sys -with open('huge_markets.txt','w+') as f: - for i in range(1000): - f.write("Test Market %s#test market %s\n" % (i,i)) - f.write("中文:MARKET%s#test market %s\n" % (i,i)) +with open('huge_markets.txt', 'w') as f: + for i in range(int(sys.argv[1])): + f.write("Test Market %s#test market %s\n" % (i, i)) + f.write("中文:MARKET%s#test market %s\n" % (i, i)) -subprocess.call(["./gradlew", "-Pmarket=huge_markets.txt", "clean", "archiveApkRelease"]) +subprocess.check_output(["./gradlew", "-Pchannels=@huge_markets.txt", "-Poutput=tmp", "clean", "apkPaidRelease"]) os.remove('huge_markets.txt') diff --git a/settings.gradle b/settings.gradle index 0ab5d7e..d515779 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,4 +2,4 @@ include ':common' include ':plugin' include ':cli' include ':helper' -include ':sample' +include ':app' diff --git a/test-build.sh b/test-build.sh index 09d93bb..e8829fe 100755 --- a/test-build.sh +++ b/test-build.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash ./deploy-local.sh echo "test clean build" -./gradlew clean build --stacktrace $1 $2 +./gradlew clean assemblePaidRelease --stacktrace $1 $2 diff --git a/test-market.sh b/test-market.sh index 7dd4aeb..c0bd378 100755 --- a/test-market.sh +++ b/test-market.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash ./deploy-local.sh echo "------ build for markets running..." -./gradlew -Pmarket=markets.txt clean apkRelease $1 $2 +./gradlew -Pchannels=@channels/channels.txt clean apkRelease $1 $2 echo "------ build for markets finished!"