[mapguide-commits] r9163 - in trunk/Tools/Vagrant: . centos6/x64 centos6/x86 ubuntu12/x64 ubuntu12/x86 ubuntu14/x64 ubuntu14/x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Apr 21 04:45:45 PDT 2017
Author: jng
Date: 2017-04-21 04:45:44 -0700 (Fri, 21 Apr 2017)
New Revision: 9163
Modified:
trunk/Tools/Vagrant/centos6/x64/Vagrantfile
trunk/Tools/Vagrant/centos6/x86/Vagrantfile
trunk/Tools/Vagrant/clean.bat
trunk/Tools/Vagrant/ubuntu12/x64/Vagrantfile
trunk/Tools/Vagrant/ubuntu12/x86/Vagrantfile
trunk/Tools/Vagrant/ubuntu14/x64/Vagrantfile
trunk/Tools/Vagrant/ubuntu14/x86/Vagrantfile
Log:
Update clean.bat and Vagrantfiles in light of stupidity introduced in vagrant that demands the script file being referenced by the shell provisioner configuration physically exist, even if I just want to destroy the associated running VM!
Modified: trunk/Tools/Vagrant/centos6/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/centos6/x64/Vagrantfile 2017-04-21 00:01:32 UTC (rev 9162)
+++ trunk/Tools/Vagrant/centos6/x64/Vagrantfile 2017-04-21 11:45:44 UTC (rev 9163)
@@ -116,8 +116,13 @@
#
# chef.validation_client_name = "ORGNAME-validator"
+ # UPDATE 21/04/2017: Vagrant (as of 1.9.1, could be earlier release) does something stupid now
+ # and demands the script path below exists, even if I want to just destroy the VM!!!
+ #
+ # The path has changed to a relative reference that will *always* be there
+
config.vm.provision "shell",
privileged: false,
- path: "provision_centos.sh",
+ path: "../../scripts/provision_centos.sh",
args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "amd64", "Test", "centos6", 1, 1]
end
Modified: trunk/Tools/Vagrant/centos6/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/centos6/x86/Vagrantfile 2017-04-21 00:01:32 UTC (rev 9162)
+++ trunk/Tools/Vagrant/centos6/x86/Vagrantfile 2017-04-21 11:45:44 UTC (rev 9163)
@@ -116,8 +116,13 @@
#
# chef.validation_client_name = "ORGNAME-validator"
+ # UPDATE 21/04/2017: Vagrant (as of 1.9.1, could be earlier release) does something stupid now
+ # and demands the script path below exists, even if I want to just destroy the VM!!!
+ #
+ # The path has changed to a relative reference that will *always* be there
+
config.vm.provision "shell",
privileged: false,
- path: "provision_centos.sh",
+ path: "../../provision_centos.sh",
args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "i386", "Test", "centos6", 1, 1]
end
Modified: trunk/Tools/Vagrant/clean.bat
===================================================================
--- trunk/Tools/Vagrant/clean.bat 2017-04-21 00:01:32 UTC (rev 9162)
+++ trunk/Tools/Vagrant/clean.bat 2017-04-21 11:45:44 UTC (rev 9163)
@@ -6,50 +6,70 @@
if exist filelist rd /S /Q filelist
if exist fdosdk_filename del /F fdosdk_filename
if exist fdosdk_rev del /F fdosdk_rev
-del /F fdosdk*.tar.gz
+if exist fdosdk*.tar.gz del /F fdosdk*.tar.gz
popd
-pushd centos\src_update
+pushd centos6\src_update
call vagrant destroy -f
popd
-pushd ubuntu\x86
-SET COMPONENT=Ubuntu Build 32-bit
-echo [clean]: MapGuide Ubuntu build 32-bit
+pushd ubuntu12\x86
+SET COMPONENT=Ubuntu 12 Build 32-bit
+echo [clean]: %COMPONENT%
+call vagrant destroy -f
if exist build rd /S /Q build
if exist filelist rd /S /Q filelist
if exist *.sh del *.sh
if exist *.pl del *.pl
if exist *.txt del *.txt
+popd
+pushd ubuntu14\x86
+SET COMPONENT=Ubuntu 14 Build 32-bit
+echo [clean]: %COMPONENT%
call vagrant destroy -f
+if exist build rd /S /Q build
+if exist filelist rd /S /Q filelist
+if exist *.sh del *.sh
+if exist *.pl del *.pl
+if exist *.txt del *.txt
popd
-pushd centos\x86
-SET COMPONENT=CentOS Build 32-bit
-echo [clean]: MapGuide CentOS build 32-bit
+pushd centos6\x86
+SET COMPONENT=CentOS 6 Build 32-bit
+echo [clean]: %COMPONENT%
+call vagrant destroy -f
if exist build rd /S /Q build
if exist filelist rd /S /Q filelist
if exist *.sh del *.sh
if exist *.pl del *.pl
if exist *.txt del *.txt
+popd
+pushd ubuntu12\x64
+SET COMPONENT=Ubuntu 12 Build 64-bit
+echo [clean]: %COMPONENT%
call vagrant destroy -f
+if exist build rd /S /Q build
+if exist filelist rd /S /Q filelist
+if exist *.sh del *.sh
+if exist *.pl del *.pl
+if exist *.txt del *.txt
popd
-pushd ubuntu\x64
-SET COMPONENT=Ubuntu Build 64-bit
-echo [clean]: MapGuide Ubuntu build 64-bit
+pushd ubuntu14\x64
+SET COMPONENT=Ubuntu 14 Build 64-bit
+echo [clean]: %COMPONENT%
+call vagrant destroy -f
if exist build rd /S /Q build
if exist filelist rd /S /Q filelist
if exist *.sh del *.sh
if exist *.pl del *.pl
if exist *.txt del *.txt
+popd
+pushd centos6\x64
+SET COMPONENT=CentOS 6 Build 64-bit
+echo [clean]: %COMPONENT%
call vagrant destroy -f
-popd
-pushd centos\x64
-SET COMPONENT=CentOS Build 64-bit
-echo [clean]: MapGuide CentOS build 64-bit
if exist build rd /S /Q build
if exist filelist rd /S /Q filelist
if exist *.sh del *.sh
if exist *.pl del *.pl
if exist *.txt del *.txt
-call vagrant destroy -f
popd
goto quit
:error
Modified: trunk/Tools/Vagrant/ubuntu12/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu12/x64/Vagrantfile 2017-04-21 00:01:32 UTC (rev 9162)
+++ trunk/Tools/Vagrant/ubuntu12/x64/Vagrantfile 2017-04-21 11:45:44 UTC (rev 9163)
@@ -116,8 +116,13 @@
#
# chef.validation_client_name = "ORGNAME-validator"
+ # UPDATE 21/04/2017: Vagrant (as of 1.9.1, could be earlier release) does something stupid now
+ # and demands the script path below exists, even if I want to just destroy the VM!!!
+ #
+ # The path has changed to a relative reference that will *always* be there
+
config.vm.provision "shell",
privileged: false,
- path: "provision_ubuntu.sh",
+ path: "../../scripts/provision_ubuntu.sh",
args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "amd64", "Test", "ubuntu12", 1, 1]
end
Modified: trunk/Tools/Vagrant/ubuntu12/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu12/x86/Vagrantfile 2017-04-21 00:01:32 UTC (rev 9162)
+++ trunk/Tools/Vagrant/ubuntu12/x86/Vagrantfile 2017-04-21 11:45:44 UTC (rev 9163)
@@ -116,8 +116,13 @@
#
# chef.validation_client_name = "ORGNAME-validator"
+ # UPDATE 21/04/2017: Vagrant (as of 1.9.1, could be earlier release) does something stupid now
+ # and demands the script path below exists, even if I want to just destroy the VM!!!
+ #
+ # The path has changed to a relative reference that will *always* be there
+
config.vm.provision "shell",
privileged: false,
- path: "provision_ubuntu.sh",
+ path: "../../scripts/provision_ubuntu.sh",
args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "i386", "Test", "ubuntu12", 1, 1]
end
Modified: trunk/Tools/Vagrant/ubuntu14/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu14/x64/Vagrantfile 2017-04-21 00:01:32 UTC (rev 9162)
+++ trunk/Tools/Vagrant/ubuntu14/x64/Vagrantfile 2017-04-21 11:45:44 UTC (rev 9163)
@@ -116,8 +116,13 @@
#
# chef.validation_client_name = "ORGNAME-validator"
+ # UPDATE 21/04/2017: Vagrant (as of 1.9.1, could be earlier release) does something stupid now
+ # and demands the script path below exists, even if I want to just destroy the VM!!!
+ #
+ # The path has changed to a relative reference that will *always* be there
+
config.vm.provision "shell",
privileged: false,
- path: "provision_ubuntu.sh",
+ path: "../../scripts/provision_ubuntu.sh",
args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "amd64", "Test", "ubuntu14", 1, 1]
end
Modified: trunk/Tools/Vagrant/ubuntu14/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu14/x86/Vagrantfile 2017-04-21 00:01:32 UTC (rev 9162)
+++ trunk/Tools/Vagrant/ubuntu14/x86/Vagrantfile 2017-04-21 11:45:44 UTC (rev 9163)
@@ -116,8 +116,13 @@
#
# chef.validation_client_name = "ORGNAME-validator"
+ # UPDATE 21/04/2017: Vagrant (as of 1.9.1, could be earlier release) does something stupid now
+ # and demands the script path below exists, even if I want to just destroy the VM!!!
+ #
+ # The path has changed to a relative reference that will *always* be there
+
config.vm.provision "shell",
privileged: false,
- path: "provision_ubuntu.sh",
+ path: "../../scripts/provision_ubuntu.sh",
args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "i386", "Test", "ubuntu14", 1, 1]
end
More information about the mapguide-commits
mailing list