From 8e6f38afe8248904be2cf92d1521aebac4090589 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Tue, 5 Mar 2019 16:17:23 +0000
Subject: [PATCH] Restructured installer directory

---
 installers/create-appx.js    |  2 +-
 installers/create-deb-arm.js |  2 +-
 installers/create-deb-x64.js |  2 +-
 installers/create-dmg.js     |  2 +-
 installers/create-exe.js     |  2 +-
 installers/make.ps1          | 16 ++++++++++++++--
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/installers/create-appx.js b/installers/create-appx.js
index bfa50e20..4a11e39f 100644
--- a/installers/create-appx.js
+++ b/installers/create-appx.js
@@ -5,7 +5,7 @@ const package = require('../package.json');
 convertToWindowsStore({
    containerVirtualization: false,
    inputDirectory: path.join(__dirname, '../release-builds/openflexure-ev-win32-x64'),
-   outputDirectory: path.join(__dirname, '../release-builds/installers', package.version),
+   outputDirectory: path.join(__dirname, '../release-builds/dist', package.version),
    assets: path.join(__dirname, '/appx/assets'),
    identityName: '60425J.T.Collins.OpenFlexureeV',
    packageExecutable: 'app/openflexure-ev.exe',
diff --git a/installers/create-deb-arm.js b/installers/create-deb-arm.js
index 24fef018..4afa3fb8 100644
--- a/installers/create-deb-arm.js
+++ b/installers/create-deb-arm.js
@@ -4,7 +4,7 @@ const package = require('../package.json');
 
 const options = {
   src: path.join(__dirname, '../release-builds/openflexure-ev-linux-armv7l/'),
-  dest: path.join(__dirname, '../release-builds/installers', package.version),
+  dest: path.join(__dirname, '../release-builds/dist', package.version),
   arch: 'armhf',
   icon: path.join(__dirname, '../icons/png/1024x1024.png'),
   categories: [
diff --git a/installers/create-deb-x64.js b/installers/create-deb-x64.js
index 2ebc69c7..d1549e89 100644
--- a/installers/create-deb-x64.js
+++ b/installers/create-deb-x64.js
@@ -4,7 +4,7 @@ const package = require('../package.json');
 
 const options = {
   src: path.join(__dirname, '../release-builds/openflexure-ev-linux-x64/'),
-  dest: path.join(__dirname, '../release-builds/installers', package.version),
+  dest: path.join(__dirname, '../release-builds/dist', package.version),
   arch: 'amd64',
   icon: path.join(__dirname, '../icons/png/1024x1024.png'),
   categories: [
diff --git a/installers/create-dmg.js b/installers/create-dmg.js
index 88eb70e9..b42d1dd5 100644
--- a/installers/create-dmg.js
+++ b/installers/create-dmg.js
@@ -6,7 +6,7 @@ var opts = {
   appPath: path.join(__dirname, '../release-builds/openflexure-ev-darwin-x64/openflexure-ev.app'),
   name: package.productName,
   icon: path.join(__dirname, '../icons/mac/icon.icns'),
-  out: path.join(__dirname, '../release-builds/installers', package.version)
+  out: path.join(__dirname, '../release-builds/dist', package.version)
 }
 
 createDMG(opts, function done (err) {
diff --git a/installers/create-exe.js b/installers/create-exe.js
index f883e564..9cd85a04 100644
--- a/installers/create-exe.js
+++ b/installers/create-exe.js
@@ -17,7 +17,7 @@ function getInstallerConfig () {
     appDirectory: path.join(__dirname, '../release-builds/openflexure-ev-win32-x64'),
     authors: 'OpenFlexure',
     noMsi: true,
-    outputDirectory: path.join(__dirname, '../release-builds/installers', package.version),
+    outputDirectory: path.join(__dirname, '../release-builds/dist', package.version),
     exe: 'openflexure-ev.exe',
     setupIcon: path.join(__dirname, '../icons/win/icon.ico'),
     certificateFile: "C:\\Certs\\BATH-OPEN-INSTRUMENTATION-GROUP.pfx"
diff --git a/installers/make.ps1 b/installers/make.ps1
index cba4127d..1b9cf729 100644
--- a/installers/make.ps1
+++ b/installers/make.ps1
@@ -1,8 +1,20 @@
+echo "Setting up..."
 $here = $PSScriptRoot
+$root = "$here/.."
+
+$package = Get-Content "$root/package.json" | Out-String | ConvertFrom-Json
+$version = $package.version
+$name = $package.name
+
+$wslhere = (wsl wslpath -a ("$here" -Replace '\\','\\'))
+$wslroot = (wsl wslpath -a ("$root" -Replace '\\','\\'))
+
+mkdir "$root/release-builds/dist/$version/"
+
+echo "Gzipping PWA..."
+wsl tar -czvf "$wslroot/release-builds/dist/$version/${name}_${version}_pwa.tar.gz" -C "$wslroot/dist" .
 
 echo "Building deb packages..."
-$wslhere = (wsl wslpath -a ("$here" -Replace '\\','\\'))
-
 wsl node "$wslhere/create-deb-x64.js"
 wsl node "$wslhere/create-deb-arm.js"