flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [2/2] git commit: [flex-sdk] [refs/heads/develop] - fix version regexp and correct antelope tasks check (more recent version is lowercase)
Date Mon, 24 Feb 2014 22:48:04 GMT
fix version regexp and correct antelope tasks check (more recent version is lowercase)


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

Branch: refs/heads/develop
Commit: 9ab0f42d588e244bac2a68061ffb6fc9467c7be4
Parents: 39e5281
Author: Justin Mclean <jmclean@apache.org>
Authored: Tue Feb 25 09:46:47 2014 +1100
Committer: Justin Mclean <jmclean@apache.org>
Committed: Tue Feb 25 09:46:47 2014 +1100

----------------------------------------------------------------------
 build.xml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9ab0f42d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 3f0ff10..30c67d5 100644
--- a/build.xml
+++ b/build.xml
@@ -68,7 +68,7 @@
     <!-- 
         Optional jars but should be in place for a real release build.
         
-        For <grep> put AntelopeTasks_*.jar in this path.
+        For <grep> put antelopetasks*.jar in this path.
         See version-update.
 
         For <rat> apache-rat-0.8.jar and apache-rat-tasks-0.8.jar should be in classpath.
@@ -76,11 +76,11 @@
     -->
     <path id="anttask.classpath">
         <fileset dir="${env.ANT_HOME}/lib">
-           <include name="**/AntelopeTasks_*.jar"/>
+           <include name="**/antelopetasks*.jar"/>
            <include name="**/apache-rat*.jar"/>
         </fileset>
         <fileset dir="${user.home}">
-           <include name=".ant/lib/**/AntelopeTasks_*.jar"/>
+           <include name=".ant/lib/**/antelopetasks*.jar"/>
            <include name=".ant/lib/**/apache-rat*.jar"/>
         </fileset>
     </path>
@@ -1161,7 +1161,7 @@ There are no known issues.
 	    Update all frameworks Version.as files in the kit stagging area with the 
 	    latest version build number info.
 	    
-	    You need to place the AntelopeTasks_*.jar jar file in the anttask.classpath
+	    You need to place the antelopetasks*.jar jar file in the anttask.classpath
 	    in order to do this.  If the jar isn't found, the update is skipped.
 	-->
 	<target name="version-update"
@@ -1176,14 +1176,17 @@ There are no known issues.
     </target>
 
     <target name="have-greptask" if="have.greptask">
-		<taskdef name="grep" classname="ise.antelope.tasks.Find"
-                 classpathref="anttask.classpath"/>                 
+		<taskdef name="grep" classname="ise.antelope.tasks.Find" classpathref="anttask.classpath"/>
                
 
+        <tstamp>
+        	<format property="build.number.date" pattern="yyyyMMdd" />
+        </tstamp>
+        	
         <echo message="Updating all frameworks/projects/**/Version.as files with version
${release.version}.${build.number.date}"/>
 		
         <!-- Update all Version.as files in the kit frameworks directory-->
         <replaceregexp>
-            <regexp pattern='"[0-9].[0-9].[0-9].[0-9]";'/>
+            <regexp pattern='"[0-9]\.[0-9]+\.[0-9]+\.[0-9]+";'/>
             <substitution expression='"${release.version}.${build.number.date}";'/>
             <fileset dir="${FLEX_HOME}/temp/frameworks/projects">
                 <include name="**/Version.as"/>
@@ -1193,7 +1196,7 @@ There are no known issues.
 
     <target name="no-greptask" unless="have.greptask">
         <echo message="Version files not updated."/>
-        <echo message="AntelopeTasks_*.jar not found in anttask.classpath"/>
+        <echo message="antelopetasks*.jar not found in anttask.classpath"/>
     </target>   
 
     <target name="stage-locales"


Mime
View raw message