diff options
| author | Alexander Kurtakov | 2018-10-08 06:41:11 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-10-08 06:41:11 +0000 |
| commit | f98a12c4bdd9d071f28be3e03ca232f038fa931d (patch) | |
| tree | 6555f2054c0631a22982aecc6cf6eb6e5c23bafe | |
| parent | 6ffded12ecae79312cf93259c894267c10ac49fe (diff) | |
| download | eclipse.pde.build-I20181023-1800.tar.gz eclipse.pde.build-I20181023-1800.tar.xz eclipse.pde.build-I20181023-1800.zip | |
Bug 539363 - 11 pde.build test failures with I20180923-1800Y20181107-2200Y20181031-2200Y20181030-1100Y20181030-0940Y20181026-0120Y20181025-0550Y20181025-0530S4_10_0_M1I20181114-0925I20181114-0355I20181114-0200I20181112-1800I20181112-0435I20181112-0320I20181109-0350I20181108-1800I20181107-1800I20181107-0200I20181106-1800I20181106-0125I20181105-1800I20181104-1800I20181103-1800I20181102-2120I20181102-1800I20181101-1800I20181031-1800I20181031-0550I20181031-0540I20181030-1800I20181029-1800I20181028-1800I20181027-1800I20181026-1800I20181025-1800I20181024-1800I20181023-1800I20181023-1200I20181023-0800I20181022-2040I20181022-1800I20181021-1800I20181020-1800I20181019-1800I20181019-0450I20181019-0330I20181018-1800I20181017-1800I20181016-1800I20181015-1800I20181015-0255I20181014-2350I20181014-1800I20181013-1800I20181012-1800I20181010-1800I20181010-0600I20181009-1800I20181009-0600I20181008-1800I20181008-0600
Adjust test resources to have allElements win32 x86_64 target and
removed such for no longer supported archs.
Adjust customTargets.xml template to set x86_64 and not x86.
Change-Id: If4b6c373ea4766e35885197a4a28cff239e5c143
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
| -rw-r--r-- | org.eclipse.pde.build.tests/resources/allElements.xml | 54 | ||||
| -rw-r--r-- | org.eclipse.pde.build/templates/packager/customTargets.xml | 4 |
2 files changed, 5 insertions, 53 deletions
diff --git a/org.eclipse.pde.build.tests/resources/allElements.xml b/org.eclipse.pde.build.tests/resources/allElements.xml index 16a4098e..203616f7 100644 --- a/org.eclipse.pde.build.tests/resources/allElements.xml +++ b/org.eclipse.pde.build.tests/resources/allElements.xml @@ -24,67 +24,19 @@ </ant> </target> - <target name="assemble.@ELEMENT@.win32.win32.x86"> + <target name="assemble.@ELEMENT@.win32.win32.x86_64"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-win32.win32.x86.zip"/> + <property name="archiveName" value="${archiveNamePrefix}-win32.win32.x86_64.zip"/> </ant> </target> - - <target name="assemble.@ELEMENT@.linux.gtk.ppc"> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.ppc.zip"/> - </ant> - </target> - - <target name="assemble.@ELEMENT@.linux.gtk.x86"> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86.zip"/> - </ant> - </target> - + <target name="assemble.@ELEMENT@.linux.gtk.x86_64"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/> </ant> </target> - <target name="assemble.@ELEMENT@.linux.motif.x86"> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-linux.motif.x86.zip"/> - </ant> - </target> - - <target name="assemble.@ELEMENT@.solaris.motif.sparc"> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-solaris.motif.sparc.zip"/> - </ant> - </target> - - <target name="assemble.@ELEMENT@.solaris.gtk.sparc"> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-solaris.gtk.sparc.zip"/> - </ant> - </target> - - <target name="assemble.@ELEMENT@.aix.motif.ppc"> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-aix.motif.ppc.zip"/> - </ant> - </target> - - <target name="assemble.@ELEMENT@.hpux.motif.PA_RISC"> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-hpux.motif.PA_RISC.zip"/> - </ant> - </target> - - <target name="assemble.@ELEMENT@.macosx.carbon.ppc"> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-macosx.carbon.ppc.tar.gz"/> - </ant> - </target> - <target name="assemble.@ELEMENT@.group.group.group"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> <property name="archiveName" value="${archiveNamePrefix}-group.zip"/> diff --git a/org.eclipse.pde.build/templates/packager/customTargets.xml b/org.eclipse.pde.build/templates/packager/customTargets.xml index d25f35c5..1a62baf5 100644 --- a/org.eclipse.pde.build/templates/packager/customTargets.xml +++ b/org.eclipse.pde.build/templates/packager/customTargets.xml @@ -13,9 +13,9 @@ <property name="archiveNamePrefix" value="${buildId}"/> </target> - <target name="assemble.win32.win32.x86.xml" depends="init"> + <target name="assemble.win32.win32.x86_64.xml" depends="init"> <ant antfile="${assembleScriptName}" > - <property name="archiveName" value="${archiveNamePrefix}-win32.win32.win32.zip"/> + <property name="archiveName" value="${archiveNamePrefix}-win32.win32.x86_64.zip"/> </ant> </target> |