Update build scripts

# Conflicts:
#	scripts/Build-NWJS.ps1


Former-commit-id: a015d626c29a79a6d0fc3b0690c617ef5c8ddabc [formerly bf31d9708702a709ffc3151d401d3e61855ce5c2] [formerly a81f7c492a2c0ceb1a8cd2f5aaee151a88915783] [formerly db857c3ac31874b9dbb379e6732d3a7081e9773b [formerly 6af903ce51a28167279050a344ffc0211af534b7 [formerly 8c27c6ba51043b574a17c6041d4917851d351083]]]
Former-commit-id: babe850ffee6d362d7df16c9f8c821491cbab85d [formerly 7d827efa6393e1452cfa0a6f5ffd1ed6cabdacbf [formerly 2d94d1677a35b76ad0e79c7a269cb8c8e5c4ac18]]
Former-commit-id: f8fdfefa9dfb3560357a2fe4ce948597f8a0dcbf [formerly e337f78e0cabca5dbfcd91043429ada135c1d9c2]
Former-commit-id: 505cfa12ed0d7925f96b6631c3c75f5451dce1dc
This commit is contained in:
Jaifroid 2021-07-28 23:29:22 +01:00
parent dba96379b8
commit 21cfeaabef
2 changed files with 624 additions and 622 deletions

View File

@ -10,7 +10,7 @@ if (-Not $only32bit) {
} }
$version10 = "0.54.0" # <<< value updated automatically from package.json if launched from Create-DraftRelease $version10 = "0.54.0" # <<< value updated automatically from package.json if launched from Create-DraftRelease
$versionXP = "0.14.7" $versionXP = "0.14.7"
$appBuild = "1.4.2N" # <<< value updated auotmatically from package.json if launched form Create-DraftRelease $appBuild = "1.6.0N" # <<< value updated auotmatically from package.json if launched form Create-DraftRelease
$ZIMbase = "wikipedia_en_100_maxi" $ZIMbase = "wikipedia_en_100_maxi"
foreach ($build in $builds) { foreach ($build in $builds) {
$version = $version10 $version = $version10

View File

@ -150,7 +150,8 @@ if ($updatewinget) {
return return
} }
"`nThe package URL is: $package_url" "`nThe package URL is: $package_url"
$package_id = 'Kiwix.' + ($text_tag -eq 'Windows' ? 'KiwixJS' : $text_tag) $package_id = 'Kiwix.' + $text_tag
if ($text_tag -eq 'Windows') { $package_id = 'Kiwix.' + 'KiwixJS' }
if (-Not $dryrun) { if (-Not $dryrun) {
"Submitting to winget-pkg repository..." "Submitting to winget-pkg repository..."
& wingetcreate.exe update -i $package_id -v "$numeric_tag.0" -u $package_url -s $true -t $github_token & wingetcreate.exe update -i $package_id -v "$numeric_tag.0" -u $package_url -s $true -t $github_token
@ -375,7 +376,8 @@ if ($dryrun -or $buildonly -or $release.assets_url -imatch '^https:') {
} }
} }
if (-Not $dryrun) { if (-Not $dryrun) {
$projstub = ($text_tag -eq "Windows") ? "" : $text_tag $projstub = $text_tag
if ($text_tag -eq "Windows") { $projstub = "" }
cmd.exe /c " `"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat`" && msbuild.exe KiwixWebApp$projstub.jsproj -p:Configuration=Release " cmd.exe /c " `"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat`" && msbuild.exe KiwixWebApp$projstub.jsproj -p:Configuration=Release "
# "SignTool sign /fd SHA256 /a /f ..\..\kiwix.pfx /p yeahright KiwixWebApp_1.3.3.0_AnyCPU.appxbundle" # "SignTool sign /fd SHA256 /a /f ..\..\kiwix.pfx /p yeahright KiwixWebApp_1.3.3.0_AnyCPU.appxbundle"
} }