Bug 442770 - Produce a source tarball for use by distro integrators

Generate tar.xz file instead of bz2 now that there is new assembly
plugin providing support for it.

Change-Id: Ic92cc821445739cbeb4ac7f2c13b2938b517aff6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

5 files changed, 11 insertions, 12 deletions

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 4d6f22060..5fb84a017 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -541,7 +541,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
diff --git a/eclipse-platform-sources/sources.xml b/eclipse-platform-sources/sources.xml
index 11ce8035d..cc3385492 100644
--- a/eclipse-platform-sources/sources.xml
+++ b/eclipse-platform-sources/sources.xml
@@ -14,8 +14,7 @@
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>sources</id>
   <formats>
-    <!-- TODO: For better compression, use tar.xz when maven-assembly-plugin 3.1.0 is released. -->
-    <format>tar.bz2</format>
+    <format>tar.xz</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <fileSets>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
index a58c4a86e..9bb1f96c7 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
@@ -97,15 +97,15 @@ do
   sha512sum -b ${gzipfile} | tee checksum/${gzipfile}.sha512 >>${allCheckSumsSHA512}
 done
 
-#array of tar.bz2 files
-bzipfiles=`ls *.bz2`
+#array of tar.xz files
+xzfiles=`ls *.tar.xz`
 
-for bzipfile in ${bzipfiles}
+for xzfile in ${xzfiles}
 do
-  echo [sha256] ${bzipfile}
-  sha256sum -b ${bzipfile} | tee checksum/${bzipfile}.sha256 >>${allCheckSumsSHA256}
-  echo [sha512] ${bzipfile}
-  sha512sum -b ${bzipfile} | tee checksum/${bzipfile}.sha512 >>${allCheckSumsSHA512}
+  echo [sha256] ${xzfile}
+  sha256sum -b ${xzfile} | tee checksum/${xzfile}.sha256 >>${allCheckSumsSHA256}
+  echo [sha512] ${xzfile}
+  sha512sum -b ${xzfile} | tee checksum/${xzfile}.sha512 >>${allCheckSumsSHA512}
 done
 
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
index 8407ebd4b..544a0bd3d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
@@ -33,7 +33,7 @@
       <platform
         id="SST"
         name="Source Tarball"
-        fileName="eclipse-platform-sources-${BUILD_ID}.tar.bz2"></platform>
+        fileName="eclipse-platform-sources-${BUILD_ID}.tar.xz"></platform>
 
       <!--
         <platform id="SAA2" name='Source Build (Source in .zip) (&lt;a href="srcIncludedBuildInstructions.html">instructions&lt;/a>)'
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 52c8bdd5e..3f86e8fd0 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -740,7 +740,7 @@ fn-gather-sdk ()
   if [[ -d "$TARBALL_DIR" ]]
   then
     pushd "$TARBALL_DIR"
-    cp eclipse-platform-sources-${BUILD_ID}.tar.bz2 "$BUILD_DIR"/eclipse-platform-sources-${BUILD_ID}.tar.bz2
+    cp eclipse-platform-sources-${BUILD_ID}.tar.xz "$BUILD_DIR"/eclipse-platform-sources-${BUILD_ID}.tar.xz
     popd
   else
     echo "   ERROR: $TARBALL_DIR did not exist in fn-gather-sdks"