Bug 567585 - [components, releng] Only zip file is copied in case of Linux RCP
- Script tries to copy either zip or tar.gz version in case of MacOS and Linux
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
Change-Id: I796e4d29b510203f200db2863f589981d8b5d0ea
diff --git a/components/org.eclipse.papyrus.components.parent/src/main/script/publish.sh b/components/org.eclipse.papyrus.components.parent/src/main/script/publish.sh
index 347f833..dc5fb43 100755
--- a/components/org.eclipse.papyrus.components.parent/src/main/script/publish.sh
+++ b/components/org.eclipse.papyrus.components.parent/src/main/script/publish.sh
@@ -294,10 +294,21 @@
# Prepare local rcp site (for rcp files)
mkdir -p rcp-site
- cp ${localRCPSiteRoot}-linux.gtk.x86_64.zip rcp-site/org.eclipse.papyrus.${component}.product-${releaseLabel}-${releaseLabelSuffix}-linux.gtk.x86_64.zip
- echo "Copied ${localRCPSiteRoot}-linux.gtk.x86_64.zip to local directory rcp-site."
- cp ${localRCPSiteRoot}-macosx.cocoa.x86_64.tar.gz rcp-site/org.eclipse.papyrus.${component}.product-${releaseLabel}-${releaseLabelSuffix}-macosx.cocoa.x86_64.tar.gz
- echo "Copied ${localRCPSiteRoot}-macosx.cocoa.x86_64.tar.gz to local directory rcp-site."
+ # copy either tar.gz or zip variant for Linux and MacOS (assume that we always use zip for win32)
+ if [ -e ${localRCPSiteRoot}-linux.gtk.x86_64.zip ]; then
+ cp ${localRCPSiteRoot}-linux.gtk.x86_64.zip rcp-site/org.eclipse.papyrus.${component}.product-${releaseLabel}-${releaseLabelSuffix}-linux.gtk.x86_64.zip
+ echo "Copied ${localRCPSiteRoot}-linux.gtk.x86_64.zip to local directory rcp-site."
+ else
+ cp ${localRCPSiteRoot}-linux.gtk.x86_64.tar.gz rcp-site/org.eclipse.papyrus.${component}.product-${releaseLabel}-${releaseLabelSuffix}-linux.gtk.x86_64.tar.gz
+ echo "Copied ${localRCPSiteRoot}-linux.gtk.x86_64.tar.gz to local directory rcp-site."
+ fi
+ if [ -e ${localRCPSiteRoot}-macosx.cocoa.x86_64.zip ]; then
+ cp ${localRCPSiteRoot}-macosx.cocoa.x86_64.zip rcp-site/org.eclipse.papyrus.${component}.product-${releaseLabel}-${releaseLabelSuffix}-macosx.cocoa.x86_64.zip
+ echo "Copied ${localRCPSiteRoot}-macosx.cocoa.x86_64.zip to local directory rcp-site."
+ else
+ cp ${localRCPSiteRoot}-macosx.cocoa.x86_64.tar.gz rcp-site/org.eclipse.papyrus.${component}.product-${releaseLabel}-${releaseLabelSuffix}-macosx.cocoa.x86_64.tar.gz
+ echo "Copied ${localRCPSiteRoot}-macosx.cocoa.x86_64.tar.gz to local directory rcp-site."
+ fi
cp ${localRCPSiteRoot}-win32.win32.x86_64.zip rcp-site/org.eclipse.papyrus.${component}.product-${releaseLabel}-${releaseLabelSuffix}-win32.win32.x86_64.zip
echo "Copied ${localRCPSiteRoot}-win32.win32.x86_64.zip to local directory rcp-site."
@@ -314,7 +325,7 @@
cd rcp-site
cp * ../${localRcpDir}/
- echo "Created org.eclipse.papyrus.${component}.product-${releaseLabel}-${releaseLabelSuffix}-linux.gtk.x86_64.zip in ../${localRcpDir}/"
+ echo "Created org.eclipse.papyrus.${component}.product-${releaseLabel}-${releaseLabelSuffix} files in ../${localRcpDir}/"
cd ..
# Cleanup local update site (for drop files generation)
@@ -446,4 +457,4 @@
# Clean up
echo "Cleaning up"
rm -fr eclipse
-rm -fr update-site
\ No newline at end of file
+rm -fr update-site
