flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [4/5] git commit: [flex-falcon] [refs/heads/develop] - switch to antlr 3.5.2 from maven. antlr.org is blocked in some countries, but I couldn't find antlr 3.3 complete on maven. This version of antlr seems to inject suppresswarning annotations in the f
Date Tue, 27 May 2014 22:24:42 GMT
switch to antlr 3.5.2 from maven.  antlr.org is blocked in some countries, but I couldn't find
antlr 3.3 complete on maven.  This version of antlr seems to inject suppresswarning annotations
in the file so it looks like we don't need to inject our own, but now we're getting some warnings
that we'll have to revisit someday.  Maybe the annotator utility just has to merge suppresswarnings
so the compiler doesn't throw errors.


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

Branch: refs/heads/develop
Commit: 4738711bc1b21700bb08cc4f8d4741cc1584b8a6
Parents: 006c95e
Author: Alex Harui <aharui@apache.org>
Authored: Mon May 26 23:18:18 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue May 27 15:21:41 2014 -0700

----------------------------------------------------------------------
 compiler/build.xml     | 12 ++++++------
 compiler/downloads.xml | 10 ++++++----
 2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4738711b/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index 4202ff0..d14ee98 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -392,10 +392,10 @@
     	<echo message="Generating CSSLexer and CSSParser"/>
         <antlr3 input="${compiler}/src/org/apache/flex/compiler/internal/css/CSS.g"
                 output="${compiler}/generated/src/org/apache/flex/compiler/internal/css"/>
-        <annotate.class file="${compiler}/generated/src/org/apache/flex/compiler/internal/css/CSSLexer.java"
-                        annotation='@SuppressWarnings("unused")'/>
-        <annotate.class file="${compiler}/generated/src/org/apache/flex/compiler/internal/css/CSSParser.java"
-                        annotation='@SuppressWarnings("unused")'/>
+        <!--<annotate.class file="${compiler}/generated/src/org/apache/flex/compiler/internal/css/CSSLexer.java"
+                        annotation='@SuppressWarnings("unused")'/>-->
+        <!--<annotate.class file="${compiler}/generated/src/org/apache/flex/compiler/internal/css/CSSParser.java"
+                        annotation='@SuppressWarnings("unused")'/>-->
     </target>
         
     <target name="set.css.tree.uptodate">
@@ -408,8 +408,8 @@
     	<echo message="Generating CSSTree"/>
         <antlr3 input="${compiler}/src/org/apache/flex/compiler/internal/css/CSSTree.g"
                 output="${compiler}/generated/src/org/apache/flex/compiler/internal/css"/>
-        <annotate.class file="${compiler}/generated/src/org/apache/flex/compiler/internal/css/CSSTree.java"
-                        annotation='@SuppressWarnings({"rawtypes", "unchecked", "unused"})'/>
       
+        <!--<annotate.class file="${compiler}/generated/src/org/apache/flex/compiler/internal/css/CSSTree.java"
+                        annotation='@SuppressWarnings({"rawtypes", "unchecked", "unused"})'/>-->
       
     </target>
         
     <target name="antlr" depends="as.parser, metadata.parser, css.lexer.and.parser, css.tree"

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4738711b/compiler/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler/downloads.xml b/compiler/downloads.xml
index 9e5021d..911c5c1 100644
--- a/compiler/downloads.xml
+++ b/compiler/downloads.xml
@@ -49,9 +49,10 @@
     <property name="jflex.name" value="jflex-1.5.1"/>
     <property name="jburg.name" value="jburg-1.10.1"/>
     <property name="lzma.name" value="lzma-sdk-9.2"/>
-    
-    <property name="antlr.src.url" value="http://antlr3.org/download"/>
-    <property name="antlr.src.file" value="antlr-3.3-complete.jar"/>
+    <!--<property name="antlr.src.url" value="http://antlr3.org/download"/>-->
+    <!--<property name="antlr.src.file" value="antlr-3.3-complete.jar"/>-->
+    <property name="antlr.src.url" value="http://search.maven.org/remotecontent?filepath=org/antlr/antlr-complete/3.5.2"/>
+    <property name="antlr.src.file" value="antlr-complete-3.5.2.jar"/>
 	   
     <property name="INFO_DOWNLOADING_FILE_FROM" value="Downloading {0} from: {1}" />
     
@@ -234,7 +235,8 @@
             <param name="srcUrl" value="${antlr.src.url}"/>
             <param name="srcJarFile" value="${antlr.src.file}"/>
             <param name="destJarFile" value="${lib.dir}/antlr.jar"/>
-            <param name="md5" value="238becce7da69f7be5c5b8a65558cf63"/>
+            <param name="md5" value="7abf224f627594a3f4ae37fcfff296730f3f4edd"/>
+            <!--<param name="md5" value="238becce7da69f7be5c5b8a65558cf63"/>-->
         </antcall>
     </target>
 


Mime
View raw message