Skip to content

Commit 6c7b763

Browse files
uzenuzen
committed
ant: improved build for different libraries
added x86 libraries Automatic synchronization of the latest is public-resolvers via git
1 parent 0929e68 commit 6c7b763

File tree

19 files changed

+120
-762
lines changed

19 files changed

+120
-762
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
work/
2-
build/
2+
build/
3+
resolvers/

‎build.properties

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# ------------------------------------------------------
2+
# build.properties
3+
# ------------------------------------------------------
4+
15
PRODUCT_VERSION_NAME = Installer
26
PRODUCT_VERSION_MAJOR = 1.2.2
37
PRODUCT_VERSION_DNSCRYPT = dnscrypt-proxy-android-2.0.17
8+
9+
# directory
10+
11+
work.dir=${basedir}/work
12+
build.dir=${basedir}/build
13+
extra.dir=${basedir}/extras
14+
source.dir=${basedir}/src
15+
16+
# dnscrypt resolvers
17+
git.resolvers.source=git://github.com/DNSCrypt/dnscrypt-resolvers.git
18+
git.resolvers.dir=${basedir}/resolvers

‎build.xml

Lines changed: 103 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,9 @@
1313
<!-- some variables -->
1414
<!--=======================================================================-->
1515
<property name="app.name" value="buildApps"/>
16-
<property name="app.dir" value="${basedir}"/>
17-
<property name="work.dir" value="${app.dir}/work"/>
18-
<property name="build.dir" value="${app.dir}/build"/>
19-
<property name="structure.dir" value="${app.dir}/structure"/>
20-
<property name="sign.jar" value="${app.dir}/tools/signapk.jar"/>
21-
<property name="sign.pem" value="${app.dir}/tools/testkey.x509.pem"/>
22-
<property name="sign.pk8" value="${app.dir}/tools/testkey.pk8"/>
23-
<property name="extra.dir" value="${app.dir}/extras"/>
24-
<property name="dynamic.dir" value="${structure.dir}/dynamic"/>
16+
<property name="sign.jar" value="${basedir}/tools/signapk.jar"/>
17+
<property name="sign.pem" value="${basedir}/tools/testkey.x509.pem"/>
18+
<property name="sign.pk8" value="${basedir}/tools/testkey.pk8"/>
2519
<tstamp>
2620
<format property="build.today" pattern="yyyyMMdd"/>
2721
</tstamp>
@@ -30,42 +24,100 @@
3024
<!-- complete build -->
3125
<!--=======================================================================-->
3226
<target name="buildAll"
33-
depends="cleanupBefore,initit,generateCleanUpList,buildPackage,cleanupAfter"
27+
depends="cleanupBefore,initit,generateCleanUpList,buildARMPackage,buildX86Package,cleanupAfter"
3428
description="execute complete build"/>
3529

3630
<!--=======================================================================-->
3731
<!-- project -->
3832
<!--=======================================================================-->
39-
<target name="buildPackage"
40-
description="execute build the package">
33+
<target name="buildARMPackage">
4134
<!-- preparations -->
4235
<property environment="env"/>
43-
<property name="file.name" value="${build.dir}/${PRODUCT_VERSION_NAME}-${PRODUCT_VERSION_MAJOR}-${PRODUCT_VERSION_DNSCRYPT}-${build.today}.zip"/>
36+
<property name="file.name.arm" value="${build.dir}/${PRODUCT_VERSION_NAME}-${PRODUCT_VERSION_MAJOR}-${PRODUCT_VERSION_DNSCRYPT}-ARM-${build.today}.zip"/>
4437
<delete dir="${work.dir}"/>
4538
<propertyfile file="${build.dir}/props.filenames">
46-
<entry key="filename" value="${file.name}"/>
39+
<entry key="armfilename" value="${file.name.arm}"/>
4740
</propertyfile>
41+
4842
<!-- copy files -->
4943
<copy todir="${work.dir}">
50-
<fileset dir="${structure.dir}" />
44+
<fileset dir="${source.dir}" >
45+
<exclude name="vendor/**"/>
46+
</fileset>
47+
<fileset dir="${source.dir}" >
48+
<include name="vendor/armeabi-v7a/**/*"/>
49+
<include name="vendor/arm64-v8a/**/*"/>
50+
</fileset>
51+
</copy>
52+
53+
<copy todir="${work.dir}/system/etc/dnscrypt-proxy">
54+
<fileset dir="${git.resolvers.dir}/v2" >
55+
<include name="public-resolvers*"/>
56+
</fileset>
57+
</copy>
58+
59+
<copy file="${extra.dir}/updater-script" todir="${work.dir}/META-INF/com/google/android" />
60+
61+
<!-- generate backup script -->
62+
<fileset id="item.file" dir="${work.dir}/system" includes="**/*"/>
63+
<pathconvert refid="item.file" property="file.list" pathsep="&#10;" dirsep="/">
64+
<map from="${work.dir}/system/" to=''/>
65+
</pathconvert>
66+
<copy file="${extra.dir}/99-dnscrypt.sh" todir="${work.dir}/system/addon.d">
67+
<filterchain>
68+
<replaceregex pattern="@file.list@" replace="${file.list}" flags="i"/>
69+
</filterchain>
70+
</copy>
71+
72+
<!-- zip and sign it -->
73+
<antcall target="ZipAndSigning">
74+
<param name="hfile.name" value="${file.name.arm}"/>
75+
</antcall>
76+
77+
</target>
78+
79+
<target name="buildX86Package">
80+
<!-- preparations -->
81+
<property environment="env"/>
82+
<property name="file.name.x86" value="${build.dir}/${PRODUCT_VERSION_NAME}-${PRODUCT_VERSION_MAJOR}-${PRODUCT_VERSION_DNSCRYPT}-X86-${build.today}.zip"/>
83+
<delete dir="${work.dir}"/>
84+
<propertyfile file="${build.dir}/props.filenames">
85+
<entry key="x86filename" value="${file.name.x86}"/>
86+
</propertyfile>
87+
88+
<!-- copy files -->
89+
<copy todir="${work.dir}">
90+
<fileset dir="${source.dir}" >
91+
<exclude name="vendor/**"/>
92+
</fileset>
93+
<fileset dir="${source.dir}" >
94+
<include name="vendor/X86/**/*"/>
95+
<include name="vendor/X86_64/**/*"/>
96+
</fileset>
97+
</copy>
98+
99+
<copy todir="${work.dir}/system/etc/dnscrypt-proxy">
100+
<fileset dir="${git.resolvers.dir}/v2" >
101+
<include name="public-resolvers*"/>
102+
</fileset>
51103
</copy>
52104

53-
<copy file="${app.dir}/extras/updater-script" todir="${work.dir}/META-INF/com/google/android" />
105+
<copy file="${extra.dir}/updater-script" todir="${work.dir}/META-INF/com/google/android" />
54106

55107
<!-- generate backup script -->
56108
<fileset id="item.file" dir="${work.dir}/system" includes="**/*"/>
57109
<pathconvert refid="item.file" property="file.list" pathsep="&#10;" dirsep="/">
58110
<map from="${work.dir}/system/" to=''/>
59111
</pathconvert>
60-
<copy file="${app.dir}/extras/99-dnscrypt.sh" todir="${work.dir}/system/addon.d">
112+
<copy file="${extra.dir}/99-dnscrypt.sh" todir="${work.dir}/system/addon.d">
61113
<filterchain>
62114
<replaceregex pattern="@file.list@" replace="${file.list}" flags="i"/>
63115
</filterchain>
64116
</copy>
65117

66118
<!-- zip and sign it -->
67119
<antcall target="ZipAndSigning">
68-
<param name="hfile.name" value="${file.name}"/>
120+
<param name="hfile.name" value="${file.name.x86}"/>
69121
</antcall>
70122

71123
</target>
@@ -78,7 +130,7 @@
78130
<fileset dir="${extra.dir}">
79131
<include name="*.sh"/>
80132
</fileset>
81-
<fileset dir="${structure.dir}/system"/>
133+
<fileset dir="${source.dir}/system"/>
82134
</path>
83135
</target>
84136

@@ -122,6 +174,7 @@
122174
description="initiating-steps">
123175
<mkdir dir="${build.dir}"/>
124176
<mkdir dir="${work.dir}"/>
177+
<git-clone-pull repository="${git.resolvers.source}" dest="${git.resolvers.dir}" />
125178
</target>
126179

127180
<!--=======================================================================-->
@@ -133,5 +186,36 @@
133186
<property name="x.dir" value="test9899"/>
134187
<echo message="${x.dir}"/>
135188
</target>
189+
190+
<!--=======================================================================-->
191+
<!-- git command -->
192+
<!--=======================================================================-->
193+
194+
<macrodef name = "git">
195+
<attribute name = "command" />
196+
<attribute name = "dir" default = "" />
197+
<element name = "args" optional = "true" />
198+
<sequential>
199+
<echo message = "git @{command}" />
200+
<exec executable = "git" dir = "@{dir}">
201+
<arg value = "@{command}" />
202+
<args/>
203+
</exec>
204+
</sequential>
205+
</macrodef>
206+
207+
<macrodef name = "git-clone-pull">
208+
<attribute name = "repository" />
209+
<attribute name = "dest" />
210+
<sequential>
211+
<git command = "clone">
212+
<args>
213+
<arg value = "@{repository}" />
214+
<arg value = "@{dest}" />
215+
</args>
216+
</git>
217+
<git command = "pull" dir = "@{dest}" />
218+
</sequential>
219+
</macrodef>
136220

137221
</project>

‎structure/META-INF/com/android/otacert renamed to ‎src/META-INF/com/android/otacert

File renamed without changes.

‎structure/META-INF/com/google/android/update-binary renamed to ‎src/META-INF/com/google/android/update-binary

File renamed without changes.

‎structure/install.sh renamed to ‎src/install.sh

File renamed without changes.

‎structure/system/etc/dnscrypt-proxy/blacklist renamed to ‎src/system/etc/dnscrypt-proxy/blacklist

File renamed without changes.

‎structure/system/etc/dnscrypt-proxy/cloaking-rules renamed to ‎src/system/etc/dnscrypt-proxy/cloaking-rules

File renamed without changes.

‎structure/system/etc/dnscrypt-proxy/dnscrypt-proxy.toml renamed to ‎src/system/etc/dnscrypt-proxy/dnscrypt-proxy.toml

File renamed without changes.

‎structure/system/etc/dnscrypt-proxy/forwarding-rules renamed to ‎src/system/etc/dnscrypt-proxy/forwarding-rules

File renamed without changes.

‎structure/system/etc/dnscrypt-proxy/init-functions renamed to ‎src/system/etc/dnscrypt-proxy/init-functions

File renamed without changes.

‎structure/system/etc/dnscrypt-proxy/whitelist renamed to ‎src/system/etc/dnscrypt-proxy/whitelist

File renamed without changes.

‎structure/system/etc/init.d/99dnscrypt.sh renamed to ‎src/system/etc/init.d/99dnscrypt.sh

File renamed without changes.

‎src/vendor/X86/xbin/dnscrypt-proxy

9.06 MB
Binary file not shown.

‎src/vendor/X86_64/xbin/dnscrypt-proxy

11.5 MB
Binary file not shown.

‎structure/vendor/arm64-v8a/xbin/dnscrypt-proxy renamed to ‎src/vendor/arm64-v8a/xbin/dnscrypt-proxy

File renamed without changes.

‎structure/vendor/armeabi-v7a/xbin/dnscrypt-proxy renamed to ‎src/vendor/armeabi-v7a/xbin/dnscrypt-proxy

File renamed without changes.

0 commit comments

Comments
 (0)