flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From josebarra...@apache.org
Subject [02/50] [abbrv] git commit: [flex-falcon] [refs/heads/maven] - fix some line-ending issues
Date Thu, 24 Apr 2014 16:05:34 GMT
fix some line-ending issues


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

Branch: refs/heads/maven
Commit: eeb5fc1cf4c9cd476e952f942c412bfd5b3b0b9c
Parents: 8323661
Author: Alex Harui <aharui@apache.org>
Authored: Sat Apr 5 15:39:07 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sat Apr 5 15:39:07 2014 -0700

----------------------------------------------------------------------
 build.xml     | 21 ++++++++++++---------
 installer.xml |  2 ++
 2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/eeb5fc1c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6baf9b9..28380fb 100644
--- a/build.xml
+++ b/build.xml
@@ -233,10 +233,10 @@
         <!--
          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">
-            <exclude name="bin/**"/>
+            <exclude name="compiler/generated/dist/sdk/bin/**"/>
+            <exclude name="compiler/generated/dist/sdk/bin-legacy/**"/>
             <exclude name="**/assets/**"/>
             <exclude name="**/*.fla"/>
             <exclude name="**/*.flv"/>
@@ -252,11 +252,11 @@
         
         <!-- 
          Unix shell scripts need the correct line endings. 
-         The bin directory is handled in stage-bin.
-         -->      
+         -->
         <fixcrlf srcdir="${basedir}/temp" eol="unix" fixlast="false">  
             <include name="**.sh"/>
-            <exclude name="bin/**"/>
+            <exclude name="compiler/generated/dist/sdk/bin/**"/>
+            <exclude name="compiler/generated/dist/sdk/bin-legacy/**"/>
         </fixcrlf>
     </target>
 
@@ -335,10 +335,10 @@
         <!--
          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">
-            <exclude name="bin/**"/>
+            <exclude name="compiler/generated/dist/sdk/bin/**"/>
+            <exclude name="compiler/generated/dist/sdk/bin-legacy/**"/>
             <exclude name="**/assets/**"/>
             <exclude name="**/*.fla"/>
             <exclude name="**/*.flv"/>
@@ -354,11 +354,11 @@
         
         <!--
          Unix shell scripts need the correct line endings.
-         The bin directory is handled in stage-bin.
          -->
         <fixcrlf srcdir="${basedir}/temp" eol="unix" fixlast="false">
             <include name="**.sh"/>
-            <exclude name="bin/**"/>
+            <exclude name="compiler/generated/dist/sdk/bin/**"/>
+            <exclude name="compiler/generated/dist/sdk/bin-legacy/**"/>
         </fixcrlf>
     </target>
 
@@ -431,6 +431,9 @@
             <include name="swfdump"/>
         </fixcrlf>
 
+        <chmod dir="${basedir}/temp/compiler/generated/dist/sdk/bin" excludes="**/*.bat"
perm="+x" />
+        <chmod dir="${basedir}/temp/compiler/generated/dist/sdk/bin-legacy" excludes="**/*.bat"
perm="+x" />
+
         <antcall target="binary-package-zip"/>
         <antcall target="binary-package-tgz"/>
         

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/eeb5fc1c/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 0eb1ed9..26d8b79 100644
--- a/installer.xml
+++ b/installer.xml
@@ -151,11 +151,13 @@
                 <include name="**/**"/>
             </fileset>
         </copy>
+        <!-- flex-asjs has custom files
         <copy todir="${FLEX_HOME}/js/bin" failOnError="false" overwrite="true">
             <fileset dir="${FALCON_HOME}/js/bin">
                 <include name="**/**"/>
             </fileset>
         </copy>
+        -->
     </target>
 
 </project>


Mime
View raw message