diff options
23 files changed, 67 insertions, 16 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties b/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties index 2a5549d74..1ad1d28d3 100644 --- a/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties +++ b/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties b/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties index d71226817..9dd234142 100644 --- a/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties +++ b/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties b/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties index 05ac48585..f0d964b35 100644 --- a/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx/build.properties index 3517b49a4..b0eb4db57 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties index d4388e686..acef3ae9b 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx/build.properties index 43ad0fdcd..bc3097a39 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties index 9441f1cf1..c2bac8aa7 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties index f3b92568a..175f87bbc 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties index a5820c7ef..ee9f0752e 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties index 75b6eb90b..5f514e346 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties index b2064222a..777847ecb 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties index 664e8b43b..16e188232 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties index d6e659759..2004d783c 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties @@ -14,4 +14,5 @@ bin.includes = META-INF/,\ about.html customBuildCallbacks=customBuildCallbacks.xml -generateSourceBundle=false
\ No newline at end of file +generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties index a721a4aa5..fb0a5eb09 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties @@ -15,3 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties index 8c537459e..7ed422e05 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties @@ -16,3 +16,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties index 17c084b3b..95e37eaf2 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties @@ -14,4 +14,5 @@ bin.includes = META-INF/,\ about.html customBuildCallbacks=customBuildCallbacks.xml -generateSourceBundle=false
\ No newline at end of file +generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/build.properties index 09165f311..e63012b93 100755 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/build.properties @@ -14,4 +14,5 @@ bin.includes = META-INF/,\ about.html customBuildCallbacks=customBuildCallbacks.xml -generateSourceBundle=false
\ No newline at end of file +generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties index 19ae5cef5..6d2d4a8ec 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties @@ -14,4 +14,5 @@ bin.includes = META-INF/,\ about.html customBuildCallbacks=customBuildCallbacks.xml -generateSourceBundle=false
\ No newline at end of file +generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties index b6e846fd8..a7f9b1c75 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties @@ -12,4 +12,5 @@ bin.includes = META-INF/,\ eclipse_*.dll,\ launcher.win32.win32.ia64.properties,\ about.html -generateSourceBundle=false
\ No newline at end of file +generateSourceBundle=false +binaryTag=R3_7
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/build.properties index c00bedb86..9ca9ce89a 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/build.properties @@ -12,4 +12,5 @@ bin.includes = META-INF/,\ eclipse_*.dll,\ launcher.win32.win32.x86.properties,\ about.html -generateSourceBundle=false
\ No newline at end of file +generateSourceBundle=false +binaryTag=R3_7
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties index 340c18680..77e301932 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties @@ -12,4 +12,5 @@ bin.includes = META-INF/,\ eclipse_*.dll,\ launcher.win32.win32.x86_64.properties,\ about.html -generateSourceBundle=false
\ No newline at end of file +generateSourceBundle=false +binaryTag=R3_7 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties index 1156ad9bf..36289e9d1 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties @@ -13,4 +13,5 @@ bin.includes = META-INF/,\ com_*.dll,\ launcher.wpf.win32.x86.properties,\ about.html -generateSourceBundle=false
\ No newline at end of file +generateSourceBundle=false +binaryTag=R3_7 diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml index 1c64d9180..cb30d1d6f 100644 --- a/releng/org.eclipse.equinox.launcher.releng/build.xml +++ b/releng/org.eclipse.equinox.launcher.releng/build.xml @@ -72,6 +72,19 @@ </sequential> </macrodef> + <!-- macro for invoking git --> + <macrodef name="git"> + <attribute name="dir" /> + <attribute name="command" /> + <attribute name="arguments" default="" /> + <sequential> + <exec dir="@{dir}" executable="git" > + <arg value="@{command}"/> + <arg line="@{arguments}"/> + </exec> + </sequential> + </macrodef> + <target name="init_exeFolder" > <!-- set to "bin" or "contributed" according to which folder under org.eclipse.equinox.executable to store the built eclipse --> <condition property="exeFolder" value="contributed" else="bin"> @@ -284,23 +297,39 @@ <antcall target="buildRemote" /> </target> - <target name="cloneBinaryRepo" unless="binaryRepoExists" > - <exec dir="${staging}" command="git" > - <arg value="clone" /> - <arg value="ssh://git.eclipse.org/gitroot/equinox/rt.equinox.binaries.git" /> - </exec> + <target name="cloneGitRepos" unless="gitRepoExists" > + <git dir="${staging}" command="clone" arguments="ssh://git.eclipse.org/gitroot/equinox/rt.equinox.binaries.git" /> + <git dir="${staging}" command="clone" arguments="ssh://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git" /> </target> + <target name="stageBinaries" depends="initProperties"> + <tstamp/> + <property name="tag" value="v${DSTAMP}-${TSTAMP}"/> <property name="staging" value="${basedir}/staging" /> - - <available file="${staging}/rt.equinox.binaries" type="dir" property="binaryRepoExists" /> - <antcall target="cloneBinaryRepo" /> + <property name="commitMsg" value="" /> + + <available file="${staging}/rt.equinox.binaries" type="dir" property="gitRepoExists" /> + <antcall target="cloneGitRepos" /> + + <git dir="${staging}/rt.equinox.binaries" command="pull" /> + <git dir="${staging}/rt.equinox.framework" command="pull" /> <SCP dir="${staging}" flag="r" source="${resultsBaseFolder}/org.eclipse.equinox.executable/*" destination="${staging}/rt.equinox.binaries/org.eclipse.equinox.executable" /> <SCP dir="${staging}" flag="r" source="${resultsBaseFolder}/org.eclipse.equinox.launcher/fragments/*" destination="${staging}/rt.equinox.binaries" /> <SCP dir="${staging}" flag="r" source="${resultsBaseFolder}/org.eclipse.equinox.launcher/contributed/*" destination="${staging}/rt.equinox.binaries" /> + <git dir="${staging}/rt.equinox.binaries" command="commit" arguments="-a -m "Recompiled binaries ${commitMsg}"" /> + <git dir="${staging}/rt.equinox.binaries" command="tag" arguments="${tag}" /> + <git dir="${staging}/rt.equinox.binaries" command="push" /> + <git dir="${staging}/rt.equinox.binaries" command="push" arguments="--tags" /> + + <replaceregexp match="binaryTag=(.*)" replace="binaryTag=${tag}" > + <fileset dir="${staging}/rt.equinox.framework" includes="**/build.properties" /> + </replaceregexp> + <git dir="${staging}/rt.equinox.framework" command="commit" arguments="-a -m "Binaries ${tag} ${commitMsg}"" /> + <git dir="${staging}/rt.equinox.framework" command="push" /> + </target> <target name="buildLocal" if="local" > |