diff options
Diffstat (limited to 'releng/org.eclipse.equinox.launcher.releng/build.xml')
-rw-r--r-- | releng/org.eclipse.equinox.launcher.releng/build.xml | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml index 59e88d2e0..6faa96d88 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 *; unix2dos win32/*; unix2dos wpf/*; if cmd /c build.bat" else="if sh build.sh"> + <condition property="build_cmd" value="unix2dos *; unix2dos ${remotetmpdir}/win32/*; unix2dos ${remotetmpdir}/wpf/*; if cmd /c build.bat ${arch} clean all" else="if sh build.sh -os ${os} -ws ${ws} -arch ${arch} ${javaParam} all"> <equals arg1="${os}" arg2="win32"/> </condition> <condition property="exit_cmd" value="exit;" else=""> @@ -181,19 +181,34 @@ <equals arg1="${os}" arg2="win32"/> </or> </condition> + <condition property="unzip_options" value="" else="-aa"> + <or> + <equals arg1="${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}; ${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"/> + command="rm -rf ${remotetmpdir}; mkdir ${remotetmpdir}; cd ${remotetmpdir}; unzip ${unzip_options} ${remotebuilddir}/${zip_file}; cd ${lib_dir}; ${build_cmd}; 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> - <scp file="${userName}@${machine}:${lib_dir}/eclipse" + <condition property="exe" value="eclipse.exe" else="eclipse"> + <or> + <equals arg1="${os}" arg2="win32"/> + </or> + </condition> + <scp file="${userName}@${machine}:${lib_dir}/${exe}" todir="${localGit}/rt.equinox.binaries/org.eclipse.equinox.executable/${exeFolder}/${ws}/${os}/${arch}${mac_suffix}" keyfile="${keyfile}" trust="true"/> - <scp file="${userName}@${machine}:${lib_dir}/eclipse_${maj_ver}${min_ver}.*" + <condition property="lib" value="eclipse_${maj_ver}${min_ver}.dll" else="eclipse_${maj_ver}${min_ver}.*"> + <or> + <equals arg1="${os}" arg2="win32"/> + </or> + </condition> + <scp file="${userName}@${machine}:${lib_dir}/${lib}" todir="${localGit}/rt.equinox.binaries/${fragmentFolder}" keyfile="${keyfile}" trust="true"/> |