You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ms...@apache.org on 2015/06/21 19:35:47 UTC
git commit: [flex-falcon] [refs/heads/develop] - Removed warning from
EXTERNC. - Moved swcs to out/bin,
updated jquery build to grab the correct js.swc location.
Repository: flex-falcon
Updated Branches:
refs/heads/develop fca1b860f -> 8227fd6f3
Removed warning from EXTERNC.
- Moved swcs to out/bin, updated jquery build to grab the correct js.swc location.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8227fd6f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8227fd6f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8227fd6f
Branch: refs/heads/develop
Commit: 8227fd6f3065c0537817bd4f4bb1319e249b53e2
Parents: fca1b86
Author: Michael Schmalle <ms...@apache.org>
Authored: Sun Jun 21 13:35:07 2015 -0400
Committer: Michael Schmalle <ms...@apache.org>
Committed: Sun Jun 21 13:35:07 2015 -0400
----------------------------------------------------------------------
build.xml | 4 ++--
.../org/apache/flex/compiler/clients/EXTERNC.java | 18 ++++++++----------
externs/jquery/compile-config.xml | 4 ++--
3 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8227fd6f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 27ea53e..d583ab3 100644
--- a/build.xml
+++ b/build.xml
@@ -540,7 +540,7 @@
<arg value="+flexlib=${env.ASJS_HOME}/frameworks" />
<arg value="-debug" />
<arg value="-load-config=${basedir}/externs/js/compile-config.xml" />
- <arg value="-output=${basedir}/externs/js/js.swc" />
+ <arg value="-output=${basedir}/externs/js/out/bin/js.swc" />
</java>
</target>
@@ -557,7 +557,7 @@
<arg value="+flexlib=${env.ASJS_HOME}/frameworks" />
<arg value="-debug" />
<arg value="-load-config=${basedir}/externs/jquery/compile-config.xml" />
- <arg value="-output=${basedir}/externs/jquery/jquery-1.9.swc" />
+ <arg value="-output=${basedir}/externs/jquery/out/bin/jquery-1.9.swc" />
</java>
</target>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8227fd6f/compiler.jx/src/org/apache/flex/compiler/clients/EXTERNC.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/clients/EXTERNC.java b/compiler.jx/src/org/apache/flex/compiler/clients/EXTERNC.java
index 8a632db..a488b90 100644
--- a/compiler.jx/src/org/apache/flex/compiler/clients/EXTERNC.java
+++ b/compiler.jx/src/org/apache/flex/compiler/clients/EXTERNC.java
@@ -25,7 +25,6 @@ import java.util.Set;
import org.apache.commons.io.FileUtils;
import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ICompilerSettingsConstants;
import org.apache.flex.compiler.internal.codegen.externals.emit.ReferenceEmitter;
import org.apache.flex.compiler.internal.codegen.externals.pass.ReferenceCompiler;
import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
@@ -80,21 +79,20 @@ public class EXTERNC
public EXTERNC()
{
}
-
+
public EXTERNC(ExternCConfiguration configuration)
{
- configure(configuration);
+ configure(configuration);
}
public void configure(String[] args)
{
- projectConfigurator = createConfigurator();
- projectConfigurator.setConfiguration(args,
- "external", false);
+ projectConfigurator = createConfigurator();
+ projectConfigurator.setConfiguration(args, "external", false);
projectConfigurator.getTargetSettings(TargetType.SWC);
- configure((ExternCConfiguration)projectConfigurator.getConfiguration());
+ configure((ExternCConfiguration) projectConfigurator.getConfiguration());
}
-
+
public void configure(ExternCConfiguration configuration)
{
this.configuration = configuration;
@@ -112,9 +110,9 @@ public class EXTERNC
*/
protected Configurator createConfigurator()
{
- return new Configurator(ExternCConfiguration.class);
+ return new Configurator(ExternCConfiguration.class);
}
-
+
/**
* Java program entry point.
*
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8227fd6f/externs/jquery/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/jquery/compile-config.xml b/externs/jquery/compile-config.xml
index f75cd56..c0c7f34 100644
--- a/externs/jquery/compile-config.xml
+++ b/externs/jquery/compile-config.xml
@@ -51,7 +51,7 @@
-->
<external-library-path>
- <path-element>../js/js.swc</path-element>
+ <path-element>../js/out/bin/js.swc</path-element>
</external-library-path>
<source-path>
@@ -68,7 +68,7 @@
<path-element>out/as/classes</path-element>
<path-element>out/as/interfaces</path-element>
<path-element>out/as/typedefs</path-element>
- <path-element>out/as/functions</path-element>
+ <path-element>out/as/functions</path-element>
</include-sources>
<!--