You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/05/22 21:20:32 UTC

[royale-compiler] 01/02: fix compiler version info

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit f27993f5a9dffec5e6fe97d4c229da9e0d581f75
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue May 22 13:53:13 2018 -0700

    fix compiler version info
---
 compiler-common/build.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler-common/build.xml b/compiler-common/build.xml
index ecf28b1..17c6ed4 100644
--- a/compiler-common/build.xml
+++ b/compiler-common/build.xml
@@ -46,6 +46,7 @@
     <!-- Properties can be overridden locally by loading a local.properties file -->
     <!-- Java 8 users probably need javadoc.params=-Xdoclint:none -->
     <property file="${compiler-common}/local.properties"/>
+    <property file="${compiler-common}/../build.properties"/>
     
     <property name="src.depend" value="true"/>
 
@@ -57,6 +58,7 @@
     <!-- JAR manifest entries -->
     <property name="manifest.sealed" value="false"/>
     <property name="manifest.Implementation-Title" value="Apache Royale Compiler"/>
+    <echo>RELEASE_VERSION IS: ${release.version}</echo>
     <property name="manifest.Implementation-Version" value="${release.version}"/>
     <property name="manifest.Implementation-Vendor" value="Apache Software Foundation"/>
     
@@ -64,6 +66,9 @@
     <condition property="build.number" value="${env.BUILD_NUMBER}">
         <isset property="env.BUILD_NUMBER"/>
     </condition>
+    <target name="version-info" unless="build.number">
+        <property name="build.number" value="0"/>
+    </target>
     
     <target name="compile" >
         <mkdir dir="${compiler-common}/target/classes"/>
@@ -83,7 +88,7 @@
         </javac>
     </target>
     
-    <target name="main" depends="compile" >
+    <target name="main" depends="compile, version-info" >
         <mkdir dir="${sdk}"/>
         <copy file="${basedir}/../LICENSE.base" tofile="${compiler-common}/target/classes/META-INF/LICENSE"/>
         <copy file="${basedir}/../NOTICE.base" tofile="${compiler-common}/target/classes/META-INF/NOTICE"/>

-- 
To stop receiving notification emails like this one, please contact
aharui@apache.org.