aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2013-07-24 14:48:17 (EDT)
committerSilenio Quarti2013-07-24 14:48:17 (EDT)
commit8fdc816ed275330cbab1577789aa815256f99348 (patch)
tree43af384484861cc7bc383af4c652d98ff5918cf2
parente62094e926fba0373c094fb7cba25907ece641b2 (diff)
downloadrt.equinox.framework-8fdc816ed275330cbab1577789aa815256f99348.zip
rt.equinox.framework-8fdc816ed275330cbab1577789aa815256f99348.tar.gz
rt.equinox.framework-8fdc816ed275330cbab1577789aa815256f99348.tar.bz2
releng - fix launcher windows remote build again1
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml
index 52d402c..59e88d2 100644
--- a/releng/org.eclipse.equinox.launcher.releng/build.xml
+++ b/releng/org.eclipse.equinox.launcher.releng/build.xml
@@ -173,7 +173,7 @@
</not>
</or>
</condition>
- <condition property="build_cmd" value="unix2dos *; if cmd /c build.bat" else="if sh build.sh">
+ <condition property="build_cmd" value="unix2dos *; unix2dos win32/*; unix2dos wpf/*; if cmd /c build.bat" else="if sh build.sh">
<equals arg1="${os}" arg2="win32"/>
</condition>
<condition property="exit_cmd" value="exit;" else="">
@@ -185,7 +185,7 @@
username="${userName}"
keyfile="${keyfile}"
trust="true"
- command="rm -rf ${remotetmpdir}; mkdir ${remotetmpdir}; cd ${remotetmpdir}; unzip -aa ${remotebuilddir}/${zip_file}; cd ${lib_dir}; ${build_cmd} -os ${os} -ws ${ws} -arch ${arch} ${javaParam} all; then ${exit_cmd} cd; else cd; rm -rf ${remotetmpdir}; rm ${remotebuilddir}/${zip_file}; exit 1; fi"/>
+ command="rm -rf ${remotetmpdir}; mkdir ${remotetmpdir}; cd ${remotetmpdir}; unzip -aa ${remotebuilddir}/${zip_file}; cd ${lib_dir}; ${build_cmd} -os ${os} -ws ${ws} -arch ${arch} ${javaParam} all; then ${exit_cmd} cd; ${exit_cmd} else cd; rm -rf ${remotetmpdir}; rm ${remotebuilddir}/${zip_file}; exit 1; fi"/>
<condition property="mac_suffix" value="/Eclipse.app/Contents/MacOS" else="">
<equals arg1="macosx" arg2="${os}" />
</condition>