flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [5/6] git commit: [flex-asjs] [refs/heads/develop] - revamp installer and launch configs for fb integration. Now you only need launch configs for the cross compile
Date Sun, 06 Apr 2014 05:39:46 GMT
revamp installer and launch configs for fb integration.  Now you only need launch configs for
the cross compile


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

Branch: refs/heads/develop
Commit: 7378eb5b8e736eb415bc9039dc538b594cc4d7ac
Parents: b416780
Author: Alex Harui <aharui@apache.org>
Authored: Sat Apr 5 15:40:23 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sat Apr 5 22:20:48 2014 -0700

----------------------------------------------------------------------
 build.xml                                       | 43 ++++++++++++--------
 ide/flashbuilder/FlexJS (COMPC).launch          | 28 -------------
 ide/flashbuilder/FlexJS (Debug Build).launch    | 28 -------------
 ...JS (FalconJX Debug and Release Build).launch |  4 +-
 ide/flashbuilder/FlexJS (JS COMPC).launch       |  4 +-
 ide/flashbuilder/FlexJS (Release Build).launch  | 28 -------------
 installer.xml                                   | 32 ++++++++++++++-
 7 files changed, 60 insertions(+), 107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7378eb5b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9fb01fa..597e111 100644
--- a/build.xml
+++ b/build.xml
@@ -531,6 +531,23 @@
             </fileset>
         </copy>
         
+        <copy todir="${basedir}/temp/js/bin">
+            <fileset dir="${basedir}/js/bin" >
+            	<include name="**"/>
+            </fileset>
+        </copy>
+        
+        <fixcrlf srcdir="${basedir}/temp/js/bin" eol="crlf" fixlast="false">
+            <include name="**/*.bat"/>
+        </fixcrlf>
+        
+        <!-- Unix shell scripts need the correct line endings. -->
+        <fixcrlf srcdir="${basedir}/temp/js/bin" eol="unix" fixlast="false">
+            <exclude name="**/*.bat"/>
+        </fixcrlf>
+        
+        <chmod dir="${basedir}/temp/js/bin" excludes="**/*.bat" perm="+x" />
+        
         <!-- samples -->
         <copy todir="${basedir}/temp/examples">
             <fileset dir="${basedir}/examples" >
@@ -554,9 +571,8 @@
         <!-- 
              Source files have Windows line endings.  Most UNIX editors can handle
              either type of line endings but the converse is often not true.            

-             The bin directory is handled in stage-bin.
         -->
-        <fixcrlf srcdir="${basedir}/temp" eol="crlf" fixlast="false">
+        <fixcrlf srcdir="${basedir}/temp/frameworks" eol="crlf" fixlast="false">
             <exclude name="bin/**"/>
             <exclude name="**/assets/**"/>
             <exclude name="**/*.fla"/>
@@ -691,28 +707,17 @@
         <fixcrlf srcdir="${basedir}/temp/bin-legacy" eol="unix" fixlast="false">  
             <exclude name="**/*.bat"/>
         </fixcrlf>
+
+        <chmod dir="${basedir}/temp/bin" excludes="**/*.bat" perm="+x" />
+        <chmod dir="${basedir}/temp/bin-legacy" excludes="**/*.bat" perm="+x" />
+
     </target>
         
     <target name="stage-falconjx">
         <!-- modules -->
         <copy todir="${basedir}/temp/js/bin" includeEmptyDirs="false">
-            <fileset dir="${FALCONJX_HOME}/bin">
+            <fileset dir="${basedir}/js/bin">
                 <include name="**"/>
-                <exclude name="thirdparty/**"/>
-                <exclude name=".metadata/**"/>
-                <exclude name="**/*.jar"/>
-                <exclude name="**/*.vms"/>
-                <exclude name="*/test/**"/>
-                <exclude name="compiler/src/java/velocity.log"/>
-                <exclude name="compiler/**/ParseException.java"/>
-                <exclude name="compiler/**/Parser.java"/>
-                <exclude name="compiler/**/ParserConstants.java"/>
-                <exclude name="compiler/**/Token.java"/>
-                <exclude name="compiler/**/TokenManager.java"/>
-                <exclude name="compiler/**/TokenMgrError.java"/>
-                <exclude name="**/classes/**"/>
-                <exclude name="**/.classpath"/>
-                <exclude name="**/.project"/>
             </fileset>
             
         </copy>  
@@ -737,6 +742,8 @@
             <exclude name="**/*.bat"/>
         </fixcrlf>
 
+        <chmod dir="${basedir}/temp/js/bin" excludes="**/*.bat" perm="+x" />
+
     </target>
     
     <target name="stage-scripts" description="package ide conversion scripts">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7378eb5b/ide/flashbuilder/FlexJS (COMPC).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (COMPC).launch b/ide/flashbuilder/FlexJS (COMPC).launch
deleted file mode 100644
index 9e888c4..0000000
--- a/ide/flashbuilder/FlexJS (COMPC).launch	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<launchConfiguration type='org.eclipse.ui.externaltools.ProgramLaunchConfigurationType'>
-<booleanAttribute key='org.eclipse.debug.core.appendEnvironmentVariables' value='false'/>
-<listAttribute key='org.eclipse.debug.ui.favoriteGroups'>
-<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
-</listAttribute>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE'
value='${project}'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$JAVA_EXEC'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m
-Dsun.io.useCanonCaches=false -Dflexcompiler=&quot;$FLEXJS_HOME&quot; -Dflexlib=&quot;$FLEXJS_HOME/frameworks&quot;
-jar &quot;$FLEXJS_HOME/lib/falcon-compc.jar&quot; -debug -compiler.mxml.children-as-data
-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent -compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent
-compiler.binding-value-change-event-type=valueChange -fb &quot;${project_loc}&quot;'
/>
-</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7378eb5b/ide/flashbuilder/FlexJS (Debug
Build).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (Debug Build).launch b/ide/flashbuilder/FlexJS (Debug
Build).launch
deleted file mode 100644
index d837ab9..0000000
--- a/ide/flashbuilder/FlexJS (Debug Build).launch	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<launchConfiguration type='org.eclipse.ui.externaltools.ProgramLaunchConfigurationType'>
-<booleanAttribute key='org.eclipse.debug.core.appendEnvironmentVariables' value='false'/>
-<listAttribute key='org.eclipse.debug.ui.favoriteGroups'>
-<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
-</listAttribute>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE'
value='${project}'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$JAVA_EXEC'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m
-Dsun.io.useCanonCaches=false -Dflexcompiler=&quot;$FLEXJS_HOME&quot; -Dflexlib=&quot;$FLEXJS_HOME/frameworks&quot;
-jar &quot;$FLEXJS_HOME/lib/falcon-mxmlc.jar&quot; -compiler.mxml.children-as-data
-debug -compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent -compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent
-compiler.binding-value-change-event-type=valueChange -fb &quot;${project_loc}&quot;'/>
-</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7378eb5b/ide/flashbuilder/FlexJS (FalconJX
Debug and Release Build).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch b/ide/flashbuilder/FlexJS
(FalconJX Debug and Release Build).launch
index 4a753fa..a3cab05 100644
--- a/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch	
+++ b/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch	
@@ -23,6 +23,6 @@
 <listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
 </listAttribute>
 <stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE'
value='${project}'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$JAVA_EXEC'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m
-Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler=&quot;$FLEXJS_HOME&quot;
-Dflexlib=&quot;$FLEXJS_HOME/frameworks&quot; -jar &quot;$FLEXJS_HOME/js/lib/mxmlc.jar&quot;
-compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS
-sdk-js-lib=&quot;$FLEXJS_HOME/frameworks/js/FlexJS/src&quot; -fb &quot;${project_loc}&quot;'/>
+<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$FLEXJS_HOME/js/bin/$MXMLC'/>
+<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-fb &quot;${project_loc}&quot;'/>
 </launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7378eb5b/ide/flashbuilder/FlexJS (JS
COMPC).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (JS COMPC).launch b/ide/flashbuilder/FlexJS (JS COMPC).launch
index ad2b04d..7a30637 100644
--- a/ide/flashbuilder/FlexJS (JS COMPC).launch	
+++ b/ide/flashbuilder/FlexJS (JS COMPC).launch	
@@ -23,6 +23,6 @@
 <listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
 </listAttribute>
 <stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE'
value='${project}'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$JAVA_EXEC'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m
-Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler=&quot;$FLEXJS_HOME&quot;
-Dflexlib=&quot;$FLEXJS_HOME/frameworks&quot; -jar &quot;$FLEXJS_HOME/js/lib/compc.jar&quot;
-compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS
-sdk-js-lib=$FLEXJS_HOME/frameworks/js/FlexJS/src -fb &quot;${project_loc}&quot;'
/>
+<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$FLEXJS_HOME/js/bin/$COMPC'/>
+<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-fb &quot;${project_loc}&quot;'
/>
 </launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7378eb5b/ide/flashbuilder/FlexJS (Release
Build).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (Release Build).launch b/ide/flashbuilder/FlexJS (Release
Build).launch
deleted file mode 100644
index 19ebe1c..0000000
--- a/ide/flashbuilder/FlexJS (Release Build).launch	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<launchConfiguration type='org.eclipse.ui.externaltools.ProgramLaunchConfigurationType'>
-<booleanAttribute key='org.eclipse.debug.core.appendEnvironmentVariables' value='false'/>
-<listAttribute key='org.eclipse.debug.ui.favoriteGroups'>
-<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
-</listAttribute>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE'
value='${project}'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$JAVA_EXEC'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m
-Dsun.io.useCanonCaches=false -Dflexcompiler=&quot;$FLEXJS_HOME&quot; -Dflexlib=&quot;$FLEXJS_HOME/frameworks&quot;
-jar &quot;$FLEXJS_HOME/lib/falcon-mxmlc.jar&quot; -compiler.mxml.children-as-data
-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent -compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent
-compiler.binding-value-change-event-type=valueChange -fb &quot;${project_loc}&quot;'/>
-</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7378eb5b/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index efca57a..c278f7d 100644
--- a/installer.xml
+++ b/installer.xml
@@ -98,6 +98,15 @@
         <isset property="installer" />
     </condition>
     
+    <condition property="COMPC" value="compc.bat">
+        <os family="windows" />
+    </condition>
+    <property name="COMPC" value="compc" />
+    <condition property="MXMLC" value="mxmlc.bat">
+        <os family="windows" />
+    </condition>
+    <property name="MXMLC" value="mxmlc" />
+    
     <condition property="java.home" value="${env.JAVA_HOME}" >
         <and>
             <available file="${env.JAVA_HOME}" type="dir" />
@@ -123,7 +132,7 @@
         <property name="flash.sdk.swfversion" refid="${flash.sdk.swfversion.ref}" />
     </target>
     
-    <target name="install" depends="get-data,check-binary,ask-licenses,get-flex,get-falcon,get-third-party-files,fixup-config-files,hack-fb-files"
description="Converts binary package to IDE compatible folder">
+    <target name="install" depends="get-data,check-binary,ask-licenses,get-flex,get-falcon,get-third-party-files,fixup-config-files,hack-fb-files,setup-launch-configs"
description="Converts binary package to IDE compatible folder">
         <echo>${install.complete.echo}</echo>
     </target>
     
@@ -649,4 +658,25 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc" />
         <touch file="${FLEXJS_HOME}/frameworks/localfonts.ser" />
     </target>
     
+    <target name="setup-launch-configs" description="Creates custom Flash Builder launch
configurations">
+        <echo>${INFO_INSTALLING_LAUNCH_CONFIG_FILES}</echo>
+        <replace file="${FLEXJS_HOME}/ide/flashbuilder/FlexJS (FalconJX Debug and Release
Build).launch">
+            <replacefilter
+            token="$MXMLC"
+            value="${MXMLC}"/>
+            <replacefilter
+            token="$FLEXJS_HOME"
+            value="${FLEXJS_HOME}"/>
+        </replace>
+        <replace file="${FLEXJS_HOME}/ide/flashbuilder/FlexJS (JS COMPC).launch">
+            <replacefilter
+            token="$COMPC"
+            value="${COMPC}"/>
+            <replacefilter
+            token="$FLEXJS_HOME"
+            value="${FLEXJS_HOME}"/>
+        </replace>
+        
+    </target>
+
 </project>


Mime
View raw message