Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorMarkus Knauer2014-09-17 15:22:56 +0000
committerMarkus Knauer2014-09-17 15:22:56 +0000
commit518269795d1adf0164eb2e1cb7bb9672f211bd6e (patch)
tree21617b6d538785396223841a36591af771a99c2e /releng
parent167295a867841872b49e08fd0f2ab913f061d621 (diff)
downloadorg.eclipse.epp.packages-518269795d1adf0164eb2e1cb7bb9672f211bd6e.tar.gz
org.eclipse.epp.packages-518269795d1adf0164eb2e1cb7bb9672f211bd6e.tar.xz
org.eclipse.epp.packages-518269795d1adf0164eb2e1cb7bb9672f211bd6e.zip
Remove Mac OSX 32-bit configurations from build (Maven, scripts)
Bug 444376: Remove Mac OSX 32 bit configuration from EPP package build https://bugs.eclipse.org/bugs/show_bug.cgi?id=444376 Change-Id: I2e21764612b085a63cebeed97d4c1275ec53ccf1 Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.epp.config/parent/pom.xml5
-rwxr-xr-xreleng/org.eclipse.epp.config/startEPPMars.sh10
-rwxr-xr-xreleng/org.eclipse.epp.config/tools/createArchives.sh10
-rwxr-xr-xreleng/org.eclipse.epp.config/tools/releaseRename.sh4
4 files changed, 11 insertions, 18 deletions
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 04dd3298..9a5fc24e 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -119,11 +119,6 @@
<environment>
<os>macosx</os>
<ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
diff --git a/releng/org.eclipse.epp.config/startEPPMars.sh b/releng/org.eclipse.epp.config/startEPPMars.sh
index 4185d7a2..49860c83 100755
--- a/releng/org.eclipse.epp.config/startEPPMars.sh
+++ b/releng/org.eclipse.epp.config/startEPPMars.sh
@@ -62,10 +62,10 @@ METADATAREPOSITORIES="${REPO_STAGING_URL},${REPO_EPP_WORKINGCOPY_URL}"
ARTIFACTREPOSITORIES="${REPO_STAGING_URL},${REPO_EPP_WORKINGCOPY_URL}"
# definition of OS, WS, ARCH, FORMAT combinations - DO NOT FORGET to adjust the for loop
-OSes=( win32 win32 linux linux macosx macosx )
-WSes=( win32 win32 gtk gtk cocoa cocoa )
-ARCHes=( x86 x86_64 x86 x86_64 x86 x86_64 )
-FORMAT=( zip zip tar.gz tar.gz tar.gz tar.gz )
+OSes=( win32 win32 linux linux macosx )
+WSes=( win32 win32 gtk gtk cocoa )
+ARCHes=( x86 x86_64 x86 x86_64 x86_64 )
+FORMAT=( zip zip tar.gz tar.gz tar.gz )
###############################################################################
@@ -132,7 +132,7 @@ do
# Start statusfile
echo "<td>" >>${STATUSFILE}
- for index in 0 1 2 3 4 5;
+ for index in 0 1 2 3 4;
do
echo -n "...EPP building ${PACKAGE} ${OSes[$index]} ${WSes[$index]} ${ARCHes[$index]} "
EXTENSION="${OSes[$index]}.${WSes[$index]}.${ARCHes[$index]}"
diff --git a/releng/org.eclipse.epp.config/tools/createArchives.sh b/releng/org.eclipse.epp.config/tools/createArchives.sh
index 03bc57a3..70a05ac6 100755
--- a/releng/org.eclipse.epp.config/tools/createArchives.sh
+++ b/releng/org.eclipse.epp.config/tools/createArchives.sh
@@ -22,12 +22,12 @@ fi
echo "Using packages from source directory ${SOURCE_DIR}"
# definition of OS, WS, ARCH, FORMAT combinations - DO NOT FORGET to adjust the for loop
-OSes=( win32 win32 linux linux macosx macosx )
-WSes=( win32 win32 gtk gtk cocoa cocoa )
-ARCHes=( x86 x86_64 x86 x86_64 x86 x86_64 )
-FORMAT=( zip zip tar.gz tar.gz tar.gz tar.gz )
+OSes=( win32 win32 linux linux macosx )
+WSes=( win32 win32 gtk gtk cocoa )
+ARCHes=( x86 x86_64 x86 x86_64 x86_64 )
+FORMAT=( zip zip tar.gz tar.gz tar.gz )
-for index in 0 1 2 3 4 5;
+for index in 0 1 2 3 4;
do
EXTENSION="${OSes[$index]}.${WSes[$index]}.${ARCHes[$index]}"
echo -n "Building archive ${BASENAME} for ${EXTENSION} : "
diff --git a/releng/org.eclipse.epp.config/tools/releaseRename.sh b/releng/org.eclipse.epp.config/tools/releaseRename.sh
index a86be1fc..01585a2b 100755
--- a/releng/org.eclipse.epp.config/tools/releaseRename.sh
+++ b/releng/org.eclipse.epp.config/tools/releaseRename.sh
@@ -59,9 +59,7 @@ for II in *eclipse*; do
sed 's/linux\.gtk\.x86\./linux\-gtk\./' | \
sed 's/win32\.win32\.x86\./win32\./' | \
sed 's/win32\.win32\.x86\_64\./win32\-x86\_64\./' | \
- sed 's/macosx\.cocoa\.x86\_64/macosx\-cocoa-x86\_64/' | \
- sed 's/macosx\.cocoa\.x86/macosx\-cocoa/' | \
- sed 's/macosx\.carbon\.ppc/macosx\-carbon/'`
+ sed 's/macosx\.cocoa\.x86\_64/macosx\-cocoa-x86\_64/'`
echo .. Copying ${II} to ${TARGETDIR}/${NEWNAME}
rsync -av ${II} ${TARGETDIR}/${NEWNAME}
if [ $? = "0" ]; then

Back to the top