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 2014/04/16 15:27:57 UTC
[1/9] git commit: [flex-falcon] [refs/heads/develop] - JFlex 1.5 is
BSD so no longer a pre-req
Repository: flex-falcon
Updated Branches:
refs/heads/develop 285da92d7 -> 2263a876a
JFlex 1.5 is BSD so no longer a pre-req
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6f979265
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6f979265
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6f979265
Branch: refs/heads/develop
Commit: 6f979265f3d7be60b2c8f459734433a51e46ae7d
Parents: 285da92
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 15 09:58:41 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 15 20:13:20 2014 -0700
----------------------------------------------------------------------
README | 13 +------------
compiler/build.xml | 11 +++--------
compiler/downloads.xml | 36 +++++++++++++++++++++++++++++++++++-
3 files changed, 39 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6f979265/README
----------------------------------------------------------------------
diff --git a/README b/README
index 1009aad..5a88c1a 100644
--- a/README
+++ b/README
@@ -56,10 +56,6 @@ Building the Apache Flex Compiler
Some of these have different licenses. See the Software Dependencies section
for more information on the external software dependencies.
- From Apache's perspective, the JFlex jar has an excluded license so they can
- not be bundled with the Apache Flex binaries.
- It must be installed prior to building Apache Flex.
-
Linux support is currently experimental and while it is possible to compile
the SDK it has not been fully tested so you may run into issues.
@@ -86,8 +82,6 @@ Install Prerequisites
Adobe Flash Player playerglobal swcs (*5) PLAYERGLOBAL_HOME
- JFlex jar (*6) JFLEX_JAR
-
Apache Flex SDK or repository FLEX_HOME
==================================================================================
@@ -172,12 +166,6 @@ Install Prerequisites
These can be used with Apache Flex but not all have not been fully
tested.
- *6) The JFlex jar can be downloaded from:
- http://jflex.de/download.html
-
- Set JFLEX_JAR to the absolute path of JFlex.jar
- e.g JFLEX_JAR=/path/to/jflex-1.4.3/lib/JFlex.jar
-
Software Dependencies
---------------------
@@ -197,6 +185,7 @@ Software Dependencies
commons-io - http://archive.apache.org/dist/commons/io/binaries/commons-io-2.0.1.tar.gz
guava - http://search.maven.org/remotecontent?filepath=com/google/guava/guava/15.0/guava-15.0.jar
jburg - http://downloads.sourceforge.net/project/jburg/jburg-1.10.1.tar.gz
+ jflex - http://jflex.de/jflex-1.5.1.tar.gz
lzma - http://www.java2s.com/Code/JarDownload/lzma/lzma-9.20.jar.zip
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6f979265/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index 92651e9..6ead735 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -115,7 +115,7 @@
<attribute name="skeleton" default="${compiler}/src/org/apache/flex/compiler/internal/parsing/as/skeleton.default"/>
<attribute name="output"/>
<sequential>
- <java jar="${env.JFLEX_JAR}" fork="true">
+ <java jar="${compiler}/lib/JFlex.jar" fork="true">
<arg value="-d"/>
<arg value="@{output}"/>
<arg value="-q"/>
@@ -222,18 +222,12 @@
-->
- <target name="checkenv" description="Checks environment variables">
- <echo message="JFLEX_JAR is ${env.JFLEX_JAR}"/>
- <available file="${env.JFLEX_JAR}" type="file" property="JFLEX_JAR.set"/>
- <fail message="JFLEX_JAR must be set correctly." unless="JFLEX_JAR.set"/>
- </target>
-
<target name="download" description="Downloads third-party JARs">
<ant antfile="${compiler}/downloads.xml" dir="${compiler}"/>
<delete dir="${compiler}/in"/>
</target>
- <target name="setup" depends="checkenv, download" description="Does prelimary build setup">
+ <target name="setup" depends="download" description="Does prelimary build setup">
</target>
<!--
@@ -771,6 +765,7 @@
-->
<target name="bin-legacy">
+ <mkdir dir="${sdk}/bin-legacy" />
<copy todir="${sdk}/bin-legacy" includeEmptyDirs="false">
<fileset dir="${sdk.branch}/bin">
<include name="**/*"/>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6f979265/compiler/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler/downloads.xml b/compiler/downloads.xml
index 3938b2a..9e5021d 100644
--- a/compiler/downloads.xml
+++ b/compiler/downloads.xml
@@ -46,6 +46,7 @@
<property name="commons-cli.name" value="commons-cli-1.2"/>
<property name="commons-io.name" value="commons-io-2.0.1"/>
<property name="guava.name" value="guava-15.0"/>
+ <property name="jflex.name" value="jflex-1.5.1"/>
<property name="jburg.name" value="jburg-1.10.1"/>
<property name="lzma.name" value="lzma-sdk-9.2"/>
@@ -59,7 +60,7 @@
they are each downloaded only if they don't already exist.
-->
- <target name="main" depends="prepare, antlr-jar, commons-jars, guava-jar, jburg-jar, lzma-jar"
+ <target name="main" depends="prepare, antlr-jar, commons-jars, guava-jar, jflex-jar, jburg-jar, lzma-jar"
description="Downloads all the required thirdparty JARs"/>
<target name="prepare" >
@@ -79,6 +80,7 @@
<include name="commons-cli*/**"/>
<include name="commons-io*/**"/>
<include name="guava*/**"/>
+ <include name="jflex*/**"/>
<include name="jburg*/**"/>
<include name="lzma*/**"/>
</fileset>
@@ -333,6 +335,38 @@
<get src="http://www.apache.org/licenses/LICENSE-2.0" dest="${lib.dir}/guava-LICENSE.txt"/>
</target>
+ <!--
+ jflex
+ -->
+
+ <target name="jflex-jar-check" description="Checks if jflex.jar has been downloaded.">
+ <available file="${lib.dir}/jflex.jar" property="jflex.jar.exists"/>
+ </target>
+
+ <target name="jflex-jar" depends="jflex-jar-check" unless="jflex.jar.exists"
+ description="Downloads and copies jflex.jar to the lib directory.">
+ <echo file="${basedir}/jflex.properties">jflex.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
+ <replace file="${basedir}/jflex.properties" token="{0}" value="${jflex.name}.tar.gz" />
+ <replace file="${basedir}/jflex.properties" token="{1}" value="http://jflex.de" />
+ <property file="${basedir}/jflex.properties" />
+ <delete file="${basedir}/jflex.properties" />
+ <echo>${cli.echo}</echo>
+ <antcall target="download-zip">
+ <param name="srcUrl" value="http://jflex.de"/>
+ <param name="zipFile" value="${jflex.name}.tar.gz"/>
+ <param name="md5" value="a05956c9ac8bacdc2b8d07fb2cb331ce"/>
+ <param name="srcJarPath" value="${jflex.name}/lib/${jflex.name}.jar"/>
+ <param name="destJarFile" value="${lib.dir}/JFlex.jar"/>
+ </antcall>
+ <copy todir="${lib.dir}">
+ <fileset dir="${download.dir}/temp/${jflex.name}">
+ <include name="LICENSE.txt"/>
+ </fileset>
+ <globmapper from="*" to="JFlex-*"/>
+ </copy>
+ <delete dir="${download.dir}/temp/${jflex.name}"/>
+ </target>
+
<!--
jburg - for codegen of certain java source files
-->
[6/9] git commit: [flex-falcon] [refs/heads/develop] - Revert
"guarantee that target-player gets processed before library-path otherwise
wrong player gets checked"
Posted by ah...@apache.org.
Revert "guarantee that target-player gets processed before library-path otherwise wrong player gets checked"
This reverts commit b5a06269f51aa1843cc6da79dd3a6eb0f4848345.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/aecf7b86
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/aecf7b86
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/aecf7b86
Branch: refs/heads/develop
Commit: aecf7b86eb2d37cc14dc9fcc879d56270dbc4a42
Parents: 8a356a8
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 15 11:24:33 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 15 20:13:24 2014 -0700
----------------------------------------------------------------------
.../compiler/config/ConfigurationBuffer.java | 23 --------------------
1 file changed, 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/aecf7b86/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java b/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
index f76bf17..b6484fd 100644
--- a/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
+++ b/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
@@ -102,8 +102,6 @@ import com.google.common.collect.ImmutableList;
*/
public final class ConfigurationBuffer
{
- private static final String TARGET_PLAYER = "target-player";
-
public ConfigurationBuffer(Class<? extends Configuration> configClass)
{
this(configClass, new HashMap<String, String>());
@@ -716,27 +714,6 @@ public final class ConfigurationBuffer
Set<String> done = new HashSet<String>();
boolean success = true;
- // get target-player first because its setting affect expansion of some
- // tokens later. The varList is populated by getMethods() which returns
- // the methods in random order and can result in compiler.library-path being
- // evaluated before target-player and then we end up looking up the wrong
- // version of playerglobal.
- if (varList.contains(TARGET_PLAYER))
- {
- varList.remove(TARGET_PLAYER);
- if (varMap.containsKey(TARGET_PLAYER))
- {
- try
- {
- commitVariable(config, TARGET_PLAYER, done);
- }
- catch (ConfigurationException e)
- {
- problems.add(new ConfigurationProblem(e));
- success = false;
- }
- }
- }
for (Iterator<String> vars = varList.iterator(); vars.hasNext();)
{
String var = vars.next();
[9/9] git commit: [flex-falcon] [refs/heads/develop] - don't need this
Posted by ah...@apache.org.
don't need this
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2263a876
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2263a876
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2263a876
Branch: refs/heads/develop
Commit: 2263a876af1e3dabf9884a8e4379597d9be2cd41
Parents: 95bc9c3
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 16 06:19:35 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 16 06:19:35 2014 -0700
----------------------------------------------------------------------
build.xml | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2263a876/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2c326be..70af1ee 100644
--- a/build.xml
+++ b/build.xml
@@ -251,9 +251,6 @@
<fixcrlf srcdir="${basedir}/temp/compiler/commandline" eol="crlf" fixlast="false">
<include name="**.bat"/>
</fixcrlf>
- <fixcrlf srcdir="${basedir}/temp/compiler/generated/dist/sdk/bin" eol="crlf" fixlast="false">
- <include name="**.bat"/>
- </fixcrlf>
<!--
Unix shell scripts need the correct line endings.
@@ -374,9 +371,6 @@
<fixcrlf srcdir="${basedir}/temp/compiler/commandline" eol="crlf" fixlast="false">
<include name="**.bat"/>
</fixcrlf>
- <fixcrlf srcdir="${basedir}/temp/compiler/generated/dist/sdk/bin" eol="crlf" fixlast="false">
- <include name="**.bat"/>
- </fixcrlf>
<!--
Unix shell scripts need the correct line endings.
[3/9] git commit: [flex-falcon] [refs/heads/develop] - add more issues
Posted by ah...@apache.org.
add more issues
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/bd224cf9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bd224cf9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bd224cf9
Branch: refs/heads/develop
Commit: bd224cf966cc9b3f02569221372f295aa21df931
Parents: 07f66be
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 15 11:22:50 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 15 20:13:22 2014 -0700
----------------------------------------------------------------------
RELEASE_NOTES | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bd224cf9/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index daa471c..847540d 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -4,7 +4,9 @@ Apache Flex 'Falcon' Compiler 0.0.1
Apache Flex 'Falcon' Compiler 0.0.1 is the initial release of a next-generation
compiler intended to someday replace the MXMLC in Apache Flex SDKs, and is the
compiler for Apache FlexJS SDKs. It is based on the Adobe ASC2.0 compiler but
-officially supports MXML compilation and includes some bug fixes.
+officially supports MXML compilation and includes some bug fixes. This is an
+'alpha' type of release. Expect to find lots of bugs and missing features, but
+please file bugs and contribute fixes.
Known Issues
_____________
@@ -15,6 +17,20 @@ The Apache Flex Falcon compiler should work in Adobe Flash Builder 4.7, but does
not support incremental compilation and may compile the project even if nothing
has changed.
+
+Unit Test results in compiler.tests
+
+The jar.tests report "Java Result: 1" which is expected as all these tests do is verify that the jar is executable and has a "main" entry point which in this case reports the compiler usage help and returns 1.
+
+Compilation Warnings
+
+The Java compiler will report warnings for several files in this release.
+
+Files in compiler/commandline
+
+The files in compiler/commandline are templates used to create a 'final' SDK. You cannot run the files in compiler/commandline. Instead, after the build is complete, there will be an SDK with a bin folder with the same files in compiler/generated/dist/sdk
+
+
Please report new issues to our bugbase at:
https://issues.apache.org/jira/browse/FLEX
[4/9] git commit: [flex-falcon] [refs/heads/develop] - try to fix
line endings in package
Posted by ah...@apache.org.
try to fix line endings in package
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3a523215
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3a523215
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3a523215
Branch: refs/heads/develop
Commit: 3a52321562d3dbc491ad29851692014b0dcdbd7c
Parents: bd224cf
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 15 11:23:29 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 15 20:13:22 2014 -0700
----------------------------------------------------------------------
build.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3a523215/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e8a3020..2c326be 100644
--- a/build.xml
+++ b/build.xml
@@ -235,6 +235,7 @@
<fixcrlf srcdir="${basedir}/temp" eol="crlf" fixlast="false">
<exclude name="compiler/generated/dist/sdk/bin/**"/>
<exclude name="compiler/generated/dist/sdk/bin-legacy/**"/>
+ <exclude name="compiler/commandline/**"/>
<exclude name="**/assets/**"/>
<exclude name="**/*.fla"/>
<exclude name="**/*.flv"/>
@@ -247,6 +248,12 @@
<exclude name="**/*.sh"/>
<exclude name="**/*.swf"/>
</fixcrlf>
+ <fixcrlf srcdir="${basedir}/temp/compiler/commandline" eol="crlf" fixlast="false">
+ <include name="**.bat"/>
+ </fixcrlf>
+ <fixcrlf srcdir="${basedir}/temp/compiler/generated/dist/sdk/bin" eol="crlf" fixlast="false">
+ <include name="**.bat"/>
+ </fixcrlf>
<!--
Unix shell scripts need the correct line endings.
@@ -351,6 +358,7 @@
<fixcrlf srcdir="${basedir}/temp" eol="crlf" fixlast="false">
<exclude name="compiler/generated/dist/sdk/bin/**"/>
<exclude name="compiler/generated/dist/sdk/bin-legacy/**"/>
+ <exclude name="compiler/commandline/**"/>
<exclude name="**/assets/**"/>
<exclude name="**/*.fla"/>
<exclude name="**/*.flv"/>
@@ -363,6 +371,12 @@
<exclude name="**/*.sh"/>
<exclude name="**/*.swf"/>
</fixcrlf>
+ <fixcrlf srcdir="${basedir}/temp/compiler/commandline" eol="crlf" fixlast="false">
+ <include name="**.bat"/>
+ </fixcrlf>
+ <fixcrlf srcdir="${basedir}/temp/compiler/generated/dist/sdk/bin" eol="crlf" fixlast="false">
+ <include name="**.bat"/>
+ </fixcrlf>
<!--
Unix shell scripts need the correct line endings.
[7/9] git commit: [flex-falcon] [refs/heads/develop] - FLEX-34225
attempt to fix ordering problem
Posted by ah...@apache.org.
FLEX-34225 attempt to fix ordering problem
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/02d113c4
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/02d113c4
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/02d113c4
Branch: refs/heads/develop
Commit: 02d113c4ba9616b91c6827aebefabedd7bf8f00d
Parents: aecf7b8
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 15 17:20:28 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 15 20:13:25 2014 -0700
----------------------------------------------------------------------
compiler/src/org/apache/flex/compiler/config/Configuration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/02d113c4/compiler/src/org/apache/flex/compiler/config/Configuration.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/config/Configuration.java b/compiler/src/org/apache/flex/compiler/config/Configuration.java
index 0b4544b..3c9957e 100644
--- a/compiler/src/org/apache/flex/compiler/config/Configuration.java
+++ b/compiler/src/org/apache/flex/compiler/config/Configuration.java
@@ -2186,7 +2186,7 @@ public class Configuration
@Mapping({"compiler", "library-path"})
@Arguments(Arguments.PATH_ELEMENT)
@InfiniteArguments
- @SoftPrerequisites("locale")
+ @SoftPrerequisites({"locale", "target-player"})
public void setCompilerLibraryPath(ConfigurationValue cv, String[] pathlist) throws CannotOpen
{
final ImmutableList<String> resolvedPaths = expandTokens(
[5/9] git commit: [flex-falcon] [refs/heads/develop] - remove some
trace statements
Posted by ah...@apache.org.
remove some trace statements
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8a356a89
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8a356a89
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8a356a89
Branch: refs/heads/develop
Commit: 8a356a8913964ed6bdb976f5bff89ffca751f63a
Parents: 3a52321
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 15 11:23:58 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 15 20:13:23 2014 -0700
----------------------------------------------------------------------
.../internal/as/codegen/MXMLClassDirectiveProcessor.java | 4 ++--
.../internal/codegen/databinding/MXMLBindingDirectiveHelper.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8a356a89/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java b/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java
index a8d6593..5514e47 100644
--- a/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java
+++ b/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java
@@ -2475,8 +2475,8 @@ public class MXMLClassDirectiveProcessor extends ClassDirectiveProcessor
getProject(), base, d.getBaseName(), NamespaceDefinition.getPublicNamespaceDefinition(), false);
if (baseDef == null)
addBindableVariableTrait(idName, instanceClassName, d);
- else
- System.out.println("not adding bindable variable trait for " + d.getBaseName() + " in " + instanceClassName);
+ //else
+ // System.out.println("not adding bindable variable trait for " + d.getBaseName() + " in " + instanceClassName);
}
else
addBindableVariableTrait(idName, instanceClassName, d);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8a356a89/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
index 0fb28a8..e053aec 100644
--- a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
+++ b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
@@ -187,7 +187,7 @@ public class MXMLBindingDirectiveHelper
private InstructionList outputBindingInfoAsData(boolean isFlexSDK)
{
- System.out.println("outputBindingInfoAsData");
+ //System.out.println("outputBindingInfoAsData");
InstructionList ret = new InstructionList();
int propertyCount = 0;
[8/9] git commit: [flex-falcon] [refs/heads/develop] - Switching to
JFLex1.5 broke the ability to send in a partial tag so now we send in a full
tag
Posted by ah...@apache.org.
Switching to JFLex1.5 broke the ability to send in a partial tag so now we send in a full tag
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/95bc9c3f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/95bc9c3f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/95bc9c3f
Branch: refs/heads/develop
Commit: 95bc9c3f91191af8c117450ce99e8d03dae5fea5
Parents: 02d113c
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 15 20:09:21 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 15 20:13:26 2014 -0700
----------------------------------------------------------------------
.../apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/95bc9c3f/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
index e13a0ea..2f7b018 100644
--- a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
+++ b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
@@ -220,10 +220,11 @@ public abstract class MXMLNodeBase extends NodeBase implements IMXMLNode
protected static boolean isValidXMLTagName(String tagName)
{
String s = "<" + tagName;
- IMXMLToken[] tokens = mxmlTokenizer.get().getTokens(s);
- return tokens != null && tokens.length == 1 &&
+ IMXMLToken[] tokens = mxmlTokenizer.get().getTokens(s + "/>");
+ return tokens != null && tokens.length == 2 &&
tokens[0].getType() == MXMLTokenTypes.TOKEN_OPEN_TAG_START &&
- tokens[0].getText().equals(s);
+ tokens[0].getText().equals(s) &&
+ tokens[1].getType() == MXMLTokenTypes.TOKEN_EMPTY_TAG_END;
}
/**
[2/9] git commit: [flex-falcon] [refs/heads/develop] - Need TLF_HOME
to pass functional tests
Posted by ah...@apache.org.
Need TLF_HOME to pass functional tests
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/07f66be8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/07f66be8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/07f66be8
Branch: refs/heads/develop
Commit: 07f66be82bc95644ea798d8f7565e9ef29cecd51
Parents: 6f97926
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 15 11:22:36 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 15 20:13:21 2014 -0700
----------------------------------------------------------------------
README | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/07f66be8/README
----------------------------------------------------------------------
diff --git a/README b/README
index 5a88c1a..4725c20 100644
--- a/README
+++ b/README
@@ -84,6 +84,8 @@ Install Prerequisites
Apache Flex SDK or repository FLEX_HOME
+ Apache Flex TLF source (*6) TLF_HOME
+
==================================================================================
*1) The bin directories for ANT_HOME and JAVA_HOME should be added to your
@@ -166,6 +168,10 @@ Install Prerequisites
These can be used with Apache Flex but not all have not been fully
tested.
+ *6) The TLF_HOME variable should point to a folder containing a folder
+ named textLayout that contains a src folder of the TLF sources.
+ This should be the root of the flex-tlf repository, or can be
+ the frameworks/projects folder of an IDE compatible Flex SDK.
Software Dependencies
---------------------