From 7aaebee57c764df1b453ede1e1979dc5c551ca99 Mon Sep 17 00:00:00 2001
From: Jean-Marie Henaff <jmhenaff@google.com>
Date: Wed, 24 Jun 2015 10:24:07 +0200
Subject: Add version update in property files and scripts in build.xml

- Use jill-version.properties and package it in distributed jars.
- Use -Ddist.sha and -Ddist.build-id to set SHA and build ID in
those property files before packaging.

(cherry picked from commit 2cde77db74e7ae6cdac399bd068ae37b7d5ad6f3)

Change-Id: I84584c4cd8cf06c4ec50606dedaba968568370b2
---
 build.xml                | 21 +++++++++++++++++++++
 jill/rsc/jill.properties | 24 ------------------------
 version.properties       | 26 ++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 24 deletions(-)
 delete mode 100644 jill/rsc/jill.properties
 create mode 100644 version.properties

diff --git a/build.xml b/build.xml
index a56745d..d83d878 100644
--- a/build.xml
+++ b/build.xml
@@ -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/jill/rsc/jill.properties
deleted file mode 100644
index 09951ad..0000000
--- a/jill/rsc/jill.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2014 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.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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
-
-# These properties are added by the release step
-# jill.version.buildid=<BUILDID>
-# jill.version.sha=<SHA>
diff --git a/version.properties b/version.properties
new file mode 100644
index 0000000..a496ad2
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,26 @@
+#
+# 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+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
+# version.buildid=<BUILDID>
+# version.sha=<SHA>
-- 
cgit v1.1