Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2012-09-13 14:22:58 +0000
committerSilenio Quarti2012-09-13 14:22:58 +0000
commit352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0 (patch)
treedcec5b84c16f46add046b7fce3c9939a61161dd2 /bundles/org.eclipse.equinox.executable/library/photon
parent2a29bdfc8fcaedd42bc24f7f1e40f8f282b33db3 (diff)
downloadrt.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/photon')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/photon/build.sh3
-rw-r--r--bundles/org.eclipse.equinox.executable/library/photon/build.xml1
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/photon/build.sh b/bundles/org.eclipse.equinox.executable/library/photon/build.sh
index ea8405923..43ef9b167 100644
--- a/bundles/org.eclipse.equinox.executable/library/photon/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/photon/build.sh
@@ -60,7 +60,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/photon/build.xml b/bundles/org.eclipse.equinox.executable/library/photon/build.xml
index b4308a9a2..990298e64 100644
--- a/bundles/org.eclipse.equinox.executable/library/photon/build.xml
+++ b/bundles/org.eclipse.equinox.executable/library/photon/build.xml
@@ -7,7 +7,6 @@
<arg line="${basedir}/build.sh"/>
<arg line="install"/>
</exec>
- <eclipse.refreshLocal resource="platform-launcher" depth="infinite" />
</target>
<target name="clean">

Back to the top