aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Gheorghe2012-11-22 10:34:14 (EST)
committerBogdan Gheorghe2012-11-22 10:34:14 (EST)
commit3bbaf1b265bec1b238aeb5e924b4241b4f757ec1 (patch)
tree475d75fe3b2f711c1b0b676b89e2d104934e518d
parentbc208f9ff388083d4f2bb650e1efcceac5b9b10e (diff)
downloadrt.equinox.framework-3bbaf1b265bec1b238aeb5e924b4241b4f757ec1.zip
rt.equinox.framework-3bbaf1b265bec1b238aeb5e924b4241b4f757ec1.tar.gz
rt.equinox.framework-3bbaf1b265bec1b238aeb5e924b4241b4f757ec1.tar.bz2
Backporting build changes to 3.6
-rw-r--r--bundles/org.eclipse.equinox.executable/build.properties1
-rw-r--r--bundles/org.eclipse.equinox.executable/customBuildCallbacks.xml21
-rw-r--r--bundles/org.eclipse.equinox.executable/library/carbon/build.sh7
-rw-r--r--bundles/org.eclipse.equinox.executable/target.build.xml4
4 files changed, 27 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.executable/build.properties b/bundles/org.eclipse.equinox.executable/build.properties
index d156bd9..e1c359f 100644
--- a/bundles/org.eclipse.equinox.executable/build.properties
+++ b/bundles/org.eclipse.equinox.executable/build.properties
@@ -10,6 +10,7 @@
###############################################################################
#custom = true
p2.group.id = org.eclipse.equinox.executable
+binaryTag=v20121107-1122
customBuildCallbacks=customBuildCallbacks.xml
bin.includes = bin/,\
feature.xml,\
diff --git a/bundles/org.eclipse.equinox.executable/customBuildCallbacks.xml b/bundles/org.eclipse.equinox.executable/customBuildCallbacks.xml
index eaed1dd..48a9f16 100644
--- a/bundles/org.eclipse.equinox.executable/customBuildCallbacks.xml
+++ b/bundles/org.eclipse.equinox.executable/customBuildCallbacks.xml
@@ -43,7 +43,26 @@
<target name="post.build.sources">
</target>
- <target name="pre.gather.bin.parts">
+ <target name="pre.gather.bin.parts" unless="dontFetchBinaries">
+ <property file="${basedir}/build.properties" />
+ <basename file="${basedir}" property="fragmentName" />
+ <available file="/gitroot/equinox/rt.equinox.binaries.git" type="dir" property="gitRepo" value="/gitroot/equinox/rt.equinox.binaries.git" />
+ <property name="gitRepo" value="ssh://git.eclipse.org/gitroot/equinox/rt.equinox.binaries.git" />
+
+ <echo message="${fragmentName}"/>
+ <echo message="${gitRepo}"/>
+ <echo message="${binaryTag}"/>
+
+ <exec dir="${basedir}" executable="git" output="${basedir}/binary.tar" errorproperty="errorResult" >
+ <arg line="archive --format=tar --remote=${gitRepo} ${binaryTag} ${fragmentName}" />
+ </exec>
+
+ <copy todir="${basedir}">
+ <tarfileset includes="${fragmentName}/**" src="${basedir}/binary.tar" />
+ <globmapper from="${fragmentName}/*" to="*" />
+ </copy>
+
+ <delete file="${basedir}/binary.tar" failonerror="false" quiet="true" />
</target>
<!-- ===================================================================== -->
diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/build.sh b/bundles/org.eclipse.equinox.executable/library/carbon/build.sh
index 31ad717..0945105 100644
--- a/bundles/org.eclipse.equinox.executable/library/carbon/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/carbon/build.sh
@@ -60,9 +60,10 @@ PROGRAM_OUTPUT="$programOutput"
DEFAULT_OS="$defaultOS"
DEFAULT_OS_ARCH="$defaultOSArch"
DEFAULT_WS="$defaultWS"
-PPC_OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/ppc/Eclipse.app/Contents/MacOS"
-X86_OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/x86/Eclipse.app/Contents/MacOS"
-X86_64_OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/x86_64/Eclipse.app/Contents/MacOS"
+EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable
+PPC_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/ppc/Eclipse.app/Contents/MacOS"
+X86_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/x86/Eclipse.app/Contents/MacOS"
+X86_64_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/x86_64/Eclipse.app/Contents/MacOS"
if [ "$DEFAULT_WS" == "cocoa" ]; then
makefile="make_cocoa.mak"
diff --git a/bundles/org.eclipse.equinox.executable/target.build.xml b/bundles/org.eclipse.equinox.executable/target.build.xml
index ed649f2..ba5f510 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.xml
+++ b/bundles/org.eclipse.equinox.executable/target.build.xml
@@ -102,7 +102,7 @@
<fileset dir="${basedir}/bin/carbon/macosx/x86" includes="**" />
</copy>
<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}" />
- <chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="Elcipse.app/Contents/MacOS/launcher" />
+ <chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
</target>
<target name="rootFilesmacosx_cocoa_ppc">
<mkdir dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}"/>
@@ -110,7 +110,7 @@
<fileset dir="${basedir}/bin/cocoa/macosx/ppc" includes="**" />
</copy>
<chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="${launcherName}" />
- <chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="Elcipse.app/Contents/MacOS/launcher" />
+ <chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
</target>
<target name="rootFilesmacosx_cocoa_x86">
<mkdir dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}"/>