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 2013/12/19 08:05:23 UTC

[2/2] git commit: [flex-asjs] [refs/heads/develop] - fix packaging for FlexJS

fix packaging for FlexJS


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

Branch: refs/heads/develop
Commit: b9c70830bb298d070b861eddf012a9cd3b7651c8
Parents: 0e8662b
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 18 22:44:38 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 18 23:03:17 2013 -0800

----------------------------------------------------------------------
 build.xml | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b9c70830/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8ba49f1..3031544 100644
--- a/build.xml
+++ b/build.xml
@@ -472,6 +472,8 @@
                 <include name="build.properties"/>
 				<include name="env-template.properties"/>
                 <include name="flex-sdk-description.xml"/>
+                <include name="installer.xml"/>
+                <include name="installer.properties/**"/>
                 <include name="READme"/>
                 <include name="RELEASE_NOTES"/>
             </fileset>
@@ -495,15 +497,11 @@
         </copy> 
         --> 
 
-        <!-- ide
         <copy todir="${basedir}/temp/ide">
             <fileset dir="${basedir}/ide" >
             	<include name="flashbuilder/**"/>
-            	<include name="*.sh"/>
-            	<include name="*.bat"/>
             </fileset>
         </copy>
-        -->
         
         <!-- samples -->
         <copy todir="${basedir}/temp/examples">
@@ -1285,35 +1283,12 @@
         <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
             <fileset dir="${rat.dir}">
                 <!--          Start of binary files           -->
-                <!-- exclude Flash Professional file used for integration with Flash Professional -->
-                <exclude name="frameworks/projects/flash-integration/FLA/ContentHolder.fla"/>
-                <!-- exclude font embedded in asdoc example -->
-                <exclude name="frameworks/projects/framework/asdoc/en_US/mx/effects/examples/assets/OpenSans-Regular.ttf"/>
                 <!-- exclude media (png, gif, jpg, mp3, flv) -->
                 <exclude name="**/*.png"/>
                 <exclude name="**/*.gif"/>
                 <exclude name="**/*.jpg"/>
                 <exclude name="**/*.mp3"/>
                 <exclude name="**/*.flv"/>
-                <!-- exclude batik icon -->
-                <exclude name="modules/thirdparty/batik/sources/*.icns"/>
-                <!--          End of binary files           -->
-                <!-- exclude batik manifests -->
-                <exclude name="modules/thirdparty/batik/sources/*.mf"/>
-                <!-- exclude text files -->
-                <exclude name="modules/thirdparty/batik/lib/**/LICENSE*.txt"/>
-                <exclude name="modules/thirdparty/batik/lib/**/README*.txt"/>
-                <!-- exclude w3c sources -->
-                <exclude name="modules/thirdparty/batik/resources/org/apache/flex/forks/batik/dom/svg/resources/*.mod"/>
-                <exclude name="modules/thirdparty/batik/resources/org/apache/flex/forks/batik/dom/svg/resources/*.dtd"/>
-                <exclude name="modules/thirdparty/batik/sources/org/w3c/css/sac/LexicalUnit.java"/>
-                <exclude name="modules/thirdparty/batik/sources/org/w3c/flex/forks/css/sac/*.java"/>
-                <exclude name="modules/thirdparty/batik/sources/org/w3c/flex/forks/css/sac/helpers/ParserFactory.java"/>
-                <!-- exclude config files -->
-                <exclude name="modules/thirdparty/batik/svn-revision"/>
-                <exclude name="modules/thirdparty/xerces-patch/src/java/META-INF/services/javax.xml.parsers.SAXParserFactory"/>
-                <exclude name="modules/thirdparty/xerces-patch/src/java/META-INF/services/org.apache.xerces.xni.parser.XMLParserConfiguration"/>
-                <exclude name="modules/thirdparty/xerces-patch/src/java/org/apache/xerces/jaxp/javax.xml.parsers.SAXParserFactory"/>
             </fileset>
         </rat:report>
     </target>