Skip to content

唐文 / AiyoZhuaWaWa

Go to a project
Commit 48271b90 by chengfengpiaopiao
Options

walle bash一键打包

parent e8cc2158
Inline Side-by-side
Showing with 99 additions and 54 deletions
.idea/encodings.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$/cmdlog.txt" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
.idea/misc.xml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
.idea/modules.xml
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/DuoBaoJingCai.iml" filepath="$PROJECT_DIR$/DuoBaoJingCai.iml" /> <module fileurl="file://$PROJECT_DIR$/DuoBaoJingCai2.iml" filepath="$PROJECT_DIR$/DuoBaoJingCai2.iml" />
<module fileurl="file://G:\Product\Android\DuoBaoJingCai\DuoBaoJingCai2.iml" filepath="G:\Product\Android\DuoBaoJingCai\DuoBaoJingCai2.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/multi-image-selector/multi-image-selector.iml" filepath="$PROJECT_DIR$/multi-image-selector/multi-image-selector.iml" /> <module fileurl="file://$PROJECT_DIR$/multi-image-selector/multi-image-selector.iml" filepath="$PROJECT_DIR$/multi-image-selector/multi-image-selector.iml" />
</modules> </modules>
......
app/build.gradle
...@@ -170,17 +170,16 @@ android { ...@@ -170,17 +170,16 @@ android {
//权限申请 //权限申请
compile 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.3@aar' compile 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.3@aar'
} }
} }
task hello1 << { task hello1 << {
println 'hello1'+"app.build.gradle" println 'hello1'+"app.build.gradle"
} }
//执行Shell命令 //执行Shell命令 gradlew -q
task execShell (type:Exec){ task execShell (type:Exec){
executable 'sh' executable 'sh'
args "shell.sh" args "-c", "shell.sh $APP_VERSION $networkType"
} }
task startApp(type: Exec){ task startApp(type: Exec){
...@@ -207,21 +206,42 @@ task count << { ...@@ -207,21 +206,42 @@ task count << {
// println "hello end" // println "hello end"
//} //}
//执行 gradlew assembleRelease shellTest
def apkPath = "G:Apks/${projectName}" +"/"+
"${projectNameLowerCase}_baseflavor_v${APP_VERSION}${suffixName[networkType]}.apk "
def sdkRoot = "true".equals(IN_COMPONENY)?
"D:/2_android/as_client/sdk/build-tools/25.0.0":
"D:/Android/AndroidSDK/build-tools/25.0.0";
def cmd = "jiagubao-walle.bat "+apkPath+
"G:/Apks/DuoBaoJingCai/v2/${projectNameLowerCase}_v${APP_VERSION}${suffixName[networkType]}_v2.apk "+
"G:/Apks/DuoBaoJingCai/walleBase/${projectNameLowerCase}_v${APP_VERSION}${suffixName[networkType]}.apk "+
sdkRoot
// gradle版本为5.1
//task jiagubao-walle{
// doLast {
// String date = cmd.execute().text.trim().toString() //带返回值
// print date //打印系统日期
// }
//}
//gradlew assembleRelease jiagubao_walle
def gitVersionCode() { task jiagubao_walle(dependsOn: 'cleanFile') << {
def cmd = 'git rev-list HEAD --first-parent --count' String date = cmd.execute().text.trim().toString() //带返回值
cmd.execute().text.trim().toInteger() print date
} }
///jiagubao-walle.bat 1 2 task cleanFile << {
def apkPath = "G:/Apks/${projectName}" +"/"+ "${projectNameLowerCase}_baseflavor_v${APP_VERSION}${suffixName[networkType]}.apk " println("cleanFile")
def cmd = "jiagubao-walle.bat " + apkPath + "G:/Apks/DuoBaoJingCai/v2/${projectNameLowerCase}_v${APP_VERSION}${suffixName[networkType]}_v2.apk " + "G:/Apks/DuoBaoJingCai/walleBase/${projectNameLowerCase}_v${APP_VERSION}${suffixName[networkType]}.apk" createFile("G:/Apks/DuoBaoJingCai/v2/",true);
task shellTest{ createFile("G:/Apks/DuoBaoJingCai/walleBase/",true);
doLast { createFile("G:/Apks/DuoBaoJingCai/walleChalles",true);
String date = cmd.execute().text.trim().toString() //带返回值
print date //打印系统日期
}
} }
task uploadpython(type: Exec) {
workingDir './'
commandLine "python","pythondemo.py", "123", "456"
}
app/src/main/java/com/maile/jingcai/base/Constant.java
...@@ -17,13 +17,13 @@ public class Constant { ...@@ -17,13 +17,13 @@ public class Constant {
public static final boolean DEBUG = true; public static final boolean DEBUG = true;
public static final String BASE_URL = "http://api.7peng.cn"; public static final String BASE_URL = "https://api.7peng.cn";
//大厅 //大厅
public static final String GAME_HOME = "http://h5.7peng.cn/"; public static final String GAME_HOME = "https://h5.7peng.cn/";
//商城 //商城
public static final String SHOP_HOME = "http://api.7peng.cn/shop"; public static final String SHOP_HOME = "https://api.7peng.cn/shop";
//个人主页 //个人主页
public static final String PERSONALE_HOME = "http://h5.7peng.cn/profile.html"; public static final String PERSONALE_HOME = "https://h5.7peng.cn/profile.html";
public static final String WEIXIN_APP_ID = "wxac811a3942bd3638"; public static final String WEIXIN_APP_ID = "wxac811a3942bd3638";
public static final String WEIXIN_APP_SECRET = "182ad59bb146ed391f7d6c8ce5664903"; public static final String WEIXIN_APP_SECRET = "182ad59bb146ed391f7d6c8ce5664903";
......
app/src/main/java/com/maile/jingcai/view/activity/MainActivity.java
...@@ -128,7 +128,7 @@ public class MainActivity extends FragmentActivity implements IWebView ,Activity ...@@ -128,7 +128,7 @@ public class MainActivity extends FragmentActivity implements IWebView ,Activity
IPreferencesIds.DEFAULT_SHAREPREFERENCES_FILE, IPreferencesIds.DEFAULT_SHAREPREFERENCES_FILE,
Context.MODE_PRIVATE); Context.MODE_PRIVATE);
final String token = preferencesManager.getString(IPreferencesIds.TOKEN, ""); final String token = preferencesManager.getString(IPreferencesIds.TOKEN, "");
urls[0] = "http://h5.7peng.cn/" + "?token=" +token + "&platform=android" ; //大厅 urls[0] = Constant.GAME_HOME + "?token=" +token + "&platform=android" ; //大厅
Log.i("tangwen", "urls " + urls.toString()); Log.i("tangwen", "urls " + urls.toString());
......
cmdlog.txt
"Hello begaining..........."+jiagubao-walle.bat
param[0] = jiagubao-walle.bat param[0] = jiagubao-walle.bat
param[1] = G:/Apks/DuoBaoJingCai/duobaojingcai_baseflavor_v2.0.0_release.apk param[1] = G:Apks/DuoBaoJingCai/duobaojingcai_baseflavor_v2.0.0_release.apk
param[2] = G:/Apks/DuoBaoJingCai/v2/duobaojingcai_v2.0.0_release_v2.apk param[2] = G:/Apks/DuoBaoJingCai/v2/duobaojingcai_v2.0.0_release_v2.apk
param[3] = G:/Apks/DuoBaoJingCai/walleBase/duobaojingcai_v2.0.0_release.apk param[3] = G:/Apks/DuoBaoJingCai/walleBase/duobaojingcai_v2.0.0_release.apk
G:/Apks/DuoBaoJingCai/v2/duobaojingcai_v2.0.0_release_v2.apk param[4] = D:/2_android/as_client/sdk/build-tools/25.0.0
"开始v2签名校验" "SDK路径 " D:/2_android/as_client/sdk/build-tools/25.0.0
"签名校验完毕" "当前releaseAPK路径 " G:Apks/DuoBaoJingCai/duobaojingcai_baseflavor_v2.0.0_release.apk
param[0] = jiagubao-walle.bat "apk使用v2签名后的apk路径 " G:/Apks/DuoBaoJingCai/v2/duobaojingcai_v2.0.0_release_v2.apk
param[1] = G:/Apks/DuoBaoJingCai/duobaojingcai_baseflavor_v2.0.0_release.apk "walle基础包路?" G:/Apks/DuoBaoJingCai/walleBase/duobaojingcai_v2.0.0_release.apk
param[2] = G:/Apks/DuoBaoJingCai/v2/duobaojingcai_v2.0.0_release_v2.apk
param[3] = G:/Apks/DuoBaoJingCai/walleBase/duobaojingcai_v2.0.0_release.apk
G:/Apks/DuoBaoJingCai/v2/duobaojingcai_v2.0.0_release_v2.apk
"开始v2签名校验"
"签名校验完毕"
gradle.properties
...@@ -25,6 +25,8 @@ org.gradle.jvmargs=-XX:MaxPermSize=1024m ...@@ -25,6 +25,8 @@ org.gradle.jvmargs=-XX:MaxPermSize=1024m
?android.useDeprecatedNdk=true ?android.useDeprecatedNdk=true
#˾ & ͥ
IN_COMPONENY = true
#Project #Project
PROJECT_NAME = DuoBaoJingCai PROJECT_NAME = DuoBaoJingCai
......
jiagubao-walle.bat
@ECHO ON @ECHO ON
echo "Hello jiagubao-walle" rem 获取命令行参数
echo "Hello begaining..........."+%0 > cmdlog.txt
rem echo >> 追加到目录文件 echo > 清除之前写入的日志，并且重新写入
echo param[0] = %0 >> cmdlog.txt echo param[0] = %0 >> cmdlog.txt
echo param[1] = %1 >> cmdlog.txt echo param[1] = %1 >> cmdlog.txt
echo param[2] = %2 >> cmdlog.txt echo param[2] = %2 >> cmdlog.txt
echo param[3] = %3 >> cmdlog.txt echo param[3] = %3 >> cmdlog.txt
echo param[4] = %4 >> cmdlog.txt
rem variable变量
set apkPath= %1 set apkPath= %1
set apkv2= %2 set apkv2= %2
set walleBaseApk= %3 set walleBaseApk= %3
set sdkRoot= %4
echo "SDK路径 " %sdkRoot% >> cmdlog.txt
echo "当前releaseAPK路径 " %apkPath% >> cmdlog.txt
echo "apk使用v2签名后的apk路径 " %apkv2% >> cmdlog.txt
echo "walle基础包路径 " %walleBaseApk% >> cmdlog.txt
rem set step1= cd /d %sdkRoot%
rem set step2= && echo '进入sdk路径...%sdkRoot%' >> cmdlog.txt
rem set step3= && zipalign -c -v 4 %apkPath%
rem set step4= && echo release基础包zipaligin对齐校验检测... >> cmdlog.txt
rem set step5= && zipalign -v 4 %apkPath% %apkv2%
rem set step6= && echo 'release基础包zipaligin对齐校验成功...' >> cmdlog.txt
rem set step7= "apksigner sign --ks G:\Apks\DuoBaoJingCai\tools\duobaojingcai.jks %apkv2% && "
rem set step8="echo 'v2包签名成功生成walle基础包' >> cmdlog.txt"
rem start cmd if exist "G:\Apks\DuoBaoJingCai\v2\duobaojingcai_v2.0.0_release_v2.apk" ( "rd /s /Q G:\Apks\DuoBaoJingCai\v2\duobaojingcai_v2.0.0_release_v2.apk" ) else (echo err)
rem start cmd if exist "G:\Apks\DuoBaoJingCai\walleBase\duobaojingcai_v2.0.0_release.apk" ( "rd /s /Q G:\Apks\DuoBaoJingCai\walleBase\duobaojingcai_v2.0.0_release.apk") else (echo err)
echo %apkv2% >> cmdlog.txt start cmd /k "cd /d %sdkRoot% && zipalign -c -v 4 %apkPath% && zipalign -v 4 %apkPath% %apkv2% && apksigner sign --ks G:\Apks\DuoBaoJingCai\tools\duobaojingcai.jks --ks-pass pass:yy10241905 %apkv2% && java -jar G:\Apks\DuoBaoJingCai\tools\CheckAndroidV2Signature.jar %apkv2% && copy G:\Apks\DuoBaoJingCai\v2\duobaojingcai_v2.0.0_release_v2.apk G:\Apks\DuoBaoJingCai\walleBase\ && move G:\Apks\DuoBaoJingCai\walleBase\duobaojingcai_v2.0.0_release_v2.apk G:\Apks\DuoBaoJingCai\walleBase\duobaojingcai_v2.0.0_release.apk && java -jar D:/walle-cli-all.jar batch -f G:\Apks\DuoBaoJingCai\tools\channel %walleBaseApk% G:\Apks\DuoBaoJingCai\walleChalles"
set zipAlignApk = "cd /d D:\Android\AndroidSDK\build-tools\25.0.0 " + apkPath
echo %zipAlignApk%
echo "开始v2签名校验" >> cmdlog.txt
start cmd /k "cd /d D:\Android\AndroidSDK\build-tools\25.0.0 && zipalign -c -v 4 %apkPath% && zipalign -v 4 %apkPath% %apkv2% && apksigner sign --ks G:\Product\Android\DuoBaoJingCai\duobaojingcai.jks %apkv2% "
echo "签名校验完毕" >> cmdlog.txt
pythondemo.py 0 → 100644
#encoding:utf8
import sys
jenkinsJobName=sys.argv[1]
jenkinsBuild=sys.argv[2]
print jenkinsJobName
print jenkinsBuild
\ No newline at end of file
shell.sh
#!/usr/bin/env bash
#从build.gradle中传入的两个参数
#typeset -u VARIABLE jenkinsJobName=$1
#VARIABLE="True" jenkinsBuild=$2
#data=$VARIABLE echo "jenkinsJobName=$jenkinsJobName"
#echo $data echo "jenkinsBuild=$jenkinsBuild"
#!/usr/bin/env bash
#从build.gradle中传入的两个参数
jenkinsJobName=$1
jenkinsBuild=$2
echo "jenkinsJobName=$jenkinsJobName"
echo "jenkinsBuild=$jenkinsBuild"
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 sign in to comment