flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - try to get Jenkins build numbers in the manifests
Date Mon, 02 May 2016 15:48:46 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop 0c5568a1e -> ab0b67d77


try to get Jenkins build numbers in the manifests


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ab0b67d7
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ab0b67d7
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ab0b67d7

Branch: refs/heads/develop
Commit: ab0b67d77fc131a4f3b129366a1411b111e56863
Parents: 0c5568a
Author: Alex Harui <aharui@apache.org>
Authored: Mon May 2 08:48:36 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon May 2 08:48:36 2016 -0700

----------------------------------------------------------------------
 compiler-jx/build.xml | 40 ++++++++++++++++++++++++++++++++++++++--
 compiler/build.xml    |  6 +++---
 2 files changed, 41 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ab0b67d7/compiler-jx/build.xml
----------------------------------------------------------------------
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index 577c29d..42b546f 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -25,12 +25,26 @@
 		<path location="${basedir}" />
     </pathconvert>
 	
+    <!-- The 'env' property contains all the environment variables -->
+    <property environment="env"/>
+    
+    <!-- Properties can be overridden locally by loading a local.properties file -->
+    <!-- Java 8 users probably need javadoc.params=-Xdoclint:none -->
+    <property file="${basedir}/local.properties"/>
+    <property file="${basedir}/../build.properties"/>
+    
 	<!-- Options for <javac> tasks -->
 	<property name="javac.debug" value="true"/>
 	<property name="javac.deprecation" value="false"/>
 	<property name="javac.src" value="1.6"/>
 
-	<property name="src" value="${basedir_clean}/src/main/java" />
+    <!-- JAR manifest entries -->
+    <property name="manifest.sealed" value="false"/>
+    <property name="manifest.Implementation-Title" value="Apache Flex Cross-Compiler"/>
+    <property name="manifest.Implementation-Version" value="${release.version}"/>
+    <property name="manifest.Implementation-Vendor" value="Apache Software Foundation"/>
+
+    <property name="src" value="${basedir_clean}/src/main/java" />
 	<property name="lib" value="${basedir_clean}/lib" />
 	
 	<property name="falcon.basedir" value="${basedir_clean}/../compiler" />
@@ -43,7 +57,13 @@
 	<property name="compc.jar" value="${lib}/compc.jar" />
 	<property name="jsc.jar" value="${lib}/jsc.jar" />
 
-	<path id="classpath">
+    <!-- env.BUILD_NUMBER is set by Jenkins CI -->
+    <condition property="build.number" value="nightly-${env.BUILD_NUMBER}">
+        <isset property="env.BUILD_NUMBER"/>
+    </condition>
+    <property name="build.number" value="0"/>
+
+    <path id="classpath">
         <filelist dir="${falcon.lib.dir}/external">
             <file name="antlr.jar" />
         </filelist>
@@ -92,6 +112,10 @@
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
+                <attribute name="Sealed" value="${manifest.sealed}"/>
+                <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
+                <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
+                <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
                 <attribute name="Class-Path" value="${jar.classpath}" />
             </manifest>
         </jar>
@@ -101,6 +125,10 @@
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
 			<manifest>
+                <attribute name="Sealed" value="${manifest.sealed}"/>
+                <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
+                <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
+                <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
 				<attribute name="Main-Class" value="org.apache.flex.compiler.clients.MXMLJSC" />
                 <attribute name="Class-Path" value="args4j.jar org.json.jar jsc.jar" />
 			</manifest>
@@ -111,6 +139,10 @@
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
 			<manifest>
+                <attribute name="Sealed" value="${manifest.sealed}"/>
+                <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
+                <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
+                <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
 				<attribute name="Main-Class" value="org.apache.flex.compiler.clients.COMPJSC" />
                 <attribute name="Class-Path" value="jsc.jar" />
 			</manifest>
@@ -121,6 +153,10 @@
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
+                <attribute name="Sealed" value="${manifest.sealed}"/>
+                <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
+                <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
+                <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
                 <attribute name="Main-Class" value="org.apache.flex.compiler.clients.EXTERNC"
/>
                 <attribute name="Class-Path" value="jsc.jar" />
             </manifest>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ab0b67d7/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index 6b18cad..bc9d8a2 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -65,9 +65,9 @@
     <property name="compiler.ant.binaries" value="org/apache/flex/compiler/ant/**/*.class"/>
     <property name="compiler.font.binaries" value="org/apache/flex/fonts/**"/>
             
-    <!-- label is set by CruiseControl script based on P4 label incrementer -->
-    <condition property="build.number" value="${label}">
-        <isset property="label"/>
+    <!-- env.BUILD_NUMBER is set by Jenkins CI -->
+    <condition property="build.number" value="nightly-${env.BUILD_NUMBER}">
+        <isset property="env.BUILD_NUMBER"/>
     </condition>
         
     <!--


Mime
View raw message