diff options
Diffstat (limited to 'releng/org.eclipse.equinox.launcher.releng/build.xml')
-rw-r--r-- | releng/org.eclipse.equinox.launcher.releng/build.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml index e65189c58..a8e82709e 100644 --- a/releng/org.eclipse.equinox.launcher.releng/build.xml +++ b/releng/org.eclipse.equinox.launcher.releng/build.xml @@ -152,7 +152,6 @@ <condition property="remotebuilddir" value="c:/build" else="~/build/"> <or> <equals arg1="${os}" arg2="win32"/> - <equals arg1="${os}" arg2="wce_ppc"/> </or> </condition> <property name="remotetmpdir" value="${remotebuilddir}/${fragmentFolder}.${gitTag}"/> @@ -174,11 +173,19 @@ </not> </or> </condition> + <condition property="build_cmd" value="unix2dos *; if cmd /c build.bat" else="if sh build.sh"> + <equals arg1="${swt.os}" arg2="win32"/> + </condition> + <condition property="exit_cmd" value="exit;" else=""> + <or> + <equals arg1="${swt.os}" arg2="win32"/> + </or> + </condition> <sshexec host="${machine}" username="${userName}" keyfile="${keyfile}" trust="true" - command="rm -rf ${remotetmpdir}; mkdir ${remotetmpdir}; cd ${remotetmpdir}; unzip -aa ${remotebuilddir}/${zip_file}; cd ${lib_dir}; if sh build.sh -os ${os} -ws ${ws} -arch ${arch} ${javaParam} all; then 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; 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> |