Update scripts and landing page

# Conflicts:
#	package.json


Former-commit-id: 1699409fca6a5a19d65ef46bf4332e34623a3257 [formerly 906469f44d8162acb83386d1f4c874ca3a00a001 [formerly 51ba3e22bfb1e95a1d4e57eef0e39e60835ee8f1]]
Former-commit-id: 295b5f7c4fd363860bd9ab4e019beb0c85840a92
Former-commit-id: c0036954dcd67db60326b78478dbbc424792fbf0
This commit is contained in:
Jaifroid 2021-05-12 16:39:13 +01:00
parent f229060765
commit e29f0af2b6
3 changed files with 26 additions and 12 deletions

View File

@ -1,7 +1,7 @@
{
"name": "kiwix-js-windows",
"productName": "Kiwix JS Windows",
"version": "1.2.4E",
"version": "1.2.6E",
"description": "Kiwix JS Windows packaged for the Electron framework",
"main": "main.js",
"build": {
@ -23,7 +23,10 @@
"target": [
{
"target": "AppImage",
"arch": "ia32"
"arch": [
"x64",
"ia32"
]
}
]
},
@ -42,9 +45,10 @@
"scripts": {
"start": "electron .",
"dist": "electron-builder build",
"dist-linux": "electron-builder build --linux",
"package-mac": "electron-packager . kiwix-js-windows --overwrite --platform=darwin --arch=x64 --icon=assets/icons/mac/icon.icns --prune=true --out=release-builds",
"package-win": "electron-packager . kiwix-js-windows --electron-version='10.4.0' --ignore=archives --ignore=AppPackages --ignore=BundleArtifacts --ignore=images$ --ignore=bin$ --ignore=bld$ --ignore=KiwixWebApp.* --ignore=[pP]ackage.[aSl] --ignore=node_ --ignore=[.]git[hi][ug][bn] --ignore=[.]vs$ --ignore=vscode --overwrite --platform=win32 --arch=ia32 --icon=www/img/icons/kiwix-64.ico --prune=true --out=bld/electron --version-string.CompanyName=Kiwix --version-string.FileDescription='Kiwix JS ZIM File Reader' --version-string.ProductName='Kiwix JS Windows Electron Edition'",
"postpackage-win": "(robocopy archives bld\\Electron\\kiwix-js-windows-win32-ia32\\archives\\ > null) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0",
"postpackage-win": "(robocopy archives bld\\Electron\\kiwix-js-windows-win32-ia32\\resources\\app\\archives\\ > null) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0",
"package-linux": "electron-packager . kiwix-js-windows --overwrite --platform=linux --icon=www/img/icons/kiwix-64.png --electron-version='10.4.0' --ignore=archives --ignore=AppPackages --ignore=BundleArtifacts --ignore=images$ --ignore=bin$ --ignore=bld$ --ignore=KiwixWebApp.* --ignore=[pP]ackage.[aSl] --ignore=node_ --ignore=[.]git[hi][ug][bn] --ignore=[.]vs$ --ignore=vscode --overwrite --arch=x64 --prune=true --out=bld/electron --version-string.CompanyName=Kiwix --version-string.FileDescription='Kiwix JS ZIM File Reader' --version-string.ProductName='Kiwix JS WikiMed Electron Edition'",
"postpackage-linux": "(robocopy archives bld\\Electron\\kiwix-js-windows-linux-x64\\archives\\ > null) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0"
},

View File

@ -52,7 +52,7 @@ if ($base_tag -match '[EN]$') {
$title_flavour = 'NWJS'
$branch = 'nwjs-en-top'
}
$release_title = $release_title -replace '([^\s]+)\sUWP$', ("$title_flavour Edition for Win7/Win8/Win10 " + '$1')
$release_title = $release_title -replace '([^\s]+)\sUWP$', ("$title_flavour Edition (Window/Linux) " + '$1')
if ($flavour -eq '_N') { $release_title = $release_title -replace 'Edition\s(for\s)', '$1XP/Vista/' }
}
"Text tag: $text_tag"
@ -91,6 +91,15 @@ if (-Not $dryrun) {
# Check that we appear to have created a release
if ($dryrun -or $release.assets_url -imatch '^https:') {
"The draft release details were successfully created.`n"
"Updating release version in package.json"
$json_object = Get-Content -Raw "$PSScriptRoot/../package.json"
$json_object = $json_object -replace '("version": ")[^"]+', "`${1}$base_tag"
if ($dryrun) {
"[DRYRUN] would have written:`n"
$json_object
} else {
Set-Content "$PSScriptRoot/../package.json" $json_object
}
"Searching for assets..."
if ($flavour -eq '_E') {
$base_dir = "$PSScriptRoot/../bld/electron/"

View File

@ -120,28 +120,29 @@
• <a href="../../A/Coronavirus_party" title="Coronavirus party">Coronavirus party</a>
• <a href="../../A/COVID-19_pandemic_in_the_United_States" title="COVID-19 in USA">COVID-19 in USA</a>
• <a href="../../A/COVID-19_pandemic_in_Brazil" title="COVID-19 in Brazil">COVID-19 in Brazil</a>
• <a href="../../A/COVID-19_pandemic_in_Mexico" title="COVID-19 in México">COVID-19 in México</a>
• <a href="../../A/COVID-19_pandemic_in_Russia" title="COVID-19 in Russia">COVID-19 in Russia</a>
• <a href="../../A/COVID-19_pandemic_in_India" title="COVID-19 in India">COVID-19 in India</a>
• <a href="../../A/COVID-19_pandemic_in_the_United_Kingdom" title="COVID-19 in the UK">COVID-19 in the UK</a>
• <a href="../../A/COVID-19_pandemic_in_Mexico" title="COVID-19 in México">COVID-19 in México</a>
• <a href="../../A/COVID-19_pandemic_in_the_United_Kingdom" title="COVID-19 in the UK">COVID-19 in the UK</a>
• <a href="../../A/COVID-19_pandemic_in_Italy" title="COVID-19 in Italy">COVID-19 in Italy</a>
• <a href="../../A/COVID-19_pandemic_in_France" title="COVID-19 in France">COVID-19 in France</a>
• <a href="../../A/COVID-19_pandemic_in_Russia" title="COVID-19 in Russia">COVID-19 in Russia</a>
• <a href="../../A/COVID-19_pandemic_in_France" title="COVID-19 in France">COVID-19 in France</a>
• <a href="../../A/COVID-19_pandemic_in_Germany" title="COVID-19 in Germany">COVID-19 in Germany</a>
• <a href="../../A/COVID-19_pandemic_in_Spain" title="COVID-19 in Spain">COVID-19 in Spain</a>
• <a href="../../A/COVID-19_pandemic_in_Colombia" title="COVID-19 in Colombia">COVID-19 in Colombia</a>
• <a href="../../A/COVID-19_pandemic_in_Iran" title="COVID-19 in Iran">COVID-19 in Iran</a>
• <a href="../../A/COVID-19_pandemic_in_Argentina" title="COVID-19 in Argentina">COVID-19 in Argentina</a>
• <a href="../../A/COVID-19_pandemic_in_Poland" title="COVID-19 in Poland">COVID-19 in Poland</a>
• <a href="../../A/COVID-19_pandemic_in_Argentina" title="COVID-19 in Argentina">COVID-19 in Argentina</a>
• <a href="../../A/COVID-19_pandemic_in_Peru" title="COVID-19 in Perú">COVID-19 in Perú</a>
• <a href="../../A/COVID-19_pandemic_in_South_Africa" title="COVID-19 in South Africa">COVID-19 in South Africa</a>
• <a href="../../A/COVID-19_pandemic_in_Indonesia" title="COVID-19 in Indonesia">COVID-19 in Indonesia</a>
• <a href="../../A/COVID-19_pandemic_in_Ukraine" title="COVID-19 in Ukraine">COVID-19 in Ukraine</a>
• <a href="../../A/COVID-19_pandemic_in_Ukraine" title="COVID-19 in Ukraine">COVID-19 in Ukraine</a>
• <a href="../../A/COVID-19_pandemic_in_Indonesia" title="COVID-19 in Indonesia">COVID-19 in Indonesia</a>
• <a href="../../A/COVID-19_pandemic_in_Turkey" title="COVID-19 in Bangladesh">COVID-19 in Bangladesh</a>
• <a href="../../A/COVID-19_pandemic_in_the_Czech_Republic" title="COVID-19 in Czech Republic">COVID-19 in Czech Republic</a>
• <a href="../../A/COVID-19_pandemic_in_Romania" title="COVID-19 in Romania">COVID-19 in Romania</a>
• <a href="../../A/COVID-19_pandemic_in_Hungary" title="COVID-19 in Hungary">COVID-19 in Hungary</a>
• <a href="../../A/COVID-19_pandemic_in_Chile" title="COVID-19 in Chile">COVID-19 in Chile</a>
• <a href="../../A/COVID-19_pandemic_in_Belgium" title="COVID-19 in Belgium">COVID-19 in Belgium</a>
• <a href="../../A/COVID-19_pandemic_in_Canada" title="COVID-19 in Canada">COVID-19 in Canada</a>
• <a href="../../A/COVID-19_pandemic_in_Belgium" title="COVID-19 in Belgium">COVID-19 in Belgium</a>
• <a href="../../A/COVID-19_pandemic_in_mainland_China" title="COVID-19 in China">COVID-19 in China</a>
</td>
</tr>