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 fix build by pointing test to local copy of files from the GCC download
Date Wed, 10 Jun 2015 06:37:14 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop 752348e43 -> 0bf2907d0


try to fix build by pointing test to local copy of files from the GCC download


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

Branch: refs/heads/develop
Commit: 0bf2907d09f846189efd36398db332b5f252f75f
Parents: 752348e
Author: Alex Harui <aharui@apache.org>
Authored: Tue Jun 9 23:37:06 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Jun 9 23:37:06 2015 -0700

----------------------------------------------------------------------
 .gitignore                                                   | 3 +++
 .../internal/codegen/externals/TestReferenceModel.java       | 2 +-
 compiler.jx/downloads.xml                                    | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0bf2907d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 23067a8..5f4e18c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,9 @@ rat.report
 # files copied from flex-sdk
 swfutils/
 
+# files copied from google closure compiler
+closure-compiler/
+
 # debugger output folders
 debugger/bin/
 debugger/generated/

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0bf2907d/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java
b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java
index 446d60e..88dcaef 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java
@@ -55,7 +55,7 @@ public class TestReferenceModel
         // C:\Users\Teoti\Documents\ApacheFlex\git\closure-compiler
         // Where
         // C:\Users\Teoti\Documents\ApacheFlex\git\flex-falcon\compiler.jx.tests
-        externsJS = FilenameNormalization.normalize(new File("../../closure-compiler/externs"));
+        externsJS = FilenameNormalization.normalize(new File("../closure-compiler/externs"));
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0bf2907d/compiler.jx/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index 827e162..5f224e2 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -232,6 +232,14 @@
     <ant dir="${download.dir}/temp/closure-compiler-${closure.version}" inheritAll="false"
/>
 
     <copy file="${download.dir}/temp/closure-compiler-${closure.version}/build/${closure.name}.jar"
toFile="${lib.dir}/${closure.dest.folder}/${closure.dest.filename}" verbose="true"/>
+    
+    <mkdir dir="${basedir}/../closure-compiler/externs" />
+    <copy todir="${basedir}/../closure-compiler/externs" failonerror="false" quiet="true">
+        <fileset dir="${download.dir}/temp/closure-compiler-${closure.version}/externs">
+            <include name="**/**"/>
+        </fileset>
+    </copy>
+
   </target>
 
   <target name="download-dependency-jar" if="project.download.jar" description="Downloads
a jar to the lib directory.">


Mime
View raw message