Selaa lähdekoodia

整理property定义,添加buil.xml中添加一些注释

zhanglong7 6 vuotta sitten
vanhempi
commit
09fb5ab74d
2 muutettua tiedostoa jossa 44 lisäystä ja 61 poistoa
  1. 28 0
      show-client/build/build.properties
  2. 16 61
      show-client/build/build.xml

+ 28 - 0
show-client/build/build.properties

31
log_file=build.log
31
log_file=build.log
32
#输出目录
32
#输出目录
33
output_path=.
33
output_path=.
34
35
android-target-dir=${android_sdk_home}/platforms/${android-target}
36
android-jar=${android-target-dir}/android.jar
37
android-framework=${android-target-dir}/framework.aidl
38
proguard-jar=${android_sdk_home}/tools/proguard/lib/proguard.jar
39
annotations-jar=${android_sdk_home}/tools/support/annotations.jar
40
gen-dir=gen
41
src-dir=src
42
libs-dir=libs
43
res-dir=res
44
asset-dir=assets
45
bin-dir=bin
46
build-dir=build
47
manifest-xml=AndroidManifest.xml
48
#主工程各个目录
49
host-gen=${project_home}/${gen-dir}
50
host-src=${project_home}/${src-dir}
51
host-libs=${project_home}/${libs-dir}
52
host-bin=${project_home}/${bin-dir}
53
host-build=${project_home}/${build-dir}
54
host-classes=${host-bin}/classes
55
intermediate-dex=${project_home}/${bin-dir}/${app_name}/classes.dex
56
intermediate-dex-dir=${project_home}/${bin-dir}/${app_name}
57
#The final package file to generate
58
resources-package=${project_home}/${bin-dir}/${app_name}/${app_name}.ap_
59
out-unsigned-package=${project_home}/${bin-dir}/${app_name}/${app_name}-unsigned.apk
60
out-signed-package=${project_home}/${bin-dir}/${app_name}/${app_name}-signed.apk
61
zipalign-package=${output_path}/${app_name}.apk

+ 16 - 61
show-client/build/build.xml

8
	<condition property="exe" value=".exe" else=""><os family="windows" /></condition>
8
	<condition property="exe" value=".exe" else=""><os family="windows" /></condition>
9
	<condition property="bat" value=".bat" else=""><os family="windows" /></condition>
9
	<condition property="bat" value=".bat" else=""><os family="windows" /></condition>
10
    <!-- Android SDK Tools -->
10
    <!-- Android SDK Tools -->
11
    
12
	<property name="zipalign" value="${android_tools}/zipalign${exe}" />
11
	<property name="zipalign" value="${android_tools}/zipalign${exe}" />
13
	<property name="jarsigner" value="${jdk_home}/bin/jarsigner${exe}" />
12
	<property name="jarsigner" value="${jdk_home}/bin/jarsigner${exe}" />
14
	
15
	<property name="android-target-dir" value="${android_sdk_home}/platforms/${android-target}" />
16
	<property name="android-jar" value="${android-target-dir}/android.jar" />
17
	<property name="android-framework" value="${android-target-dir}/framework.aidl" />
18
	<property name="aapt" value="${android_tools}/aapt${exe}" />
13
	<property name="aapt" value="${android_tools}/aapt${exe}" />
19
	<property name="dx" value="${android_tools}/dx${bat}" />
14
	<property name="dx" value="${android_tools}/dx${bat}" />
20
	<property name="aidl" value="${android_tools}/aidl${exe}" />
15
	<property name="aidl" value="${android_tools}/aidl${exe}" />
21
	<property name="proguard-jar" value="${android_sdk_home}/tools/proguard/lib/proguard.jar" />
22
	<property name="annotations-jar" value="${android_sdk_home}/tools/support/annotations.jar" />
23
	
24
    <!-- some file directory exclude "bin" file, because "bin" file will be changed each loop -->
25
    <property name="gen-dir" value="gen" />
26
    <property name="src-dir" value="src" />
27
    <property name="libs-dir" value="libs" />
28
    <property name="res-dir" value="res" />
29
    <property name="asset-dir" value="assets" />
30
    <property name="bin-dir" value="bin" />
31
    <property name="build-dir" value="build"/>
32
    <property name="manifest-xml" value="AndroidManifest.xml" />
33
    <!-- 主工程各个目录 -->
34
    <property name="host-gen" value="${project_home}/${gen-dir}" />
35
	<property name="host-src" value="${project_home}/${src-dir}" />
36
	<property name="host-libs" value="${project_home}/${libs-dir}" />
37
	<property name="host-bin" value="${project_home}/${bin-dir}" />
38
	<property name="host-build" value="${project_home}/${build-dir}" />
39
	<property name="host-classes" value="${host-bin}/classes" />
40
	<property name="intermediate-dex" value="${project_home}/${bin-dir}/${app_name}/classes.dex" />
41
	<property name="intermediate-dex-dir" value="${project_home}/${bin-dir}/${app_name}" />
42
    <!-- The final package file to generate -->
43
	<property name="resources-package" value="${project_home}/${bin-dir}/${app_name}/${app_name}.ap_" />
44
	<property name="out-unsigned-package" value="${project_home}/${bin-dir}/${app_name}/${app_name}-unsigned.apk" />
45
	<property name="out-signed-package" value="${project_home}/${bin-dir}/${app_name}/${app_name}-signed.apk" />
46
	<property name="zipalign-package" value="${output_path}/${app_name}.apk" />
47
	
16

48
	<!-- 自动化打包的target -->
17
	<!-- 自动化打包的target -->
49
	<target name="apkpackaging" depends="init,aapt_gererateR,aidl,compile,obfuscate,dex-package,aapt-package-res,apk-builder,add-dex,jar-signer,zipalign"/>
18
	<target name="apkpackaging" depends="init,aapt_gererateR,aidl,compile,obfuscate,dex-package,aapt-package-res,apk-builder,add-dex,jar-signer,zipalign"/>
50

19

63
	
32
	
64
  	<!-- 生成R文件和Manifest.java -->
33
  	<!-- 生成R文件和Manifest.java -->
65
  	<target name="aapt_gererateR">
34
  	<target name="aapt_gererateR">
35
  		<!-- 这种方式每个library工程执行一次aapt生成R.java,导致library的R.java中的资源id值与主工程R.java
36
  		中的对应的值可能不一致,运行时找不到资源,用 extra-packages参数解决 -->
66
		<!-- <foreach target="aapt_gererateR_library" list="${libraries}" param="library" delimiter=",">
37
		<!-- <foreach target="aapt_gererateR_library" list="${libraries}" param="library" delimiter=",">
67
		</foreach>  这种方式导致library的R.java中的资源id值与主工程R.java中的对应的值可能不一致,运行时找不到资源 -->
38
		</foreach> -->
68

39

69
        <!-- auto-add-overlay 这个重要,覆盖资源,不然报错-->
40
        <!-- auto-add-overlay 这个重要,覆盖资源,不然报错-->
70
        <var name="p" value="package -m --auto-add-overlay -J ${host-gen} -M ${project_home}/${manifest-xml}
41
        <var name="p" value="package -m --auto-add-overlay -J ${host-gen} -M ${project_home}/${manifest-xml}
71
			-I ${android-jar} -S ${project_home}/${res-dir}"/>
42
			-I ${android-jar} -S ${project_home}/${res-dir}"/>
43
        <!-- 把每个library工程的res目录加入参数 -->
72
  		<for list="${libraries}" param="library">
44
  		<for list="${libraries}" param="library">
73
            <sequential>
45
            <sequential>
74
            	<available property="isExist_library_res_r" file="@{library}/res" type="dir" />
46
            	<available property="isExist_library_res_r" file="@{library}/res" type="dir" />
85

57

86
		<!-- 编译工程的的R文件 -->
58
		<!-- 编译工程的的R文件 -->
87
		<exec executable="${aapt}" failonerror="true">
59
		<exec executable="${aapt}" failonerror="true">
88
			<!-- 使用 extra-packages参数生成library工程包名的R.java -->
60
			<!-- 使用 extra-packages参数生成library工程包名的R.java。aapt只执行一次,生成各工程对应的R.java,
61
			对应资源id的值是一致的 -->
89
			<arg line="${p} --extra-packages ${library_packages}" />
62
			<arg line="${p} --extra-packages ${library_packages}" />
90
		</exec>
63
		</exec>
91
    </target>
64
    </target>
92
	
93
	<target name="aapt_gererateR_library">
94
		<echo>gererate R.java with ${library}</echo>
95
		<available property="isExist_library_r_l" file="${library}/res" type="dir" />
96
		<!-- 是否需要参数 -S ${library}/${res-dir} -->
97
		<if>
98
		    <equals arg1="${isExist_library_r_l}" arg2="true" />
99
		    <then>
100
		    	<var name="param" value="-S ${library}/${res-dir}"/>
101
		    </then>
102
			<else>
103
				<var name="param" value=""/>
104
			</else>
105
		</if>
106
		
107
		<var name="param" value="package -m --non-constant-id --auto-add-overlay -J ${host-gen}
108
			-M ${library}/${manifest-xml} -I ${android-jar} ${param}"/>
109
		<echo>aapt_gererateR_library param:${param}</echo>
110
		
111
		<mkdir dir="${library}/gen"/>
112

113
		<!-- 编译Libray的R文件 -->
114
		<exec executable="${aapt}" failonerror="true">
115
            <arg line="${param}" />
116
        </exec>
117
	</target>
118
    
65
    
119
	<!-- 生成aidl对应的java文件 -->
66
	<!-- 生成aidl对应的java文件 -->
120
  	<target name="aidl">
67
  	<target name="aidl">
131
	<!-- 编译java文件为class文件 -->
78
	<!-- 编译java文件为class文件 -->
132
	<target name="compile">
79
	<target name="compile">
133

80

81
		<!-- 把主工程libs目录下的内容拷贝到${host-bin}/libs -->
134
        <available property="isExist_host_libs_h" file="${host-libs}" type="dir" />
82
        <available property="isExist_host_libs_h" file="${host-libs}" type="dir" />
135

83

136
        <if>
84
        <if>
140
                 dest="${host-bin}/libs"/>
88
                 dest="${host-bin}/libs"/>
141
            </then>
89
            </then>
142
        </if>
90
        </if>
91
        <!-- 把每个library工程libs目录下的内容也拷贝到${host-bin}/libs -->
143
        <for list="${libraries}" param="library">
92
        <for list="${libraries}" param="library">
144
            <sequential>
93
            <sequential>
145
                <available property="isExist_library_libs_l" file="@{library}/libs" type="dir" />
94
                <available property="isExist_library_libs_l" file="@{library}/libs" type="dir" />
156
            </sequential>
105
            </sequential>
157
        </for>
106
        </for>
158

107

108
        <!-- ${host-bin}/libs下的内容需要编译 -->
159
        <path id="library.libs">
109
        <path id="library.libs">
160
            <fileset dir="${host-bin}/libs">
110
            <fileset dir="${host-bin}/libs">
161
                <include name="*.so" />
111
                <include name="*.so" />
202
	<!-- 打包dex文件 -->
152
	<!-- 打包dex文件 -->
203
	<target name="dex-package">
153
	<target name="dex-package">
204
	    <echo>Packaging dex...</echo>
154
	    <echo>Packaging dex...</echo>
155
	    <!-- -JXmx2048m用于解决dx报错java.lang.OutOfMemoryError
156
	     multi-dex用于方法数超过65535分包处理,分包生成的dex文件放在${intermediate-dex-dir}目录 -->
205
        <var name="dex_p" value="-JXmx2048m --dex --multi-dex --output=${intermediate-dex-dir} ${host-classes}"/>
157
        <var name="dex_p" value="-JXmx2048m --dex --multi-dex --output=${intermediate-dex-dir} ${host-classes}"/>
206

158

207
        <available property="isExist_host_libs_dx" file="${host-libs}" type="dir" />
159
        <available property="isExist_host_libs_dx" file="${host-libs}" type="dir" />
237
		<echo>Packaging resources and assets...</echo>
189
		<echo>Packaging resources and assets...</echo>
238

190

239

191

192
		<!-- 把每个library工程的res目录加入参数 -->
240
        <var name="temp" value=""/>
193
        <var name="temp" value=""/>
241
        <for list="${libraries}" param="library">
194
        <for list="${libraries}" param="library">
242
            <sequential>
195
            <sequential>
288
	    </java>
241
	    </java>
289
	</target>
242
	</target>
290
	
243
	
291
	<!-- add classes2.dex class3.dex ... -->
244
	<!-- 分包生成的 classes2.dexclass3.dex等文件不会自动加入apk,以下代码实现添加 -->
292
	<target name="add-dex">
245
	<target name="add-dex">
293
		<echo>Add classes*.dex...</echo>
246
		<echo>Add classes*.dex...</echo>
294
		
247
		
295
		<for param="file">
248
		<for param="file">
249
			<!-- fileset包括classes*.dex但不包括classes.dex -->
296
			<fileset dir="${intermediate-dex-dir}" includes="classes*.dex"
250
			<fileset dir="${intermediate-dex-dir}" includes="classes*.dex"
297
				excludes="classes.dex"/>
251
				excludes="classes.dex"/>
298
			<sequential>
252
			<sequential>
299
				<copy file="@{file}" todir="." />
253
				<copy file="@{file}" todir="." />
254
				<!-- 取文件名,不包含绝对路径。如果有路径,分按路径加入对应的路径下面 -->
300
				<propertyregex 
255
				<propertyregex 
301
					property="dexfile"  
256
					property="dexfile"  
302
					input="@{file}"  
257
					input="@{file}"