flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [34/35] git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - createjs externs swc but doesn't package js-root externs
Date Fri, 22 Apr 2016 17:25:21 GMT
createjs externs swc but doesn't package js-root externs


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

Branch: refs/heads/feature/maven-migration-test
Commit: d42ad25060533be4cc821e51764ad79f64aefc0a
Parents: 35fae95
Author: Alex Harui <aharui@apache.org>
Authored: Thu Apr 21 22:54:17 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Apr 22 09:02:59 2016 -0700

----------------------------------------------------------------------
 externs/createjs/build.xml                   | 104 ++++++++++++-----
 externs/createjs/compile-config.xml          | 102 -----------------
 externs/createjs/createjs-compile-config.xml | 131 ----------------------
 3 files changed, 78 insertions(+), 259 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d42ad250/externs/createjs/build.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/build.xml b/externs/createjs/build.xml
index 09ff653..54c1d14 100644
--- a/externs/createjs/build.xml
+++ b/externs/createjs/build.xml
@@ -23,7 +23,7 @@
     
     <property name="createjs.version" value="0.8.0" />
     
-    <target name="main" depends="download, preprocess" />
+    <target name="main" depends="download, preprocess, externc, postprocess, compc" />
     
     <target name="download" >
         <mkdir dir="${basedir}/in" />
@@ -155,53 +155,55 @@
     </target>
     
     <target name="expandzip">
-        <mkdir dir="${basedir}/externs" />
+        <mkdir dir="${basedir}/target" />
         <unzip src="${basedir}/in/${createjs.version}.zip"
-            dest="${basedir}/externs">
+            dest="${basedir}/target">
+            <!--
             <patternset>
                 <include name="EaselJS-${createjs.version}/src/**" />
             </patternset>
             <cutdirsmapper dirs="2"/>
+             -->
         </unzip>
     </target>
     
     <target name="preprocessfile" >
         <basename property="file.base" file="${file}" suffix=".js"/>
         <echo>file.base is ${file.base}</echo>
-        <replace file="${basedir}/externs/${file}" token="this.createjs = this.createjs||{};"
value="" />
-        <replace file="${basedir}/externs/${file}" token="this.createjs = this.createjs
|| {};" value="" />
-        <replace file="${basedir}/externs/${file}" token="(function() {" value="" />
-        <replace file="${basedir}/externs/${file}" token="(function () {" value="" />
-        <replace file="${basedir}/externs/${file}" token="setTimeout " value="setTimeout(function()
{" />
-        <replace file="${basedir}/externs/${file}" token="}());" value="" />
-        <replace file="${basedir}/externs/${file}" token="})();" value="" />
-        <replace file="${basedir}/externs/${file}" token="@param [time] {Number}" value="@param
{Number} time" />
-        <replace file="${basedir}/externs/${file}" token="function ${file.base}(" value="createjs.${file.base}
= function(" />
-        <replaceregexp file="${basedir}/externs/${file}" match="\s&quot;use strict&quot;;"
replace="" />
-        <replaceregexp file="${basedir}/externs/${file}" match="\screatejs.${file.base}
= .*;" replace="" />
-        <replaceregexp file="${basedir}/externs/${file}" match="var p = createjs.extend.*;"
replace="" />
-        <replaceregexp file="${basedir}/externs/${file}" match="var p = ${file.base}.prototype;"
replace="" />
-        <replaceregexp file="${basedir}/externs/${file}" match="var s = ${file.base};"
replace="" />
-        <replaceregexp file="${basedir}/externs/${file}" match="\sp\." replace="${file.base}.prototype."
flags="g"/>
-        <replaceregexp file="${basedir}/externs/${file}" match="\ss\." replace="${file.base}."
flags="g"/>
-        <replaceregexp file="${basedir}/externs/${file}" match="${file.base}\." replace="createjs.${file.base}."
flags="g"/>
-        <replaceregexp file="${basedir}/externs/${file}" match="\stry [{]\s*Object.defineProperties[(]p,
[{]\s*(.*):\s(.*)[}] catch [(]e[)] [{][}]"
+        <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="this.createjs
= this.createjs||{};" value="" />
+        <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="this.createjs
= this.createjs || {};" value="" />
+        <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="(function()
{" value="" />
+        <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="(function
() {" value="" />
+        <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="setTimeout
" value="setTimeout(function() {" />
+        <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="}());"
value="" />
+        <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="})();"
value="" />
+        <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="@param
[time] {Number}" value="@param {Number} time" />
+        <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="function
${file.base}(" value="createjs.${file.base} = function(" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="\s&quot;use strict&quot;;" replace="" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="\screatejs.${file.base} = .*;" replace="" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="var p = createjs.extend.*;" replace="" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="var p = ${file.base}.prototype;" replace="" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="var s = ${file.base};" replace="" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="\sp\." replace="${file.base}.prototype." flags="g"/>
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="\ss\." replace="${file.base}." flags="g"/>
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="${file.base}\." replace="createjs.${file.base}." flags="g"/>
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="\stry [{]\s*Object.defineProperties[(]p, [{]\s*(.*):\s(.*)[}] catch [(]e[)] [{][}]"
                                                          replace="createjs.${file.base}.prototype.\1;"
flags="gs" />
-        <replaceregexp file="${basedir}/externs/${file}" match="\s@extends\s(.*)" replace="
@extends createjs.\1" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/${file}"
match="\s@extends\s(.*)" replace=" @extends createjs.\1" />
     </target>
     
     <target name="preprocessGraphics" >
-        <replaceregexp file="${basedir}/externs/easeljs/display/Graphics.js" match="\s[(]G\..*function[(]ctx[)]
[{].*[}];" replace="" flags="gs" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/easeljs/display/Graphics.js"
match="\s[(]G\..*function[(]ctx[)] [{].*[}];" replace="" flags="gs" />
     </target>
     <target name="preprocessMouseEvent" >
-        <replaceregexp file="${basedir}/externs/easeljs/events/MouseEvent.js" match="createjs.MouseEvent.prototype.localX:.*isTouch;"
replace="" flags="gs" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/easeljs/events/MouseEvent.js"
match="createjs.MouseEvent.prototype.localX:.*isTouch;" replace="" flags="gs" />
     </target>
     <target name="preprocessMovieClip" >
-        <replaceregexp file="${basedir}/externs/easeljs/display/MovieClip.js" match="createjs.MovieClip.prototype.labels:.*currentLabel;"
replace="" flags="gs" />
+        <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/easeljs/display/MovieClip.js"
match="createjs.MovieClip.prototype.labels:.*currentLabel;" replace="" flags="gs" />
     </target>
     
     <target name="rename.in.jsdoc" >
-        <replace dir="${basedir}/externs" >
+        <replace dir="${basedir}/target/EaselJS-${createjs.version}/src" >
             <include name="**/*.js"/>
             <replacefilter token="ColorMatrix|" value="createjs.ColorMatrix|" />
             <replacefilter token="Container|" value="createjs.Container|" />
@@ -232,4 +234,54 @@
             <replacefilter token="Point |" value="createjs.Point|" />
         </replace>
     </target>
+    
+    <target name="externc" >
+        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+            failonerror="false">
+            <arg value="+flexlib=externs" />
+            <arg value="-debug" />
+            <arg value="-js-root=${basedir}/target/generated-sources/externs" />
+            <arg value="-load-config=${basedir}/src/main/config/externc-config.xml" />
+        </java>
+        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+            failonerror="false">
+            <arg value="+flexlib=externs" />
+            <arg value="-debug" />
+            <arg value="-load-config=${basedir}/src/main/config/externc-config.xml" />
+        </java>
+    </target>
+    
+    <target name="postprocess" >
+    </target>
+    
+    <target name="compc" >
+        <copy file="${basedir}/src/main/config/compile-as-config.xml"
+        todir="${basedir}/target" />
+        <java jar="${basedir}/../../compiler/lib/falcon-compc.jar" fork="true"
+            failonerror="true">
+            <arg value="+flexlib=externs/frameworks" />
+            <arg value="-debug" />
+            <arg value="-external-library-path+=${basedir}/../js/target/js.swc" />
+            <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
+            <arg value="-output=${basedir}/target/createjs.swc" />
+        </java>
+    </target>
+    
+    <target name="clean">
+        <delete failonerror="false" includeEmptyDirs="true" >
+            <fileset dir="${basedir}/target">
+                <include name="**/**"/>
+                <exclude name="EaselJS-${createjs-version}/**"/>
+            </fileset>
+        </delete>
+    </target>
+    
+    <target name="wipe">
+        <delete failonerror="false" includeEmptyDirs="true" >
+            <fileset dir="${basedir}/target">
+                <include name="**/**"/>
+            </fileset>
+        </delete>
+    </target>
+
 </project>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d42ad250/externs/createjs/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/compile-config.xml b/externs/createjs/compile-config.xml
deleted file mode 100644
index ffcf29b..0000000
--- a/externs/createjs/compile-config.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<!--
-
-  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.
-
--->
-<flex-config>
-
-    <compiler>
-        <accessible>true</accessible>
-        
-        <!--
-        <external-library-path>
-            <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
-            <path-element>../../libs/framework.swc</path-element>
-            <path-element>../../libs/mx/mx.swc</path-element>
-            <path-element>../../libs/osmf.swc</path-element>
-            <path-element>../../libs/textLayout.swc</path-element>
-        </external-library-path>
-        
-        <keep-as3-metadata>
-            <name>SkinPart</name>
-        </keep-as3-metadata>
-        
-        <mxml>
-            <minimum-supported-version>4.0.0</minimum-supported-version>
-        </mxml>
-        
-        <locale/>
-        
-        <library-path/>
-        
-        <namespaces>
-            <namespace>
-                <uri>library://ns.adobe.com/flex/spark</uri>
-                <manifest>manifest.xml</manifest>
-            </namespace>
-        </namespaces>
-        -->
-        
-        <external-library-path>
-            <path-element>../js/out/bin/js.swc</path-element>
-        </external-library-path>
-
-        <source-path>
-            <path-element>out/as/classes</path-element>
-            <!--
-            <path-element>out/as/constants</path-element>
-            <path-element>out/as/functions</path-element>
-            <path-element>out/as/interfaces</path-element>
-            <path-element>out/as/typedefs</path-element>
-             -->
-        </source-path>
-        
-        <warn-no-constructor>false</warn-no-constructor>
-    </compiler>
-    
-    <include-sources>
-        <path-element>out/as/classes</path-element>
-        <!--
-        <path-element>out/as/constants</path-element>
-        <path-element>out/as/functions</path-element>
-        <path-element>out/as/interfaces</path-element>
-        <path-element>out/as/typedefs</path-element>
-         -->
-    </include-sources>
-
-    <include-file>
-        <name>externs/*</name>
-        <path>out/externs/*</path>
-    </include-file>
-    <!--
-    <include-file>
-        <name>assets/ErrorIndicator.png</name>
-        <path>assets/ErrorIndicator.png</path>
-    </include-file>
-    <include-file>
-        <name>assets/RequiredIndicator.png</name>
-        <path>assets/RequiredIndicator.png</path>
-    </include-file>
-    
-    <include-namespaces>
-        <uri>library://ns.adobe.com/flex/spark</uri>
-    </include-namespaces>  
-    
-    <resource-bundle-list>bundles.properties</resource-bundle-list>
-    
-    <target-player>${playerglobal.version}</target-player>
-     -->
-</flex-config>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d42ad250/externs/createjs/createjs-compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/createjs-compile-config.xml b/externs/createjs/createjs-compile-config.xml
deleted file mode 100644
index e2ee0ad..0000000
--- a/externs/createjs/createjs-compile-config.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<!--
-
-  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</name></exclude> 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.
-
--->
-<flex-config>
-
-    <compiler>
-        <accessible>true</accessible>
-        
-        <!--
-        <external-library-path>
-            <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
-            <path-element>../../libs/framework.swc</path-element>
-            <path-element>../../libs/mx/mx.swc</path-element>
-            <path-element>../../libs/osmf.swc</path-element>
-            <path-element>../../libs/textLayout.swc</path-element>
-        </external-library-path>
-        
-        <keep-as3-metadata>
-            <name>SkinPart</name>
-        </keep-as3-metadata>
-        
-        <mxml>
-            <minimum-supported-version>4.0.0</minimum-supported-version>
-        </mxml>
-        -->
-        
-        <locale/>
-        
-        <library-path/>
-        
-        <!--
-        <namespaces>
-            <namespace>
-                <uri>library://ns.adobe.com/flex/spark</uri>
-                <manifest>manifest.xml</manifest>
-            </namespace>
-        </namespaces>
-        -->
-        
-        <source-path>
-            <path-element>src</path-element>
-        </source-path>
-        
-        <warn-no-constructor>false</warn-no-constructor>
-    </compiler>
-    
-    <external>
-        <path-element>missing.js</path-element>
-        <path-element>externs/createjs/events/Event.js</path-element>
-        <path-element>externs/createjs/events/EventDispatcher.js</path-element>
-        <path-element>externs/createjs/utils/extend.js</path-element>
-        <path-element>externs/createjs/utils/indexof.js</path-element>
-        <path-element>externs/createjs/utils/promote.js</path-element>
-        <path-element>externs/createjs/utils/Ticker.js</path-element>
-        <path-element>externs/easeljs/display/Bitmap.js</path-element>
-        <path-element>externs/easeljs/display/BitmapText.js</path-element>
-        <path-element>externs/easeljs/display/Container.js</path-element>
-        <path-element>externs/easeljs/display/DisplayObject.js</path-element>
-        <path-element>externs/easeljs/display/DOMElement.js</path-element>
-        <path-element>externs/easeljs/display/Graphics.js</path-element>
-        <path-element>externs/easeljs/display/MovieClip.js</path-element>
-        <path-element>externs/easeljs/display/Shadow.js</path-element>
-        <path-element>externs/easeljs/display/Shape.js</path-element>
-        <path-element>externs/easeljs/display/Sprite.js</path-element>
-        <path-element>externs/easeljs/display/SpriteContainer.js</path-element>
-        <path-element>externs/easeljs/display/SpriteSheet.js</path-element>
-        <path-element>externs/easeljs/display/SpriteStage.js</path-element>
-        <path-element>externs/easeljs/display/Stage.js</path-element>
-        <path-element>externs/easeljs/display/Text.js</path-element>
-        <path-element>externs/easeljs/events/MouseEvent.js</path-element>
-        <path-element>externs/easeljs/filters/AlphaMapFilter.js</path-element>
-        <path-element>externs/easeljs/filters/AlphaMaskFilter.js</path-element>
-        <path-element>externs/easeljs/filters/BlurFilter.js</path-element>
-        <path-element>externs/easeljs/filters/ColorFilter.js</path-element>
-        <path-element>externs/easeljs/filters/ColorMatrix.js</path-element>
-        <path-element>externs/easeljs/filters/ColorMatrixFilter.js</path-element>
-        <path-element>externs/easeljs/filters/Filter.js</path-element>
-        <path-element>externs/easeljs/geom/DisplayProps.js</path-element>
-        <path-element>externs/easeljs/geom/Matrix2D.js</path-element>
-        <path-element>externs/easeljs/geom/Point.js</path-element>
-        <path-element>externs/easeljs/geom/Rectangle.js</path-element>
-        <path-element>externs/easeljs/ui/ButtonHelper.js</path-element>
-        <path-element>externs/easeljs/ui/Touch.js</path-element>
-        <path-element>externs/easeljs/utils/SpriteSheetBuilder.js</path-element>
-        <path-element>externs/easeljs/utils/SpriteSheetUtils.js</path-element>
-        <path-element>externs/easeljs/utils/UID.js</path-element>
-    </external>
-    
-    <as-root>out/as</as-root>
-    
-    <class-exclude>
-        <class>MovieClipPlugin</class>
-    </class-exclude>
-    <class-exclude>
-        <class>createjs.Text.V_OFFSETS</class>
-    </class-exclude>
-    <class-exclude>
-        <class>createjs.Text.H_OFFSETS</class>
-    </class-exclude>
-    <class-exclude>
-        <class>createjs.Graphics.BASE_64</class>
-    </class-exclude>
-    
-    <!--
-    <field-exclude>
-        <class>Window</class>
-        <field>focus</field>
-    </field-exclude>
-
-    <exclude>
-        <class>Array</class>
-        <name>toSource</name>
-    </exclude>
-    -->
-
-</flex-config>


Mime
View raw message