Add version update in property files and scripts in build.xml

- Use jack-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.

Change-Id: I5b2dd1ed4fdf01e77653e2338ce5a5c803d22e70
(cherry picked from commit 60efcff894d18d00c1eb71ba6aa8cd161001b451)

2 files changed, 9 insertions, 9 deletions

diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java
index 1a1c2471..d96c71a3 100644
--- a/jack/src/com/android/jack/Jack.java
+++ b/jack/src/com/android/jack/Jack.java
@@ -1258,7 +1258,7 @@ public abstract class Jack {
   }
 
   @Nonnull
-  private static final String PROPERTIES_FILE = "jack.properties";
+  private static final String PROPERTIES_FILE = "jack-version.properties";
   @CheckForNull
   private static Version version = null;
 
diff --git a/jack/src/com/android/jack/Version.java b/jack/src/com/android/jack/Version.java
index 8224011a..f53a3afd 100644
--- a/jack/src/com/android/jack/Version.java
+++ b/jack/src/com/android/jack/Version.java
@@ -55,23 +55,23 @@ public class Version {
     try {
       prop.load(is);
 
-      version = prop.getProperty("jack.version");
+      version = prop.getProperty("version");
       assert version != null;
 
-      releaseName = prop.getProperty("jack.version.release.name");
+      releaseName = prop.getProperty("version.release.name");
       assert releaseName != null;
 
-      releaseCode = Integer.parseInt(prop.getProperty("jack.version.release.code"));
+      releaseCode = Integer.parseInt(prop.getProperty("version.release.code"));
       assert releaseCode >= 1;
 
-      subReleaseCode = Integer.parseInt(prop.getProperty("jack.version.sub-release.code"));
-      assert subReleaseCode >= 1;
+      subReleaseCode = Integer.parseInt(prop.getProperty("version.sub-release.code"));
+      assert subReleaseCode >= 0;
 
       subReleaseKind =
           SubReleaseKind.valueOf(SubReleaseKind.class,
-              prop.getProperty("jack.version.sub-release.kind"));
-      buildId = prop.getProperty("jack.version.buildid");
-      codeBase = prop.getProperty("jack.version.sha");
+              prop.getProperty("version.sub-release.kind"));
+      buildId = prop.getProperty("version.buildid");
+      codeBase = prop.getProperty("version.sha");
 
       if (codeBase == null || buildId == null) {
         subReleaseKind = SubReleaseKind.ENGINEERING;