Merge pull request #8 from jcfr/add-gitignore-and-tweak-scripts

Add gitignore and tweak scripts
martinrotter · Oct 11, 2018 · b400d94 · b400d94
2 parents d09783b + dc80013
commit b400d94
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,7 @@
+# Qt source archives
+qt*.zip
+# Qt Build directories
+qtbuild/
+qtbuild-x86/
+# Qt source and install directories
+qt-*/
diff --git a/msvc-build510-static.ps1 b/msvc-build510-static.ps1
@@ -5,7 +5,7 @@
 $version = "5.10"
 
 $qt_sources_url = "https://download.qt.io/official_releases/qt/" + $version + "/" + $version + ".0/single/qt-everywhere-src-" + $version + ".0.zip"
-$qt_archive_file = $pwd.Path + "\qt.zip"
+$qt_archive_file = $pwd.Path + "\qt-" + $version + ".zip"
 $qt_src_base_folder = $pwd.Path + "\qt-everywhere-src-" + $version + ".0"
 
 $tools_folder = $pwd.Path + "\tools\"
@@ -44,4 +44,4 @@ cp "$openssl_libs_folder\*eay32MT.lib" "$prefix_folder\lib\"
 gci -r -include "*.prl" $prefix_folder | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "C:\\\\openssl\\\\lib64\\\\", '$$$$[QT_INSTALL_LIBS]\\' } | set-content $a }
 
 # Create final archive.
-& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
+& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
diff --git a/msvc-build5101-static.ps1 b/msvc-build5101-static.ps1
@@ -6,7 +6,7 @@ $version_base = "5.10"
 $version = "5.10.1"
 
 $qt_sources_url = "https://download.qt.io/official_releases/qt/" + $version_base + "/" + $version + "/single/qt-everywhere-src-" + $version + ".zip"
-$qt_archive_file = $pwd.Path + "\qt.zip"
+$qt_archive_file = $pwd.Path + "\qt-" + $version + ".zip"
 $qt_src_base_folder = $pwd.Path + "\qt-everywhere-src-" + $version
 
 $tools_folder = $pwd.Path + "\tools\"
@@ -44,4 +44,4 @@ cp "$openssl_libs_folder\*eay32MT.lib" "$prefix_folder\lib\"
 gci -r -include "*.prl" $prefix_folder | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "C:\\\\openssl\\\\lib64", '$$$$[QT_INSTALL_LIBS]\\' } | set-content $a }
 
 # Create final archive.
-& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
+& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
diff --git a/msvc-build5101.ps1 b/msvc-build5101.ps1
@@ -6,7 +6,7 @@ $version_base = "5.10"
 $version = "5.10.1"
 
 $qt_sources_url = "https://download.qt.io/official_releases/qt/" + $version_base + "/" + $version + "/single/qt-everywhere-src-" + $version + ".zip"
-$qt_archive_file = $pwd.Path + "\qt.zip"
+$qt_archive_file = $pwd.Path + "\qt-" + $version + ".zip"
 $qt_src_base_folder = $pwd.Path + "\qt-everywhere-src-" + $version
 
 $tools_folder = $pwd.Path + "\tools\"
@@ -45,4 +45,4 @@ cp "$openssl_bin_folder\*eay32MD.dll" "$prefix_folder\bin\"
 gci -r -include "*.prl" $prefix_folder | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "C:\\\\openssl\\\\lib64", '$$$$[QT_INSTALL_LIBS]\\' } | set-content $a }
 
 # Create final archive.
-& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
+& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
diff --git a/msvc-build511-static.ps1 b/msvc-build511-static.ps1
@@ -6,7 +6,7 @@ $version_base = "5.11"
 $version = "5.11.0"
 
 $qt_sources_url = "https://download.qt.io/official_releases/qt/" + $version_base + "/" + $version + "/single/qt-everywhere-src-" + $version + ".zip"
-$qt_archive_file = $pwd.Path + "\qt.zip"
+$qt_archive_file = $pwd.Path + "\qt-" + $version + ".zip"
 $qt_src_base_folder = $pwd.Path + "\qt-everywhere-src-" + $version
 
 $tools_folder = $pwd.Path + "\tools\"
@@ -44,4 +44,4 @@ cp "$openssl_libs_folder\*eay32MT.lib" "$prefix_folder\lib\"
 gci -r -include "*.prl" $prefix_folder | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "C:\\\\openssl\\\\lib64", '$$$$[QT_INSTALL_LIBS]\\' } | set-content $a }
 
 # Create final archive.
-& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
+& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
diff --git a/msvc-build511.ps1 b/msvc-build511.ps1
@@ -6,7 +6,7 @@ $version_base = "5.11"
 $version = "5.11.0"
 
 $qt_sources_url = "https://download.qt.io/official_releases/qt/" + $version_base + "/" + $version + "/single/qt-everywhere-src-" + $version + ".zip"
-$qt_archive_file = $pwd.Path + "\qt.zip"
+$qt_archive_file = $pwd.Path + "\qt-" + $version + ".zip"
 $qt_src_base_folder = $pwd.Path + "\qt-everywhere-src-" + $version
 
 $tools_folder = $pwd.Path + "\tools\"
@@ -45,4 +45,4 @@ cp "$openssl_bin_folder\*eay32MD.dll" "$prefix_folder\bin\"
 gci -r -include "*.prl" $prefix_folder | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "C:\\\\openssl\\\\lib64", '$$$$[QT_INSTALL_LIBS]\\' } | set-content $a }
 
 # Create final archive.
-& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
+& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
diff --git a/msvc-build5112.ps1 b/msvc-build5112.ps1
@@ -6,7 +6,7 @@ $version_base = "5.11"
 $version = "5.11.2"
 
 $qt_sources_url = "https://download.qt.io/official_releases/qt/" + $version_base + "/" + $version + "/single/qt-everywhere-src-" + $version + ".zip"
-$qt_archive_file = $pwd.Path + "\qt.zip"
+$qt_archive_file = $pwd.Path + "\qt-" + $version + ".zip"
 $qt_src_base_folder = $pwd.Path + "\qt-everywhere-src-" + $version
 
 $tools_folder = $pwd.Path + "\tools\"
@@ -48,4 +48,4 @@ cp "$openssl_bin_folder\*eay32MD.dll" "$prefix_folder\bin\"
 gci -r -include "*.prl" $prefix_folder | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "C:\\\\openssl\\\\lib64", '$$$$[QT_INSTALL_LIBS]\\' } | set-content $a }
 
 # Create final archive.
-& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
+& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
diff --git a/msvc-build594-static.ps1 b/msvc-build594-static.ps1
@@ -6,7 +6,7 @@ $version_base = "5.9"
 $version = "5.9.4"
 
 $qt_sources_url = "https://download.qt.io/official_releases/qt/" + $version_base + "/" + $version + "/single/qt-everywhere-opensource-src-" + $version + ".zip"
-$qt_archive_file = $pwd.Path + "\qt.zip"
+$qt_archive_file = $pwd.Path + "\qt-" + $version + ".zip"
 $qt_src_base_folder = $pwd.Path + "\qt-everywhere-opensource-src-" + $version
 
 $tools_folder = $pwd.Path + "\tools\"
@@ -44,4 +44,4 @@ cp "$openssl_libs_folder\*eay32MT.lib" "$prefix_folder\lib\"
 gci -r -include "*.prl" $prefix_folder | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "C:\\\\openssl\\\\lib64\\\\", '$$$$[QT_INSTALL_LIBS]\\' } | set-content $a }
 
 # Create final archive.
-& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
+& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
diff --git a/msvc-build594.ps1 b/msvc-build594.ps1
@@ -6,7 +6,7 @@ $version_base = "5.9"
 $version = "5.9.4"
 
 $qt_sources_url = "https://download.qt.io/official_releases/qt/" + $version_base + "/" + $version + "/single/qt-everywhere-opensource-src-" + $version + ".zip"
-$qt_archive_file = $pwd.Path + "\qt.zip"
+$qt_archive_file = $pwd.Path + "\qt-" + $version + ".zip"
 $qt_src_base_folder = $pwd.Path + "\qt-everywhere-opensource-src-" + $version
 
 $tools_folder = $pwd.Path + "\tools\"
@@ -42,4 +42,4 @@ cp "$tools_folder\qtbinpatcher.*" "$prefix_folder\bin\"
 cp "$openssl_bin_folder\*eay32MD.dll" "$prefix_folder\bin\"
 
 # Create final archive.
-& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9
+& "$tools_folder\7za.exe" a -t7z "$prefix_base_folder.7z" "$prefix_folder" -mmt -mx9