You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/04/09 01:05:16 UTC
[10/18] git commit: [flex-falcon] [refs/heads/develop] - new GCC will
figure out deps for you
new GCC will figure out deps for you
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7328a52e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7328a52e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7328a52e
Branch: refs/heads/develop
Commit: 7328a52e600a438ff7c23ed30efcd26688391b67
Parents: 01fc34f
Author: Alex Harui <ah...@apache.org>
Authored: Sat Mar 28 07:13:50 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Mar 28 07:13:50 2015 -0700
----------------------------------------------------------------------
.../mxml/flexjs/MXMLFlexJSPublisher.java | 25 ++++++++++----------
.../compiler/internal/graph/GoogDepsWriter.java | 15 ++++++++----
2 files changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7328a52e/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 6e1c7eb..1d1b542 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
@@ -92,6 +92,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
private boolean isMarmotinniRun;
private String outputPathParameter;
private boolean useStrictPublishing;
+ private String closureLibDirPath;
@Override
public File getOutputFolder()
@@ -166,7 +167,6 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
// If the closure-lib parameter is empty we'll try to find the resources
// in the classpath, dump its content to the output directory and use this
// as closure-lib parameter.
- final String closureLibDirPath;
if(((JSGoogConfiguration) configuration).isClosureLibSet()) {
closureLibDirPath = ((JSGoogConfiguration) configuration).getClosureLib();
} else {
@@ -245,8 +245,8 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
+ "/closure/goog/";
final String closureGoogTgtLibDirPath = intermediateDirPath
+ "/library/closure/goog";
- final String depsSrcFilePath = intermediateDirPath
- + "/library/closure/goog/deps.js";
+ //final String depsSrcFilePath = intermediateDirPath
+ // + "/library/closure/goog/deps.js";
final String depsTgtFilePath = intermediateDirPath + "/deps.js";
final String projectIntermediateJSFilePath = intermediateDirPath
+ File.separator + outputFileName;
@@ -256,17 +256,18 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
appendExportSymbol(projectIntermediateJSFilePath, projectName);
appendEncodedCSS(projectIntermediateJSFilePath, projectName);
- if (!subsetGoog)
- {
+ //if (!subsetGoog)
+ //{
// (erikdebruin) We need to leave the 'goog' files and dependencies well
// enough alone. We copy the entire library over so the
// 'goog' dependencies will resolve without our help.
FileUtils.copyDirectory(new File(closureGoogSrcLibDirPath), new File(closureGoogTgtLibDirPath));
- }
+ //}
JSClosureCompilerWrapper compilerWrapper = new JSClosureCompilerWrapper();
GoogDepsWriter gdw = new GoogDepsWriter(intermediateDir, projectName, (JSGoogConfiguration) configuration);
+ StringBuilder depsFileData = new StringBuilder();
try
{
ArrayList<String> fileList = gdw.getListOfFiles();
@@ -274,9 +275,8 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
{
compilerWrapper.addJSSourceFile(file);
}
- /*
- StringBuilder depsFileData = new StringBuilder();
ok = gdw.generateDeps(problems, depsFileData);
+ /*
if (!subsetGoog)
{
writeFile(depsTgtFilePath, depsFileData.toString(), false);
@@ -384,10 +384,10 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
FileUtils.copyDirectory(srcDir, intermediateDir, subdirs);
FileUtils.copyDirectory(srcDir, releaseDir, subdirs);
- File srcDeps = new File(depsSrcFilePath);
+ //File srcDeps = new File(depsSrcFilePath);
- writeHTML("intermediate", projectName, intermediateDirPath, gdw.additionalHTML);
- writeHTML("release", projectName, releaseDirPath, gdw.additionalHTML);
+ writeHTML("intermediate", projectName, intermediateDirPath, depsFileData.toString(), gdw.additionalHTML);
+ writeHTML("release", projectName, releaseDirPath, null, gdw.additionalHTML);
writeCSS(projectName, intermediateDirPath);
writeCSS(projectName, releaseDirPath);
@@ -549,7 +549,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
return code;
}
- private void writeHTML(String type, String projectName, String dirPath, List<String> additionalHTML)
+ private void writeHTML(String type, String projectName, String dirPath, String deps, List<String> additionalHTML)
throws IOException
{
StringBuilder htmlFile = new StringBuilder();
@@ -567,6 +567,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
{
htmlFile.append("\t<script type=\"text/javascript\" src=\"./library/closure/goog/base.js\"></script>\n");
htmlFile.append("\t<script type=\"text/javascript\">\n");
+ htmlFile.append(deps);
htmlFile.append("\t\tgoog.require(\"");
htmlFile.append(projectName);
htmlFile.append("\");\n");
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7328a52e/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index cd036be..617f87d 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -53,13 +53,17 @@ public class GoogDepsWriter {
private String mainName;
private List<String> otherPaths;
private boolean problemsFound = false;
+ private ArrayList<GoogDep> dps;
private HashMap<String,GoogDep> depMap = new HashMap<String,GoogDep>();
public ArrayList<String> getListOfFiles() throws InterruptedException
{
- buildDB();
- ArrayList<GoogDep> dps = sort(mainName);
+ if (dps == null)
+ {
+ buildDB();
+ dps = sort(mainName);
+ }
ArrayList<String> files = new ArrayList<String>();
for (GoogDep gd : dps)
{
@@ -72,8 +76,11 @@ public class GoogDepsWriter {
{
problemsFound = false;
this.problems = problems;
- buildDB();
- ArrayList<GoogDep> dps = sort(mainName);
+ if (dps == null)
+ {
+ buildDB();
+ dps = sort(mainName);
+ }
String outString = "// generated by FalconJS" + "\n";
int n = dps.size();
for (int i = n - 1; i >= 0; i--)