Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows 32bit installer #2422

Merged
merged 2 commits into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 38 additions & 26 deletions scripts/buildWindows.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,49 @@ async function afterPackageBuilt (packagePath) {
fs.mkdirSync('dist/app')
}

let archSuffix

if (packagePath.includes('ia32')) {
archSuffix = '-ia32'
} else if (packagePath.includes('arm64')) {
archSuffix = '-arm64'
} else {
archSuffix = ''
}

/* create zip files */
var output = fs.createWriteStream('dist/app/' + 'Min-v' + version + '-windows' + (packagePath.includes('ia32') ? '-ia32' : '') + '.zip')
var output = fs.createWriteStream('dist/app/' + 'Min-v' + version + '-windows' + archSuffix + '.zip')
var archive = archiver('zip', {
zlib: { level: 9 }
})
archive.directory(packagePath, 'Min-v' + version)
archive.pipe(output)
await archive.finalize()

/* create installer for 64-bit */
if (!packagePath.includes('ia32')) {
const installer = require('electron-installer-windows')

const options = {
src: packagePath,
dest: 'dist/app/min-installer-x64',
icon: 'icons/icon256.ico',
animation: 'icons/windows-installer.gif',
licenseUrl: 'https://github.com/minbrowser/min/blob/master/LICENSE.txt',
noMsi: true
}

console.log('Creating package (this may take a while)')

fs.copyFileSync('LICENSE.txt', packagePath + '/LICENSE')

await installer(options)
.then(function () {
fs.renameSync('./dist/app/min-installer-x64/min-' + version + '-setup.exe', './dist/app/min-' + version + '-setup.exe')
})
.catch(err => {
console.error(err, err.stack)
process.exit(1)
})
/* create installer */
const installer = require('electron-installer-windows')

const options = {
src: packagePath,
dest: 'dist/app/min-installer' + archSuffix,
icon: 'icons/icon256.ico',
animation: 'icons/windows-installer.gif',
licenseUrl: 'https://github.com/minbrowser/min/blob/master/LICENSE.txt',
noMsi: true
}

console.log('Creating package (this may take a while)')

fs.copyFileSync('LICENSE.txt', packagePath + '/LICENSE')

await installer(options)
.then(function () {
fs.renameSync('./dist/app/min-installer' + archSuffix + '/min-' + version + '-setup.exe', './dist/app/min-' + version + archSuffix + '-setup.exe')
})
.catch(err => {
console.error(err, err.stack)
process.exit(1)
})
}

// creating multiple packages simultaneously causes errors in electron-rebuild, so do one arch at a time instead
Expand All @@ -58,3 +66,7 @@ createPackage('win32', { arch: Arch.x64 })
return createPackage('win32', { arch: Arch.ia32 })
})
.then(afterPackageBuilt)
.then(function () {
return createPackage('win32', { arch: Arch.arm64 })
})
.then(afterPackageBuilt)
8 changes: 7 additions & 1 deletion scripts/createPackage.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ function toPath (platform, arch) {
switch (arch) {
case Arch.ia32:
return 'dist/app/win-ia32-unpacked'
default:
case Arch.arm64:
return 'dist/app/win-arm64-unpacked'
case Arch.x64:
return 'dist/app/win-unpacked'
default:
return null
}
} else if (platform == 'linux') {
switch (arch) {
Expand All @@ -30,6 +34,8 @@ function toPath (platform, arch) {
return 'dist/app/mac-arm64'
case Arch.x64:
return 'dist/app/mac'
default:
return null
}
}
}
Expand Down
Loading