diff --git a/.gitignore b/.gitignore index b39f7ac..e995e72 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ out dist server .vscode -.env \ No newline at end of file +.env +*.exe +*.xml.backup \ No newline at end of file diff --git a/installer_assets/PreMiD.xml b/installer_assets/PreMiD.xml new file mode 100644 index 0000000..2e998e8 --- /dev/null +++ b/installer_assets/PreMiD.xml @@ -0,0 +1,136 @@ + + PreMiD + PreMiD + 2.0 + ${product_fullname}-${product_version}-installer.${platform_exec_suffix} + 0 + appIcon.png + + + default + Default Component + 1 + 1 + 1 + + + Program Files + ${installdir} + programfiles + all + + + update.ini + + + + + Program Files + ${installdir} + programfileslinux + linux + + + Program Files + ${installdir} + programfileswindows + windows + + + ../dist/PreMiD-win32-x64 + + + appIcon.ico + + + updater.exe + + + + + Program Files + ${installdir} + programfilesosx + osx + + + + + + ${product_fullname} + 0 + 0 + ${installdir}/${product_fullname}-win32-x64/PreMID.exe + + + ${installdir}/ + + + + + + + 0 + ${product_fullname} + ${installdir}/${product_fullname}-win32-x64/PreMID.exe + Killing ${product_fullname} + 0 + + + + + + + ${installdir}/update.ini + [Update] +url = ${update_xml_url} +version_id = ${application_version_id} +update_download_location = ${system_temp_directory} +check_for_updates = 1 + + + + + 0 + PreMID.exe + & + Launching PreMiD + 0 + 0 + ${installdir}/${product_fullname}-win32-x64/ + + + + + 0 + ${product_fullname} + ${installdir}/${product_fullname}-win32-x64/PreMID.exe + Killing ${product_fullname} + 0 + + + unattended + 0 + 1 + ../dist/installer + ${installdir}/appIcon.ico + 1 + minimal + Timeraa + appIcon.ico + + + installdir + Installer.Parameter.installdir.description + Installer.Parameter.installdir.explanation + + ${platform_install_prefix}/${product_shortname} + 0 + prefix + 1 + 0 + 40 + + + + diff --git a/installer_assets/builder.js b/installer_assets/builder.js new file mode 100644 index 0000000..504e8db --- /dev/null +++ b/installer_assets/builder.js @@ -0,0 +1,16 @@ +var { execFile } = require('child_process'), + os = require('os').platform(); + +if (os == 'win32') os = 'windows'; + +execFile('C:\\Program Files (x86)\\BitRock InstallBuilder Enterprise 19.4.1\\autoupdate\\bin\\customize.exe', [ + 'build', + './updater.xml', + os +]); + +execFile('C:\\Program Files (x86)\\BitRock InstallBuilder Enterprise 19.4.1\\bin\\builder-cli.exe', [ + 'quickbuild', + './PreMiD.xml', + os +]); diff --git a/installer_assets/installer.js b/installer_assets/installer.js deleted file mode 100644 index 26f9be6..0000000 --- a/installer_assets/installer.js +++ /dev/null @@ -1,45 +0,0 @@ -var os = require('os'); -var os = os.platform(); - -var path = require('path'); -var chalk = require('chalk'); - -if (os == 'darwin') { - console.log(chalk.yellow('Creating installer for Mac OS...')); - var createDMG = require('electron-installer-dmg'); - - createDMG( - { - appPath: '../dist/PreMiD-darwin-x64/PreMiD.app', - name: 'PreMiD', - background: './dmg-background.png', - icon: './appIcon.icns', - contents: [ - { x: 500, y: 250, type: 'link', path: '/Applications' }, - { x: 175, y: 250, type: 'file', path: path.join(__dirname, '../dist/PreMiD-darwin-x64/PreMiD.app') } - ], - out: '../dist/installer/', - overwrite: true - }, - function done(err) { - if (err) console.error(err); - else console.log(chalk.green('Created installer for Mac OS!')); - } - ); -} else if (os == 'win32') { - console.log(chalk.yellow('Creating installer for Windows...')); - var electronInstaller = require('electron-winstaller'); - - resultPromise = electronInstaller.createWindowsInstaller({ - appDirectory: './dist/PreMiD-win32-x64', - outputDirectory: './dist/installer/', - exe: './PreMiD.exe', - iconUrl: 'https://raw.githubusercontent.com/Timeraa/PreMiD/master/installer_assets/appIcon.ico', - noMsi: true - }); - - resultPromise.then( - () => console.log(chalk.green('Created installer for Windows!')), - (e) => console.log(`No dice: ${e.message}`) - ); -} diff --git a/installer_assets/AutoUpdater.xml b/installer_assets/updater.xml similarity index 63% rename from installer_assets/AutoUpdater.xml rename to installer_assets/updater.xml index d3dfb1a..458b11c 100644 --- a/installer_assets/AutoUpdater.xml +++ b/installer_assets/updater.xml @@ -5,4 +5,7 @@ 2.0 1 asInvoker + 1 + ./ + updater.${platform_exec_suffix} \ No newline at end of file diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 8b555fd..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -update.ini -updater.exe -updater.app \ No newline at end of file