You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by gr...@apache.org on 2017/08/19 06:46:18 UTC
[1/3] git commit: [flex-falcon] [refs/heads/develop] - This looks
like an omission of something that was intended to be configurable.
Repository: flex-falcon
Updated Branches:
refs/heads/develop 9539c83f6 -> 1b3b89aa8
This looks like an omission of something that was intended to be configurable.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/96a358c5
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/96a358c5
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/96a358c5
Branch: refs/heads/develop
Commit: 96a358c579bafba3cb1f9cd66de0fefc65cbaca0
Parents: 1abf643
Author: greg-dove <gr...@gmail.com>
Authored: Sat Aug 19 18:38:13 2017 +1200
Committer: greg-dove <gr...@gmail.com>
Committed: Sat Aug 19 18:38:13 2017 +1200
----------------------------------------------------------------------
.../src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/96a358c5/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
index d8c5ded..93298f5 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
@@ -95,7 +95,7 @@ public class CompileAppMojo
throw new MojoExecutionException("Could not find main class");
}
List<String> args = super.getCompilerArgs(configFile);
- File jsOutput = new File(outputDirectory, "javascript");
+ File jsOutput = new File(outputDirectory, javascriptOutputDirectoryName);
args.add("-js-output=" + jsOutput.getAbsolutePath());
args.add("-compiler.targets=" + targets);
args.add(mainClassPath);
[3/3] git commit: [flex-falcon] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Posted by gr...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/1b3b89aa
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/1b3b89aa
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/1b3b89aa
Branch: refs/heads/develop
Commit: 1b3b89aa80d1da03ad375beeef9ed4d015be1dba
Parents: 14578bd 9539c83
Author: greg-dove <gr...@gmail.com>
Authored: Sat Aug 19 18:39:46 2017 +1200
Committer: greg-dove <gr...@gmail.com>
Committed: Sat Aug 19 18:39:46 2017 +1200
----------------------------------------------------------------------
.../mxml/flexjs/MXMLDescriptorSpecifier.java | 14 +++++----
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 21 ++++++-------
.../mxml/flexjs/MXMLFlexJSPublisher.java | 31 +-------------------
.../internal/projects/FlexJSProject.java | 20 +++++++++++++
4 files changed, 41 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: [flex-falcon] [refs/heads/develop] - Saw an issue
with TestFlexJSExpressions::testVisitStringLiteralChinese in ant build This
appears to fix it.
Posted by gr...@apache.org.
Saw an issue with TestFlexJSExpressions::testVisitStringLiteralChinese in ant build
This appears to fix it.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/14578bdb
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/14578bdb
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/14578bdb
Branch: refs/heads/develop
Commit: 14578bdbce0a764f8fedef4d2d0fc69e0451eef7
Parents: 96a358c
Author: greg-dove <gr...@gmail.com>
Authored: Sat Aug 19 18:39:28 2017 +1200
Committer: greg-dove <gr...@gmail.com>
Committed: Sat Aug 19 18:39:28 2017 +1200
----------------------------------------------------------------------
compiler-jx/src/test/build.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/14578bdb/compiler-jx/src/test/build.xml
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/build.xml b/compiler-jx/src/test/build.xml
index fad70f4..9c36f30 100644
--- a/compiler-jx/src/test/build.xml
+++ b/compiler-jx/src/test/build.xml
@@ -40,7 +40,9 @@
<target name="compile.unit.tests">
<delete dir="${compiler}/target/test-classes"/>
<mkdir dir="${compiler}/target/test-classes"/>
- <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/target/test-classes" includeAntRuntime="true">
+ <javac debug="${javac.debug}" deprecation="${javac.deprecation}"
+ encoding="UTF-8"
+ destdir="${compiler}/target/test-classes" includeAntRuntime="true">
<src path="${compiler.tests}/java"/>
<compilerarg value="-Xlint:all,-path"/>
<classpath>
@@ -60,6 +62,7 @@
printsummary="true" showoutput="true"
haltonerror="true" haltonfailure="true"
failureproperty="tests.unit.failed">
+ <jvmarg value="-Dfile.encoding=UTF-8"/>
<classpath>
<pathelement location="${compiler}/target/test-classes"/>
<pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
@@ -100,6 +103,7 @@
printsummary="true" showoutput="true"
haltonerror="true" haltonfailure="true"
failureproperty="tests.unit.failed">
+ <jvmarg value="-Dfile.encoding=UTF-8"/>
<classpath>
<pathelement location="${compiler}/target/test-classes"/>
<pathelement location="${compiler}/../compiler-test-utils/target/classes"/>