flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [14/18] git commit: [flex-asjs] [refs/heads/develop] - apache-compatible release packages
Date Mon, 25 Nov 2013 06:59:24 GMT
apache-compatible release packages


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

Branch: refs/heads/develop
Commit: 6eacf61fb94c064d17cb7384cc46606a927ba94d
Parents: 949b24d
Author: Alex Harui <aharui@apache.org>
Authored: Fri Nov 22 16:08:58 2013 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Nov 22 16:08:58 2013 -0800

----------------------------------------------------------------------
 build.xml | 70 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6eacf61f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a9277a3..f3c3d27 100644
--- a/build.xml
+++ b/build.xml
@@ -462,7 +462,7 @@
         <!-- frameworks/as -->
         <antcall target="stage-framework-as"/>
 
-        <!-- frameworks/as -->
+        <!-- frameworks/js -->
         <antcall target="stage-framework-js"/>
 
         <!-- asdoc
@@ -486,11 +486,16 @@
         <!-- samples -->
         <copy todir="${basedir}/temp/examples">
             <fileset dir="${basedir}/examples" >
+                <exclude name="**/FlexJSTest_again/**" />
+                <exclude name="**/VanillaSDK_POC/**" />
                 <exclude name="**/*.swc"/>
                 <exclude name="**/*.swf"/>
             </fileset>
         </copy>
         
+        <!-- scripts -->
+        <antcall target="stage-scripts"/>
+
         <!-- templates
         <copy todir="${basedir}/temp/templates">
             <fileset dir="${basedir}/templates" >
@@ -533,8 +538,8 @@
     <!-- frameworks -->
     <!-- javascript and test directories follow -->
     <target name="stage-framework-as">
-        <copy todir="${basedir}/temp/frameworks/src" includeEmptyDirs="false">
-            <fileset dir="${basedir}/frameworks/as/projects/FlexJSUI/src">
+        <copy todir="${basedir}/temp/frameworks/as" includeEmptyDirs="false">
+            <fileset dir="${basedir}/frameworks/as">
                 <include name="**"/>
                 <exclude name="**/libs/**"/>
                 <exclude name="**/*.swc"/>
@@ -549,21 +554,10 @@
                 <exclude name="projects/*/.settings/**"/>
             </fileset>
         </copy>
-        <copy todir="${basedir}/temp/frameworks/src" includeEmptyDirs="false">
-            <fileset dir="${basedir}/frameworks/as/projects/FlexJSUI">
-                <include name="basic-manifest.xml"/>
-                <include name="html5-manifest.xml"/>
-            </fileset>
-        </copy>
-        <copy todir="${basedir}/temp/frameworks/src" includeEmptyDirs="false">
+        <copy todir="${basedir}/temp/frameworks/as" includeEmptyDirs="false">
             <fileset dir="${basedir}/frameworks/as">
-                <include name="air-config.xml"/>
-                <include name="flex-config.xml"/>
-            </fileset>
-        </copy>
-        <copy todir="${basedir}/temp/frameworks/src" includeEmptyDirs="false">
-            <fileset dir="${basedir}">
-                <include name="flex-sdk-description.xml"/>
+                <include name="air-config-template.xml"/>
+                <include name="flex-config-template.xml"/>
             </fileset>
         </copy>
 
@@ -574,9 +568,9 @@
 
         <!-- now that config xml files are in temp, fix them up for release. -->
         <echo message="Updating config file air-config.xml with version ${build.version}"/>
-        <fix-config-file file="${basedir}/temp/frameworks/src/air-config.xml" version="${build.version}"
/>
+        <fix-config-file file="${basedir}/temp/frameworks/as/air-config-template.xml"
version="${build.version}" />
         <echo message="Updating config file flex-config.xml with version ${build.version}"/>
-        <fix-config-file file="${basedir}/temp/frameworks/src/flex-config.xml" version="${build.version}"
/>
+        <fix-config-file file="${basedir}/temp/frameworks/as/flex-config-template.xml"
version="${build.version}" />
         
         <!-- Update all Version.as files in the kit frameworks directory with build.number
-->
         <!--<antcall target="version-update"/>-->
@@ -584,11 +578,17 @@
     
     <!-- tlf -->
     <target name="stage-framework-js">
-        <copy todir="${basedir}/temp/js/src" includeEmptyDirs="false">
+        <copy todir="${basedir}/temp/frameworks/js/FlexJS/src" includeEmptyDirs="false">
             <fileset dir="${FLEXJS_HOME}/frameworks/js/FlexJS/src">
                 <include name="**"/>
             </fileset>
         </copy>
+        <copy todir="${basedir}/temp/frameworks/js" includeEmptyDirs="false">
+            <fileset dir="${FLEXJS_HOME}/frameworks/js">
+                <include name="build.xml"/>
+                <include name="jshint.properties"/>
+            </fileset>
+        </copy>
     </target>
     
     <target name="stage-falcon">
@@ -686,6 +686,15 @@
 
     </target>
     
+    <target name="stage-scripts" description="package ide conversion scripts">
+        <!-- deploy scripts -->
+        <copy todir="${basedir}/temp/scripts">
+            <fileset dir="${basedir}/scripts" >
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+    </target>
+
     <target name="binary-package"
         description="Package binary files in zip and tar-gzip file.">
 
@@ -709,19 +718,21 @@
         </concat-->
         
         <!-- frameworks/libs -->
-        <copy todir="${basedir}/temp/frameworks/libs">
+        <copy todir="${basedir}/temp/frameworks/as/libs">
             <fileset dir="${basedir}/frameworks/as/libs">
                 <include name="FlexJSUI.swc"/>
                 <include name="MXMLCClasses.swc"/>
             </fileset>
         </copy>
 
-        <!-- falcon -->
+        <!-- falcon
         <antcall target="stage-falcon"/>
-
-        <!-- falconjx -->
+         -->
+         
+        <!-- falconjx
         <antcall target="stage-falconjx"/>
-        
+         -->
+         
         <!-- ide
         <copy todir="${basedir}/temp/ide">
             <fileset dir="${basedir}/ide" >
@@ -730,7 +741,7 @@
         </copy>
          -->
          
-        <!-- sample themes -->
+        <!-- examples -->
         <copy todir="${basedir}/temp/examples">
             <fileset dir="${basedir}/examples" >
                 <include name="**/build.xml"/>
@@ -739,13 +750,6 @@
             </fileset>
         </copy>
 
-        <!-- deploy scripts -->
-        <copy todir="${basedir}/temp/">
-            <fileset dir="${basedir}/scripts" >
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-        
         <!-- swfobject templates except for downloaded files
         <copy todir="${basedir}/temp/templates/swfobject">
             <fileset dir="${basedir}/templates/swfobject">


Mime
View raw message