Remove special casing for sentinals in distro by moving actual files to ship into a subdirectory.
Review by: fabbott
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@3658 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/distro-source/common.ant.xml b/distro-source/common.ant.xml
index 4657d66..7a99364 100755
--- a/distro-source/common.ant.xml
+++ b/distro-source/common.ant.xml
@@ -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}" />
diff --git a/distro-source/linux/build.xml b/distro-source/linux/build.xml
index c3739a3..d6210ee 100755
--- a/distro-source/linux/build.xml
+++ b/distro-source/linux/build.xml
@@ -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" />
diff --git a/distro-source/mac/build.xml b/distro-source/mac/build.xml
index f6c86c9..4ba7ecf 100755
--- a/distro-source/mac/build.xml
+++ b/distro-source/mac/build.xml
@@ -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" />
diff --git a/distro-source/windows/build.xml b/distro-source/windows/build.xml
index 8f3c813..db1baf8 100755
--- a/distro-source/windows/build.xml
+++ b/distro-source/windows/build.xml
@@ -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 -->
