diff options
| -rw-r--r-- | build.xml | 21 | ||||
| -rw-r--r-- | version.properties (renamed from jill/rsc/jill.properties) | 18 |
2 files changed, 31 insertions, 8 deletions
@@ -58,6 +58,27 @@ <file name="${jill-api.dist.dir}/${jill-api-src.name}" /> </filelist> </copy> + + <mkdir dir="${jill-top-dist.dir}/tmp"/> + + <copy file="${jill-project.dir}/version.properties" tofile="${jill-top-dist.dir}/tmp/version.properties"/> + <propertyfile file="${jill-top-dist.dir}/tmp/version.properties"> + <entry key="version.sha" value="${dist.sha}"/> + <entry key="version.buildid" value="${dist.build-id}"/> + </propertyfile> + + <copy file="${jill-top-dist.dir}/tmp/version.properties" tofile="${jill-top-dist.dir}/tmp/jill-version.properties"/> + <jar destfile="${jill-top-dist.dir}/${jill.execname}" update="true" + basedir="${jill-top-dist.dir}/tmp" + includes="jill-version.properties"/> + + <copy file="${jill-top-dist.dir}/tmp/version.properties" tofile="${jill-top-dist.dir}/tmp/jill-api-version.properties"/> + <jar destfile="${jill-top-dist.dir}/${jill-api.name}" update="true" + basedir="${jill-top-dist.dir}/tmp" + includes="jill-api-version.properties"/> + + <delete dir="${jill-top-dist.dir}/tmp"/> + </target> <!-- ******************* --> diff --git a/jill/rsc/jill.properties b/version.properties index 09951ad..a496ad2 100644 --- a/jill/rsc/jill.properties +++ b/version.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 The Android Open Source Project +# Copyright (C) 2015 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -jill.version=1.1-rc5 -jill.version.release.name=Brest -jill.version.release.code=2 -jill.version.sub-release.kind=CANDIDATE -jill.version.sub-release.code=18 +version-file.version.code=1 + +version=1.1-rc5 +version.release.name=Brest +version.release.code=2 +version.sub-release.kind=CANDIDATE +version.sub-release.code=18 # These properties are added by the release step -# jill.version.buildid=<BUILDID> -# jill.version.sha=<SHA> +# version.buildid=<BUILDID> +# version.sha=<SHA> |