flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [3/4] git commit: [flex-asjs] [refs/heads/develop] - handle having our own template
Date Wed, 19 Aug 2015 21:51:54 GMT
handle having our own template


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

Branch: refs/heads/develop
Commit: c3305f345c9d7bae8838e348fc095628a6c8fda8
Parents: a4a0f2b
Author: Alex Harui <aharui@apache.org>
Authored: Mon Aug 17 07:42:21 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Aug 17 07:42:28 2015 -0700

----------------------------------------------------------------------
 build.xml                | 4 ++--
 frameworks/build.xml     | 4 ++--
 frameworks/downloads.xml | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c3305f34/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e91cfdd..845b38a 100644
--- a/build.xml
+++ b/build.xml
@@ -527,6 +527,7 @@
         <copy todir="${basedir}/temp">
             <fileset dir="${FLEX_SDK_HOME}" >
                 <include name="templates/swfobject/**"/>
+                <exclude name="templates/swfobject/index.template.html"/>
                 <exclude name="**/expressInstall.swf"/>
                 <exclude name="**/swfobject.js"/>
             </fileset>
@@ -565,7 +566,7 @@
             </fileset>
         </copy>
         
-        <!-- templates
+        <!-- templates -->
         <copy todir="${basedir}/temp/templates">
             <fileset dir="${basedir}/templates" >
                 <include name="swfobject/**"/>
@@ -573,7 +574,6 @@
                 <exclude name="**/swfobject.js"/>
             </fileset>
         </copy>
-        -->
         
         <!-- 
              Source files have Windows line endings.  Most UNIX editors can handle

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c3305f34/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 351dfa6..e66b008 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -208,8 +208,8 @@
         </delete>
         <delete dir="${basedir}/libs/generated"/>
         <!-- Delete only if it exists and it is empty.  air and swfobject put dirs here.
-->
-        <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${FLEXJS_HOME}/templates" excludes="**/*" />
+        <delete dir="${FLEXJS_HOME}/templates" includeemptydirs="true" failonerror="false">
+            <exclude name="swfobject/index.template.html" />
         </delete> 
     </target>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c3305f34/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index e6461e7..68a6a33 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -73,6 +73,7 @@
         <delete failonerror="false">
             <fileset dir="${FLEXJS_HOME}/templates/swfobject">
                 <include name="**/**"/>
+                <exclude name="index.template.html"/>
             </fileset>
         </delete>
     </target>


Mime
View raw message