[mapguide-commits] r8402 - in trunk/Tools/Vagrant/centos: x64 x86

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-10-14 06:08:53 -0700 (Tue, 14 Oct 2014)
New Revision: 8402

Modified:
   trunk/Tools/Vagrant/centos/x64/Vagrantfile
   trunk/Tools/Vagrant/centos/x86/Vagrantfile
Log:
#2487: Fix affected file names to use the new .xz extension

Modified: trunk/Tools/Vagrant/centos/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/centos/x64/Vagrantfile	2014-10-14 13:03:03 UTC (rev 8401)
+++ trunk/Tools/Vagrant/centos/x64/Vagrantfile	2014-10-14 13:08:53 UTC (rev 8402)
@@ -311,10 +311,10 @@
 if [ $MAKE_FDO_SDK -eq 1 ]; then
     echo [provision]: Copy FDO SDK for Ubuntu builds
     # Copy SDK also to sources, so Ubuntu can pick it up
-    sudo rm -f /mapguide_sources/fdosdk*.tar.gz
-    sudo cp fdosdk-centos6-amd64-${FDO_VER_FULL}_${FDO_REV}.tar.gz /mapguide_sources
+    sudo rm -f /mapguide_sources/fdosdk*.tar.xz
+    sudo cp fdosdk-centos6-amd64-${FDO_VER_FULL}_${FDO_REV}.tar.xz /mapguide_sources
     # Record file name so Ubuntu knows what tarball to extract from
-    sudo echo fdosdk-centos6-amd64-${FDO_VER_FULL}_${FDO_REV}.tar.gz > /mapguide_sources/fdosdk_filename
+    sudo echo fdosdk-centos6-amd64-${FDO_VER_FULL}_${FDO_REV}.tar.xz > /mapguide_sources/fdosdk_filename
     sudo echo ${FDO_REV} > /mapguide_sources/fdosdk_rev
     # Export filelist to Ubuntu can deb package this SDK if needed
     sudo cp -R $SCRIPT_ROOT/fdo_build_area/install/filelist /mapguide_sources

Modified: trunk/Tools/Vagrant/centos/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/centos/x86/Vagrantfile	2014-10-14 13:03:03 UTC (rev 8401)
+++ trunk/Tools/Vagrant/centos/x86/Vagrantfile	2014-10-14 13:08:53 UTC (rev 8402)
@@ -309,14 +309,14 @@
 sudo mv -f ~/*.log /vagrant/build
 echo [provision]: Copy tarballs to output dir
 sudo cp bin/*.tar.xz /vagrant/build
-sudo cp fdosdk-centos6-i386-${FDO_VER_FULL}_${FDO_REV}.tar.gz /vagrant/build
+sudo cp fdosdk-centos6-i386-${FDO_VER_FULL}_${FDO_REV}.tar.xz /vagrant/build
 if [ $MAKE_FDO_SDK -eq 1 ]; then
     echo [provision]: Copy FDO SDK for Ubuntu builds
     # Copy SDK also to sources, so Ubuntu can pick it up
-    sudo rm -f /mapguide_sources/fdosdk*.tar.gz
-    sudo cp fdosdk-centos6-i386-${FDO_VER_FULL}_${FDO_REV}.tar.gz /mapguide_sources
+    sudo rm -f /mapguide_sources/fdosdk*.tar.xz
+    sudo cp fdosdk-centos6-i386-${FDO_VER_FULL}_${FDO_REV}.tar.zx /mapguide_sources
     # Record file name so Ubuntu knows what tarball to extract from
-    sudo echo fdosdk-centos6-i386-${FDO_VER_FULL}_${FDO_REV}.tar.gz > /mapguide_sources/fdosdk_filename
+    sudo echo fdosdk-centos6-i386-${FDO_VER_FULL}_${FDO_REV}.tar.xz > /mapguide_sources/fdosdk_filename
     sudo echo ${FDO_REV} > /mapguide_sources/fdosdk_rev
     # Export filelist to Ubuntu can deb package this SDK if needed
     sudo cp -R $SCRIPT_ROOT/fdo_build_area/install/filelist /mapguide_sources