diff options
Diffstat (limited to 'releng')
7 files changed, 40 insertions, 39 deletions
diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh index 89580fdb5a5..bfdbe16818b 100644 --- a/releng/org.eclipse.cdt.releng/build.sh +++ b/releng/org.eclipse.cdt.releng/build.sh @@ -7,7 +7,8 @@ die() { exit 1 } -[ -n "$ECLIPSE_HOME" ] || die ECLIPSE_HOME not set +#[ -n "$ECLIPSE_HOME" ] || die ECLIPSE_HOME not set +ECLIPSE_HOME=../org.eclipse.releng.basebuilder cd `dirname $0` diff --git a/releng/org.eclipse.cdt.releng/platform/build.properties b/releng/org.eclipse.cdt.releng/platform/build.properties index 78dd49a4845..6e987229cc9 100644 --- a/releng/org.eclipse.cdt.releng/platform/build.properties +++ b/releng/org.eclipse.cdt.releng/platform/build.properties @@ -60,15 +60,15 @@ collBase=. # configs=win32,win32,x86 & linux,motif,x86 # By default the value is *,*,* configs=\ - aix,motif,ppc \ - & linux,gtk,x86 \ - & linux,gtk,x86_64 \ - & linux,gtk,ppc \ - & linux,gtk,ia64 \ - & macosx,carbon,ppc \ - & qnx,photon,x86 \ - & solaris,motif,sparc \ - & win32,win32,x86 + aix,motif,ppc-tar \ + & linux,gtk,x86-tar \ + & linux,gtk,x86_64-tar \ + & linux,gtk,ppc-tar \ + & linux,gtk,ia64-tar \ + & macosx,carbon,ppc-tar \ + & qnx,photon,x86-tar \ + & solaris,motif,sparc-tar \ + & win32,win32,x86-zip #Arguments to send to the zip executable zipargs= diff --git a/releng/org.eclipse.cdt.releng/platform/customTargets.xml b/releng/org.eclipse.cdt.releng/platform/customTargets.xml index 86fbbbc5a52..0e93408bba5 100644 --- a/releng/org.eclipse.cdt.releng/platform/customTargets.xml +++ b/releng/org.eclipse.cdt.releng/platform/customTargets.xml @@ -18,55 +18,55 @@ <!-- Add one target for each root element and each configuration --> <!-- ===================================================================== --> -<target name="assemble.org.eclipse.cdt.aix.motif.ppc"> +<target name="assemble.org.eclipse.cdt.aix.motif.ppc-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-aix.ppc.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.linux.gtk.x86"> +<target name="assemble.org.eclipse.cdt.linux.gtk.x86-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.x86.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.linux.gtk.x86_64"> +<target name="assemble.org.eclipse.cdt.linux.gtk.x86_64-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.x86_64.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.linux.gtk.ppc"> +<target name="assemble.org.eclipse.cdt.linux.gtk.ppc-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ppc.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.linux.gtk.ia64"> +<target name="assemble.org.eclipse.cdt.linux.gtk.ia64-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ia64.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.macosx.carbon.ppc"> +<target name="assemble.org.eclipse.cdt.macosx.carbon.ppc-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.qnx.photon.x86"> +<target name="assemble.org.eclipse.cdt.qnx.photon.x86-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-qnx.x86.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.solaris.motif.sparc"> +<target name="assemble.org.eclipse.cdt.solaris.motif.sparc-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.win32.win32.x86"> +<target name="assemble.org.eclipse.cdt.win32.win32.x86-zip"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-win32.x86.zip"/> </ant> diff --git a/releng/org.eclipse.cdt.releng/sdk/build.properties b/releng/org.eclipse.cdt.releng/sdk/build.properties index 6797e721774..38f50a9cd7a 100644 --- a/releng/org.eclipse.cdt.releng/sdk/build.properties +++ b/releng/org.eclipse.cdt.releng/sdk/build.properties @@ -60,15 +60,15 @@ collBase=. # configs=win32,win32,x86 & linux,motif,x86 # By default the value is *,*,* configs=\ - aix,motif,ppc \ - & linux,gtk,x86 \ - & linux,gtk,x86_64 \ - & linux,gtk,ppc \ - & linux,gtk,ia64 \ - & macosx,carbon,ppc \ - & qnx,photon,x86 \ - & solaris,motif,sparc \ - & win32,win32,x86 + aix,motif,ppc-tar \ + & linux,gtk,x86-tar \ + & linux,gtk,x86_64-tar \ + & linux,gtk,ppc-tar \ + & linux,gtk,ia64-tar \ + & macosx,carbon,ppc-tar \ + & qnx,photon,x86-tar \ + & solaris,motif,sparc-tar \ + & win32,win32,x86-zip #Arguments to send to the zip executable zipargs= diff --git a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml index c5296616804..f55374683b3 100644 --- a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml +++ b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml @@ -23,55 +23,55 @@ <!-- Add one target for each root element and each configuration --> <!-- ===================================================================== --> -<target name="assemble.org.eclipse.cdt.sdk.aix.motif.ppc"> +<target name="assemble.org.eclipse.cdt.sdk.aix.motif.ppc-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-aix.ppc.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86"> +<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.x86.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86_64"> +<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86_64-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.x86_64.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ppc"> +<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ppc-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ppc.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ia64"> +<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ia64-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ia64.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.sdk.macosx.carbon.ppc"> +<target name="assemble.org.eclipse.cdt.sdk.macosx.carbon.ppc-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.sdk.qnx.photon.x86"> +<target name="assemble.org.eclipse.cdt.sdk.qnx.photon.x86-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-qnx.x86.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.sdk.solaris.motif.sparc"> +<target name="assemble.org.eclipse.cdt.sdk.solaris.motif.sparc-tar"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/> </ant> </target> -<target name="assemble.org.eclipse.cdt.sdk.win32.win32.x86"> +<target name="assemble.org.eclipse.cdt.sdk.win32.win32.x86-zip"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-win32.x86.zip"/> </ant> diff --git a/releng/org.eclipse.cdt.releng/testing/build.properties b/releng/org.eclipse.cdt.releng/testing/build.properties index aa12a1152a4..3d5e81269e0 100644 --- a/releng/org.eclipse.cdt.releng/testing/build.properties +++ b/releng/org.eclipse.cdt.releng/testing/build.properties @@ -59,7 +59,7 @@ collBase=. # value is a '&' separated list of ',' separate triples. For example, # configs=win32,win32,x86 & linux,motif,x86 # By default the value is *,*,* -configs=*,*,* +configs=*,*,*-zip #Arguments to send to the zip executable zipargs= diff --git a/releng/org.eclipse.cdt.releng/testing/customTargets.xml b/releng/org.eclipse.cdt.releng/testing/customTargets.xml index 3a1359ac950..c460dffeca8 100644 --- a/releng/org.eclipse.cdt.releng/testing/customTargets.xml +++ b/releng/org.eclipse.cdt.releng/testing/customTargets.xml @@ -23,7 +23,7 @@ <!-- Add one target for each root element and each configuration --> <!-- ===================================================================== --> -<target name="assemble.org.eclipse.cdt.testing"> +<target name="assemble.org.eclipse.cdt.testing-*,*,*-zip"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="org.eclipse.cdt.testing-${branchVersion}-${buildId}.zip"/> </ant> |