You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/11/17 11:49:19 UTC
[2/2] git commit: [flex-falcon] [refs/heads/develop] - Removing old
code
Removing old code
Signed-off-by: Erik de Bruin <er...@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/753c7853
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/753c7853
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/753c7853
Branch: refs/heads/develop
Commit: 753c7853a58ef337a4f34ebdd30f1accf03d2987
Parents: 828ab76
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun Nov 17 11:47:05 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Nov 17 11:47:05 2013 +0100
----------------------------------------------------------------------
.../mxml/flexjs/MXMLFlexJSPublisher.java | 56 +-------------------
1 file changed, 1 insertion(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/753c7853/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 7d0e0e9..6cf3f30 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
@@ -117,16 +117,6 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
+ "/closure/goog/";
final String closureGoogTgtLibDirPath = intermediateDirPath
+ "/library/closure/goog";
- /* AJH not needed by GoogDepsWriter
- final String closureGoogTgtLibDirRelPath = "./library/closure/goog";
- final String closureTPSrcLibDirPath = closureLibDirPath
- + "/third_party/closure/goog/";
- final String closureTPTgtLibDirPath = intermediateDirPath
- + "/library/third_party/closure/goog";
- final List<String> sdkJSLibSrcDirPaths = ((JSGoogConfiguration) configuration)
- .getSDKJSLib();
- final String sdkJSLibTgtDirPath = intermediateDirPath;
- */
final String depsSrcFilePath = intermediateDirPath
+ "/library/closure/goog/deps.js";
final String depsTgtFilePath = intermediateDirPath + "/deps.js";
@@ -154,42 +144,6 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
e.printStackTrace();
}
- if (!isMarmotinniRun)
- {
- //for (String sdkJSLibSrcDirPath : sdkJSLibSrcDirPaths)
- // copyFile(sdkJSLibSrcDirPath, sdkJSLibTgtDirPath);
- }
- boolean isWindows = System.getProperty("os.name").indexOf("Mac") == -1;
-
- List<SourceFile> inputs = new ArrayList<SourceFile>();
- Collection<File> files = org.apache.commons.io.FileUtils.listFiles(
- new File(intermediateDirPath),
- new RegexFileFilter("^.*(\\.js)"),
- DirectoryFileFilter.DIRECTORY);
- for (File file : files)
- {
- if (isWindows)
- {
- // TODO (erikdebruin) maybe fix the 'manual' relative path prefix?
- String filePath = "../../../"
- + new File(intermediateDirPath).toURI()
- .relativize(file.toURI()).getPath();
-
- inputs.add(SourceFile.fromCode(filePath, filePath,
- readCode(file)));
- }
- else
- {
- inputs.add(SourceFile.fromFile(file));
- }
- }
-
- if (!isMarmotinniRun)
- {
- //copyFile(closureGoogSrcLibDirPath, closureGoogTgtLibDirPath);
- //copyFile(closureTPSrcLibDirPath, closureTPTgtLibDirPath);
- }
-
IOFileFilter pngSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE,
FileFilterUtils.suffixFileFilter(".png"));
IOFileFilter gifSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE,
@@ -207,14 +161,6 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
final List<SourceFile> deps = new ArrayList<SourceFile>();
deps.add(SourceFile.fromFile(srcDeps));
-// ErrorManager errorManager = new JSGoogErrorManager();
-// DepsGenerator depsGenerator = new DepsGenerator(deps, inputs,
-// InclusionStrategy.ALWAYS,
-// (isWindows) ? closureGoogTgtLibDirRelPath
-// : closureGoogTgtLibDirPath, errorManager);
-// writeFile(depsTgtFilePath, depsGenerator.computeDependencyCalls(),
-// false);
-
writeHTML("intermediate", projectName, intermediateDirPath);
writeHTML("release", projectName, releaseDirPath);
writeCSS(projectName, intermediateDirPath);
@@ -223,7 +169,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
ArrayList<String> optionList = new ArrayList<String>();
// (erikdebruin) add 'goog' files
- files = org.apache.commons.io.FileUtils.listFiles(new File(
+ Collection<File> files = org.apache.commons.io.FileUtils.listFiles(new File(
closureGoogTgtLibDirPath), new RegexFileFilter("^.*(\\.js)"),
DirectoryFileFilter.DIRECTORY);
for (File file : files)