aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2013-07-24 15:40:01 (EDT)
committerSilenio Quarti2013-07-24 15:40:01 (EDT)
commit238b9b73a51b604a32391bc668cb8ec1f6096f92 (patch)
tree062d13eab86174d7293f91d1729543fabf8bd4ae
parent8fdc816ed275330cbab1577789aa815256f99348 (diff)
downloadrt.equinox.framework-238b9b73a51b604a32391bc668cb8ec1f6096f92.zip
rt.equinox.framework-238b9b73a51b604a32391bc668cb8ec1f6096f92.tar.gz
rt.equinox.framework-238b9b73a51b604a32391bc668cb8ec1f6096f92.tar.bz2
releng - fix win32 remote build
-rw-r--r--bundles/org.eclipse.equinox.executable/library/win32/build.bat2
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/build.xml23
2 files changed, 21 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.bat b/bundles/org.eclipse.equinox.executable/library/win32/build.bat
index 81f5afc..e02abbb 100644
--- a/bundles/org.eclipse.equinox.executable/library/win32/build.bat
+++ b/bundles/org.eclipse.equinox.executable/library/win32/build.bat
@@ -58,6 +58,7 @@ GOTO MAKE
:X86_64
shift
set defaultOSArch=x86_64
+set PROCESSOR_ARCHITECTURE=AMD64
IF x.%JAVA_HOME%==x. set JAVA_HOME=%LAUNCHER_BUILDDIR%\ibm-sdk50-x86_64
IF "x.%MSSDK%" == "x." set MSSDK="%LAUNCHER_BUILDDIR%\MSSDKs\Windows Server 2003 SP1 SDK"
set javaHome=%JAVA_HOME%
@@ -68,6 +69,7 @@ GOTO MAKE
:IA64
shift
set defaultOSArch=ia64
+set PROCESSOR_ARCHITECTURE=AMD64
IF x.%JAVA_HOME%==x. set JAVA_HOME=%LAUNCHER_BUILDDIR%\ibm-sdk142-ia64
IF "x.%MSSDK%" == "x." set MSSDK="%LAUNCHER_BUILDDIR%\MSSDKs\Windows Server 2003 SP1 SDK"
set javaHome=%JAVA_HOME%
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml
index 59e88d2..6faa96d 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"/>