diff options
| author | Silenio Quarti | 2012-09-13 14:22:58 +0000 |
|---|---|---|
| committer | Silenio Quarti | 2012-09-13 14:22:58 +0000 |
| commit | 352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0 (patch) | |
| tree | dcec5b84c16f46add046b7fce3c9939a61161dd2 /bundles/org.eclipse.equinox.executable/library/win32 | |
| parent | 2a29bdfc8fcaedd42bc24f7f1e40f8f282b33db3 (diff) | |
| download | rt.equinox.framework-352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0.tar.gz rt.equinox.framework-352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0.tar.xz rt.equinox.framework-352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0.zip | |
Bug 389363 - Merge Equinox framework into 3.8.2/4.2.2v20120913-142258
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/win32')
3 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.bat b/bundles/org.eclipse.equinox.executable/library/win32/build.bat index f64ce1d09..81f5afcd1 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/build.bat +++ b/bundles/org.eclipse.equinox.executable/library/win32/build.bat @@ -134,7 +134,8 @@ set PROGRAM_LIBRARY=%programLibrary% set DEFAULT_OS=%defaultOS% set DEFAULT_OS_ARCH=%defaultOSArch% set DEFAULT_WS=%defaultWS% -set OUTPUT_DIR=..\..\bin\%defaultWS%\%defaultOS%\%defaultOSArch% +set EXEC_DIR=..\..\.\..\..\rt.equinox.binaries\org.eclipse.equinox.executable +set OUTPUT_DIR=%EXEC_DIR%\bin\%defaultWS%\%defaultOS%\%defaultOSArch% set JAVA_HOME=%javaHome% rem -------------------------- diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.sh b/bundles/org.eclipse.equinox.executable/library/win32/build.sh index f81f52b00..853eaf4cf 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/win32/build.sh @@ -58,7 +58,8 @@ PROGRAM_OUTPUT="$programOutput" DEFAULT_OS="$defaultOS" DEFAULT_OS_ARCH="$defaultOSArch" DEFAULT_WS="$defaultWS" -OUTPUT_DIR=../../bin/$defaultWS/$defaultOS/$defaultOSArch +EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable +OUTPUT_DIR=$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.xml b/bundles/org.eclipse.equinox.executable/library/win32/build.xml index a5a99abbd..056b85926 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/build.xml +++ b/bundles/org.eclipse.equinox.executable/library/win32/build.xml @@ -6,7 +6,6 @@ <exec dir="." executable="${basedir}\build.bat"> <arg line="install"/> </exec> - <eclipse.refreshLocal resource="platform-launcher" depth="infinite" /> </target> <target name="clean"> |