From 1bf242603ceeee4a667da69a0f1bc41773cf3842 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 17 Nov 2016 15:07:49 +0300 Subject: Rename conan.ps1 and python.ps1 file in configuration dirs too Order of files really matters in configuration directories, but I renamed only main implementations in previous commit. Fixed that. Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460 Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-windows-10-x86/02-python.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/03-conan.ps1 | 9 +++++++++ coin/provisioning/qtci-windows-10-x86/conan.ps1 | 9 --------- coin/provisioning/qtci-windows-10-x86/python.ps1 | 1 - 4 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/02-python.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/03-conan.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/conan.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/python.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86') diff --git a/coin/provisioning/qtci-windows-10-x86/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86/02-python.ps1 new file mode 100644 index 00000000..0e401c02 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/02-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\02-python.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 new file mode 100644 index 00000000..4ba6c70c --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 @@ -0,0 +1,9 @@ +. "$PSScriptRoot\..\common\03-conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2015-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 ` + -CompilerRuntime MD diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 deleted file mode 100644 index 4ba6c70c..00000000 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -. "$PSScriptRoot\..\common\03-conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 14 ` - -CompilerRuntime MD diff --git a/coin/provisioning/qtci-windows-10-x86/python.ps1 b/coin/provisioning/qtci-windows-10-x86/python.ps1 deleted file mode 100644 index 0e401c02..00000000 --- a/coin/provisioning/qtci-windows-10-x86/python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\02-python.ps1" -- cgit v1.2.3