Skip to content

Commit be94a35

Browse files
committed
added build version to addon.d file
1 parent 9a74cf7 commit be94a35

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

build.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
<target name="buildARMPackage">
3434
<!-- preparations -->
3535
<property environment="env"/>
36-
<property name="file.name.arm" value="${build.dir}/${PRODUCT_VERSION_NAME}-${PRODUCT_VERSION_MAJOR}-${PRODUCT_VERSION_DNSCRYPT}-ARM-${build.today}.zip"/>
36+
<property name="file.version.arm" value="${PRODUCT_VERSION_NAME}-${PRODUCT_VERSION_MAJOR}-${PRODUCT_VERSION_DNSCRYPT}-ARM"/>
37+
<property name="file.name.arm" value="${build.dir}/${file.version.arm}-${build.today}.zip"/>
3738
<delete dir="${work.dir}"/>
3839
<propertyfile file="${build.dir}/props.filenames">
3940
<entry key="armfilename" value="${file.name.arm}"/>
@@ -65,6 +66,7 @@
6566
</pathconvert>
6667
<copy file="${extra.dir}/99-dnscrypt.sh" todir="${work.dir}/system/addon.d">
6768
<filterchain>
69+
<replaceregex pattern="@file.version@" replace="${file.version.arm}" flags="i"/>
6870
<replaceregex pattern="@file.list@" replace="${file.list}" flags="i"/>
6971
</filterchain>
7072
</copy>
@@ -79,7 +81,8 @@
7981
<target name="buildX86Package">
8082
<!-- preparations -->
8183
<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"/>
84+
<property name="file.version.x86" value="${PRODUCT_VERSION_NAME}-${PRODUCT_VERSION_MAJOR}-${PRODUCT_VERSION_DNSCRYPT}-X86"/>
85+
<property name="file.name.x86" value="${build.dir}/${file.version.x86}-${build.today}.zip"/>
8386
<delete dir="${work.dir}"/>
8487
<propertyfile file="${build.dir}/props.filenames">
8588
<entry key="x86filename" value="${file.name.x86}"/>
@@ -111,6 +114,7 @@
111114
</pathconvert>
112115
<copy file="${extra.dir}/99-dnscrypt.sh" todir="${work.dir}/system/addon.d">
113116
<filterchain>
117+
<replaceregex pattern="@file.version@" replace="${file.version.x86}" flags="i"/>
114118
<replaceregex pattern="@file.list@" replace="${file.list}" flags="i"/>
115119
</filterchain>
116120
</copy>

extras/99-dnscrypt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/sbin/sh
22
#
3-
# /system/addon.d/99-dnscrypt.sh
3+
# current version @file.version@
44
# /system is formatted and reinstalled, then the file is restored.
55
#
66

0 commit comments

Comments
 (0)