Merge pull request #9 from kenhys/override-variables

Accept command line parameter to override predefined variables

Author: cosmo0920

powershell/create-mrnzip.ps1

@@ -1,21 +1,36 @@
-. ".\versions.ps1"
+Param(
+  [Parameter(mandatory=$false)][String]$mariadbVersion = $null,
+  [Parameter(mandatory=$false)][String]$mroongaVersion = $null,
+  [Parameter(mandatory=$false)][String[]]$platforms = $null
+)
 
 [Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem")
 
+. ".\versions.ps1"
+
+if (!$mariadbVersion) {
+  $mariadbVersion = $mariadbVer
+}
+if (!$mroongaVersion) {
+  $mroongaVersion = $mroongaVer
+}
+if (!$platforms) {
+  $platforms = "win32", "winx64"
+}
+
 function New-ZipItem([string]$destFile, [string]$srcDir)
 {
   $compressionLevel = [System.IO.Compression.CompressionLevel]::Optimal
   $includeBaseDir = $false
   [System.IO.Compression.ZipFile]::CreateFromDirectory($srcDir, $destFile, $compressionLevel, $includeBaseDir)
 }
 
-$platform = "win32", "winx64"
 cd $workDir
 
-foreach ($arch in $platform)
+foreach ($arch in $platforms)
 {
-  $destFile = "$workDir\mariadb-$mariadbVer-with-mroonga-$mroongaVer-$arch.zip"
-  $srcDir = "$workDir\mariadb-$mariadbVer-$arch"
+  $destFile = "$workDir\mariadb-$mariadbVersion-with-mroonga-$mroongaVersion-$arch.zip"
+  $srcDir = "$workDir\mariadb-$mariadbVersion-$arch"
 
   if (Test-Path $destFile)
   {

powershell/install-mroonga.ps1

@@ -1,8 +1,25 @@
 # @$mariadbVer MariaDBVer
 # @$arch win32/winx64
 # @$installSqlDir specify install.sql dir
+
+Param(
+  [Parameter(mandatory=$false)][String]$mariadbVersion = $null,
+  [Parameter(mandatory=$false)][String]$mroongaVersion = $null,
+  [Parameter(mandatory=$false)][String[]]$platforms = $null
+)
+
 . ".\versions.ps1"
 
+if (!$mariadbVersion) {
+  $mariadbVersion = $mariadbVer
+}
+if (!$mroongaVersion) {
+  $mroongaVersion = $mroongaVer
+}
+if (!$platforms) {
+  $platforms = "win32", "winx64"
+}
+
 cd $workDir
 
 function Wait-UntilRunning($cmdName) {
@@ -34,10 +51,9 @@ function Install-Mroonga($mariadbVer, $arch, $installSqlDir) {
 
 $installSqlDir = ".\share\mroonga"
 
-$platform = "win32", "winx64"
-foreach ($arch in $platform)
+foreach ($arch in $platforms)
 {
-  Install-Mroonga $mariadbVer $arch $installSqlDir
+  Install-Mroonga $mariadbVersion $arch $installSqlDir
   Start-Sleep -m 500
 }