improvements to build process for machine variations
diff --git a/releng.wtpbuilder/distribution/wtp.upload/build.xml b/releng.wtpbuilder/distribution/wtp.upload/build.xml
index 28f822b..6453789 100644
--- a/releng.wtpbuilder/distribution/wtp.upload/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.upload/build.xml
@@ -1 +1 @@
-<project default="push" basedir=".">
<target name="push" depends="sync">
<condition property="doTrial">
<equals arg1="${build.trial}" arg2="true" />
</condition>
</target>
<target name="sync" unless="doTrial">
<!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
<!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder,
such as in releng.builder -->
<property name="wtpbuilder.upload.properties.file"
value="${basedir}/fallback.upload.properties" />
<property file="${wtpbuilder.upload.properties.file}" />
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
<property file="${buildDirectory}/label.properties" />
<echo message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />
<exec executable="rsync">
<arg line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
</exec>
</target>
</project>
+<project default="push" basedir=".">
<target name="push" depends="sync">
<condition property="doTrial">
<equals arg1="${build.trial}" arg2="true" />
</condition>
</target>
<target name="sync" unless="doTrial">
<!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
<!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder,
such as in releng.builder -->
<property name="wtpbuilder.upload.properties.file"
value="${basedir}/fallback.upload.properties" />
<property file="${wtpbuilder.upload.properties.file}" />
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
<property file="${buildDirectory}/label.properties" />
<!-- synch on host is a tiny bit faster if permisions already set -->
<!-- first set main directory -->
<chmod dir="${buildDirectory}/${buildLabel}"
perm="o+rx"
verbose="true" />
<!-- next all directories under main directory -->
<chmod dir="${buildDirectory}/${buildLabel}"
perm="o+rx"
verbose="true">
<dirset dir="${buildDirectory}/${buildLabel}/**" />
</chmod>
<!-- now all files (notice just o+r needed) -->
<chmod dir="${buildDirectory}/${buildLabel}"
perm="o+r"
verbose="true">
<fileset dir="${buildDirectory}/${buildLabel}/**">
<include name="**/*" />
</fileset>
</chmod>
<echo message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />
<exec executable="rsync">
<arg line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
</exec>
</target>
</project>