flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [13/13] git commit: Merge branch 'refs/heads/master' into develop
Date Fri, 22 Mar 2013 07:05:38 GMT
Merge branch 'refs/heads/master' into develop

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>

Conflicts:
	compiler/build.xml


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c10fe72a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c10fe72a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c10fe72a

Branch: refs/heads/develop
Commit: c10fe72adfdd42e23e363e2e60842fc6c9f9371e
Parents: 7cfcee7 77f657d
Author: Erik de Bruin <erik@ixsoftware.nl>
Authored: Fri Mar 22 07:49:35 2013 +0100
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Fri Mar 22 07:49:35 2013 +0100

----------------------------------------------------------------------
 compiler.jx.tests/.gitignore                       |    4 +
 .../mxml/flexjs/TestFlexJSMXMLApplication.java     |   80 +--
 .../compiler/internal/test/FlexJSTestBase.java     |   52 +-
 .../flex/compiler/internal/test/TestBase.java      |   32 +-
 .../apache/flex/compiler/utils/EnvProperties.java  |   11 +
 .../flexjs/files/FlexJSTest_2013_03_11.mxml        |   51 ++
 .../flexjs/files/FlexJSTest_2013_03_11_result.js   |  194 +++++
 .../flexjs/files/MyInitialView_2013_03_11.mxml     |   77 ++
 .../files/MyInitialView_2013_03_11_result.js       |  577 +++++++++++++
 compiler.jx/.gitignore                             |    4 +
 .../org/apache/flex/compiler/codegen/IEmitter.java |   13 +
 .../flex/compiler/codegen/mxml/IMXMLEmitter.java   |    8 +-
 .../codegen/mxml/flexjs/IMXMLFlexJSEmitter.java    |    3 +
 .../flex/compiler/internal/codegen/Emitter.java    |    2 +-
 .../compiler/internal/codegen/as/ASEmitter.java    |   12 +-
 .../internal/codegen/as/ASEmitterTokens.java       |    2 +-
 .../compiler/internal/codegen/js/JSDocEmitter.java |    9 +-
 .../internal/codegen/mxml/MXMLBlockWalker.java     |    8 +-
 .../internal/codegen/mxml/MXMLEmitter.java         |   17 +-
 .../mxml/flexjs/MXMLDescriptorSpecifier.java       |  280 +++++++
 .../codegen/mxml/flexjs/MXMLEventSpecifier.java    |   78 ++
 .../codegen/mxml/flexjs/MXMLFlexJSBlockWalker.java |   25 +-
 .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java     |  623 +++++++++++++--
 .../mxml/flexjs/MXMLFlexJSEmitterTokens.java       |   42 +
 .../codegen/mxml/flexjs/MXMLNodeSpecifier.java     |  170 ++++
 .../codegen/mxml/flexjs/MXMLScriptSpecifier.java   |   67 ++
 .../driver/mxml/flexjs/MXMLFlexJSBackend.java      |    7 +
 compiler/build.xml                                 |    6 +-
 .../internal/targets/FlexAppSWFTarget.java         |    1 -
 29 files changed, 2285 insertions(+), 170 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c10fe72a/compiler/build.xml
----------------------------------------------------------------------
diff --cc compiler/build.xml
index 713b27f,6ff82b3..e60e323
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@@ -47,7 -47,11 +47,11 @@@
      <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
  	
  	<!-- The Falcon SDK is assembled from sdk project, where 'ant main' has build an SDK
-->
- 	<property name="sdk.branch" value="${compiler}/../../flex-sdk/"/>
+ 	<!-- With the move to git the path to the assumed root is one level less up and doesn't
need to include 'branches/develop' -->
+ 	<!-- Old path: -->
+     <!-- property name="sdk.branch" value="${compiler}/../../../sdk/branches/develop"/
-->
+     <!-- New path: -->
 -    <property name="sdk.branch" value="${compiler}/../../sdk"/>
++    <property name="sdk.branch" value="${compiler}/../../flex-sdk"/>
  
      <!-- The 'sdk' property is the absolute path, with forward slashes, to the compiler/generated/dist/sdk
directory -->
      <!-- where a Falcon SDK is built -->


Mime
View raw message