Skip to content
This repository was archived by the owner on Mar 29, 2019. It is now read-only.

Commit ad5874a

Browse files
committed
Accept command line parameter to override predefined variables
1 parent bd81716 commit ad5874a

File tree

2 files changed

+43
-8
lines changed

2 files changed

+43
-8
lines changed

powershell/create-mrnzip.ps1

+22-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,38 @@
1-
. ".\versions.ps1"
1+
Param(
2+
[Parameter(mandatory=$false)][String]$mariadbVersion = $null,
3+
[Parameter(mandatory=$false)][String]$mroongaVersion = $null,
4+
[Parameter(mandatory=$false)][String]$platform = $null
5+
)
26

37
[Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem")
48

9+
. ".\versions.ps1"
10+
11+
if (!$mariadbVersion) {
12+
$mariadbVersion = $mariadbVer
13+
}
14+
if (!$mroongaVersion) {
15+
$mroongaVersion = $mroongaVer
16+
}
17+
if ($platform) {
18+
$platforms = $platform -split ","
19+
} else {
20+
$platforms = "win32", "winx64"
21+
}
22+
523
function New-ZipItem([string]$destFile, [string]$srcDir)
624
{
725
$compressionLevel = [System.IO.Compression.CompressionLevel]::Optimal
826
$includeBaseDir = $false
927
[System.IO.Compression.ZipFile]::CreateFromDirectory($srcDir, $destFile, $compressionLevel, $includeBaseDir)
1028
}
1129

12-
$platform = "win32", "winx64"
1330
cd $workDir
1431

15-
foreach ($arch in $platform)
32+
foreach ($arch in $platforms)
1633
{
17-
$destFile = "$workDir\mariadb-$mariadbVer-with-mroonga-$mroongaVer-$arch.zip"
18-
$srcDir = "$workDir\mariadb-$mariadbVer-$arch"
34+
$destFile = "$workDir\mariadb-$mariadbVersion-with-mroonga-$mroongaVersion-$arch.zip"
35+
$srcDir = "$workDir\mariadb-$mariadbVersion-$arch"
1936

2037
if (Test-Path $destFile)
2138
{

powershell/install-mroonga.ps1

+21-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,27 @@
11
# @$mariadbVer MariaDBVer
22
# @$arch win32/winx64
33
# @$installSqlDir specify install.sql dir
4+
5+
Param(
6+
[Parameter(mandatory=$false)][String]$mariadbVersion = $null,
7+
[Parameter(mandatory=$false)][String]$mroongaVersion = $null,
8+
[Parameter(mandatory=$false)][String]$platform = $null
9+
)
10+
411
. ".\versions.ps1"
512

13+
if (!$mariadbVersion) {
14+
$mariadbVersion = $mariadbVer
15+
}
16+
if (!$mroongaVersion) {
17+
$mroongaVersion = $mroongaVer
18+
}
19+
if ($platform) {
20+
$platforms = $platform -split ","
21+
} else {
22+
$platforms = "win32", "winx64"
23+
}
24+
625
cd $workDir
726

827
function Wait-UntilRunning($cmdName) {
@@ -34,10 +53,9 @@ function Install-Mroonga($mariadbVer, $arch, $installSqlDir) {
3453

3554
$installSqlDir = ".\share\mroonga"
3655

37-
$platform = "win32", "winx64"
38-
foreach ($arch in $platform)
56+
foreach ($arch in $platforms)
3957
{
40-
Install-Mroonga $mariadbVer $arch $installSqlDir
58+
Install-Mroonga $mariadbVersion $arch $installSqlDir
4159
Start-Sleep -m 500
4260
}
4361

0 commit comments

Comments
 (0)