Add new release line for testing

scripts/prepare_axolotl_build.js

@@ -0,0 +1,77 @@
+// Copyright 2021 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+const fs = require('fs');
+const _ = require('lodash');
+
+const packageJson = require('../package.json');
+const { isAxolotl } = require('../ts/util/version');
+
+const { version } = packageJson;
+
+// You might be wondering why this file is necessary. It comes down to our desire to allow
+//   side-by-side installation of production and alpha builds. Electron-Builder uses
+//   top-level data from package.json for many things, like the executable name, the
+//   debian package name, the install directory under /opt on linux, etc. We tried
+//   adding the ${channel} macro to these values, but Electron-Builder didn't like that.
+
+if (!isAxolotl(version)) {
+  console.error(`Version '${version}' is not an backup version!`);
+  process.exit(1);
+}
+
+console.log('prepare_backup_build: updating package.json');
+
+// -------
+
+const NAME_PATH = 'name';
+const PRODUCTION_NAME = 'signal-desktop';
+const AXOLOTL_NAME = 'signal-desktop-axolotl';
+
+const PRODUCT_NAME_PATH = 'productName';
+const PRODUCTION_PRODUCT_NAME = 'Signal';
+const AXOLOTL_PRODUCT_NAME = 'Signal Axolotl';
+
+const APP_ID_PATH = 'build.appId';
+const PRODUCTION_APP_ID = 'org.whispersystems.signal-desktop';
+const AXOLOTL_APP_ID = 'org.whispersystems.signal-desktop-axolotl';
+
+const STARTUP_WM_CLASS_PATH = 'build.linux.desktop.StartupWMClass';
+const PRODUCTION_STARTUP_WM_CLASS = 'Signal';
+const AXOLOTL_STARTUP_WM_CLASS = 'Signal Axolotl';
+
+const DESKTOP_NAME_PATH = 'desktopName';
+
+// Note: we're avoiding dashes in our .desktop name due to xdg-settings behavior
+//   https://github.com/signalapp/Signal-Desktop/issues/3602
+const PRODUCTION_DESKTOP_NAME = 'signal.desktop';
+const AXOLOTL_DESKTOP_NAME = 'signalaxolotl.desktop';
+
+// -------
+
+function checkValue(object, objectPath, expected) {
+  const actual = _.get(object, objectPath);
+  if (actual !== expected) {
+    throw new Error(`${objectPath} was ${actual}; expected ${expected}`);
+  }
+}
+
+// ------
+
+checkValue(packageJson, NAME_PATH, PRODUCTION_NAME);
+checkValue(packageJson, PRODUCT_NAME_PATH, PRODUCTION_PRODUCT_NAME);
+checkValue(packageJson, APP_ID_PATH, PRODUCTION_APP_ID);
+checkValue(packageJson, STARTUP_WM_CLASS_PATH, PRODUCTION_STARTUP_WM_CLASS);
+checkValue(packageJson, DESKTOP_NAME_PATH, PRODUCTION_DESKTOP_NAME);
+
+// -------
+
+_.set(packageJson, NAME_PATH, AXOLOTL_NAME);
+_.set(packageJson, PRODUCT_NAME_PATH, AXOLOTL_PRODUCT_NAME);
+_.set(packageJson, APP_ID_PATH, AXOLOTL_APP_ID);
+_.set(packageJson, STARTUP_WM_CLASS_PATH, AXOLOTL_STARTUP_WM_CLASS);
+_.set(packageJson, DESKTOP_NAME_PATH, AXOLOTL_DESKTOP_NAME);
+
+// -------
+
+fs.writeFileSync('./package.json', JSON.stringify(packageJson, null, '  '));

scripts/prepare_tagged_version.js

@@ -6,7 +6,13 @@ const { execSync } = require('child_process');
 
 const _ = require('lodash');
 
-const { generateAlphaVersion } = require('../ts/util/version');
+const release = process.argv[2];
+if (release !== 'alpha' && release !== 'axolotl') {
+  console.error(`Invalid release line: ${release}`);
+  process.exit(1);
+}
+
+const { generateTaggedVersion } = require('../ts/util/version');
 
 const packageJson = require('../package.json');
 
@@ -16,15 +22,15 @@ const shortSha = execSync('git rev-parse --short HEAD')
   .toString('utf8')
   .replace(/[\n\r]/g, '');
 
-const alphaVersion = generateAlphaVersion({ currentVersion, shortSha });
+const newVersion = generateTaggedVersion({ release, currentVersion, shortSha });
 
 console.log(
-  `prepare_alpha_version: updating package.json.\n  Previous: ${currentVersion}\n  New:      ${alphaVersion}`
+  `prepare_tagged_version: updating package.json.\n  Previous: ${currentVersion}\n  New:      ${newVersion}`
 );
 
 // -------
 
-_.set(packageJson, 'version', alphaVersion);
+_.set(packageJson, 'version', newVersion);
 
 // -------