flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - Fixed missing 'deps', needed to concatenate the generated list to the 'goog' list
Date Mon, 18 Nov 2013 22:25:44 GMT
Updated Branches:
  refs/heads/develop a309f44b9 -> 6d8761404


Fixed missing 'deps', needed to concatenate the generated list to the 'goog' list

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>


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

Branch: refs/heads/develop
Commit: 6d87614045f71672977c8a611860cd6046f238df
Parents: a309f44
Author: Erik de Bruin <erik@ixsoftware.nl>
Authored: Mon Nov 18 23:25:24 2013 +0100
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Mon Nov 18 23:25:24 2013 +0100

----------------------------------------------------------------------
 .../codegen/mxml/flexjs/MXMLFlexJSPublisher.java  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6d876140/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index 6cf3f30..7807f1e 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -7,7 +7,6 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -25,11 +24,7 @@ import org.apache.flex.compiler.internal.graph.GoogDepsWriter;
 import org.apache.flex.compiler.internal.projects.FlexJSProject;
 import org.apache.flex.compiler.utils.JSClosureCompilerUtil;
 
-import com.google.javascript.jscomp.SourceFile;
 import com.google.javascript.jscomp.SourceMap;
-//import com.google.javascript.jscomp.ErrorManager;
-//import com.google.javascript.jscomp.deps.DepsGenerator;
-//import com.google.javascript.jscomp.deps.DepsGenerator.InclusionStrategy;
 
 public class MXMLFlexJSPublisher extends JSGoogPublisher implements
         IJSPublisher
@@ -158,9 +153,6 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
 
         File srcDeps = new File(depsSrcFilePath);
 
-        final List<SourceFile> deps = new ArrayList<SourceFile>();
-        deps.add(SourceFile.fromFile(srcDeps));
-
         writeHTML("intermediate", projectName, intermediateDirPath);
         writeHTML("release", projectName, releaseDirPath);
         writeCSS(projectName, intermediateDirPath);
@@ -220,9 +212,13 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
 
         if (!isMarmotinniRun)
         {
-            org.apache.commons.io.FileUtils.deleteQuietly(srcDeps);
-            org.apache.commons.io.FileUtils.moveFile(new File(depsTgtFilePath),
-                    srcDeps);
+            String allDeps = "";
+            allDeps += FileUtils.readFileToString(srcDeps);
+            allDeps += FileUtils.readFileToString(new File(depsTgtFilePath));
+            
+            FileUtils.writeStringToFile(srcDeps, allDeps);
+            
+            org.apache.commons.io.FileUtils.deleteQuietly(new File(depsTgtFilePath));
         }
 
         System.out.println("The project '"


Mime
View raw message