Author: [EMAIL PROTECTED]
Date: Tue Sep 16 18:38:38 2008
New Revision: 3658

Modified:
    trunk/distro-source/common.ant.xml
    trunk/distro-source/linux/build.xml
    trunk/distro-source/mac/build.xml
    trunk/distro-source/windows/build.xml

Log:
Remove special casing for sentinals in distro by moving actual files to  
ship into a subdirectory.

Review by: fabbott


Modified: trunk/distro-source/common.ant.xml
==============================================================================
--- trunk/distro-source/common.ant.xml  (original)
+++ trunk/distro-source/common.ant.xml  Tue Sep 16 18:38:38 2008
@@ -5,6 +5,7 @@

    <property name="project.distname"  
value="gwt-${dist.platform}-${gwt.version}" />
    <property name="project.staging"  
location="${gwt.build.staging}/${project.distname}" />
+  <property name="dist.resources" location="${project.build}/resources" />

    <patternset id="chmod.executables">
      <include name="*Creator" />
@@ -23,7 +24,7 @@
          <available file="${filter.sentinel}" />
          <uptodate>
            <srcfiles dir="../core/src" />
-          <globmapper from="*" to="${project.build}/*" />
+          <globmapper from="*" to="${dist.resources}/*" />
          </uptodate>
        </and>
      </condition>
@@ -31,7 +32,7 @@
    </target>

    <target name="-filter.props" unless="filter.uptodate">
-    <gwt.revfilter todir="${project.build}" >
+    <gwt.revfilter todir="${dist.resources}" >
        <fileset dir="../core/src" />
      </gwt.revfilter>
      <touch file="${filter.sentinel}" />

Modified: trunk/distro-source/linux/build.xml
==============================================================================
--- trunk/distro-source/linux/build.xml (original)
+++ trunk/distro-source/linux/build.xml Tue Sep 16 18:38:38 2008
@@ -20,12 +20,11 @@
        </tarfileset>

        <!-- raw files -->
-      <tarfileset dir="${project.build}" prefix="${project.distname}"  
mode="755">
+      <tarfileset dir="${dist.resources}" prefix="${project.distname}"  
mode="755">
          <patternset refid="chmod.executables" />
        </tarfileset>
-      <tarfileset dir="${project.build}" prefix="${project.distname}">
+      <tarfileset dir="${dist.resources}" prefix="${project.distname}">
          <patternset refid="chmod.not.executables" />
-        <exclude name="sentinels/**"/>
        </tarfileset>
        <tarfileset dir="src" prefix="${project.distname}" mode="755">
          <patternset refid="chmod.executables" />

Modified: trunk/distro-source/mac/build.xml
==============================================================================
--- trunk/distro-source/mac/build.xml   (original)
+++ trunk/distro-source/mac/build.xml   Tue Sep 16 18:38:38 2008
@@ -22,12 +22,11 @@
        </tarfileset>

        <!-- raw files -->
-      <tarfileset dir="${project.build}" prefix="${project.distname}"  
mode="755">
+      <tarfileset dir="${dist.resources}" prefix="${project.distname}"  
mode="755">
          <patternset refid="chmod.executables" />
        </tarfileset>
-      <tarfileset dir="${project.build}" prefix="${project.distname}">
+      <tarfileset dir="${dist.resources}" prefix="${project.distname}">
          <patternset refid="chmod.not.executables" />
-        <exclude name="sentinels/**"/>
        </tarfileset>
        <tarfileset dir="src" prefix="${project.distname}" mode="755">
          <patternset refid="chmod.executables" />

Modified: trunk/distro-source/windows/build.xml
==============================================================================
--- trunk/distro-source/windows/build.xml       (original)
+++ trunk/distro-source/windows/build.xml       Tue Sep 16 18:38:38 2008
@@ -20,9 +20,7 @@
        </zipfileset>

        <!-- raw files -->
-      <zipfileset dir="${project.build}" prefix="${project.distname}">
-        <exclude name="sentinels/**"/>
-      </zipfileset>
+      <zipfileset dir="${dist.resources}" prefix="${project.distname}" />
        <zipfileset dir="src" prefix="${project.distname}" />

        <!-- doc -->

--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---

Reply via email to