From 614572ca80e70a6602979c646465b91b64b7a2ea Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 17 Oct 2020 15:05:58 +0200
Subject: [PATCH] Minor modifications to make.py, and made Inno Setyp 64 bit

---
 make.py             | 47 ++++++++++++++++++++++++++++-----------------
 setup/win_setup.iss |  3 ++-
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/make.py b/make.py
index 6162a313..7a0923b9 100755
--- a/make.py
+++ b/make.py
@@ -254,24 +254,29 @@ if __name__ == "__main__":
     buildWindowed = True
     oneFile = False
     makeSetup = False
+    doFreeze = False
 
-    if "help" in sys.argv:
-        print(
-            "\n"
-            "novelWriter Make Tool\n"
-            "=====================\n"
-            "This tool provides build commands for distibuting novelWriter as\n"
-            "a package. The available options are as follows:\n"
-            "\n"
-            "onefile  Build a standalone executable with all dependencies\n"
-            "         bundled. This does not produce a setup.exe on Windows.\n"
-            "pip      Run pip to install all package dependencies for\n"
-            "         novelWriter and this build tool.\n"
-            "setup    Build a setup.exe installer for Windows. This option\n"
-            "         automaticall disables the 'onefile' option.\n"
-            "clean    This will attempt to delete the 'build' and 'dist'\n"
-            "         folders in the current folder.\n"
-        )
+    helpMsg = (
+        "\n"
+        "novelWriter Make Tool\n"
+        "=====================\n"
+        "This tool provides build commands for distibuting novelWriter as a\n"
+        "package. The available options are as follows:\n"
+        "\n"
+        "freeze   Freeze the package and produces a folder of all\n"
+        "         dependecies using pyinstaller.\n"
+        "onefile  Build a standalone executable with all dependencies\n"
+        "         bundled. Implies 'freeze', cannot be used with 'setup'.\n"
+        "pip      Run pip to install all package dependencies for\n"
+        "         novelWriter and this build tool.\n"
+        "setup    Build a setup.exe installer for Windows. This option\n"
+        "         automaticall disables the 'onefile' option.\n"
+        "clean    This will attempt to delete the 'build' and 'dist'\n"
+        "         folders in the current folder.\n"
+    )
+
+    if "help" in sys.argv or len(sys.argv) <= 1:
+        print(helpMsg)
         sys.exit(0)
 
     if not os.path.isfile(os.path.join(os.getcwd(), "novelWriter.py")):
@@ -291,8 +296,13 @@ if __name__ == "__main__":
         sys.argv.remove("pip")
         installPackages()
 
+    if "freeze" in sys.argv:
+        sys.argv.remove("freeze")
+        doFreeze = True
+
     if "onefile" in sys.argv:
         sys.argv.remove("onefile")
+        doFreeze = True
         oneFile = True
 
     if "setup" in sys.argv:
@@ -304,7 +314,8 @@ if __name__ == "__main__":
             print("Error: Argument 'setup' for Inno Setup is Windows only.")
             sys.exit(1)
 
-    freezePackage(buildWindowed, oneFile, makeSetup, hostOS)
+    if doFreeze:
+        freezePackage(buildWindowed, oneFile, makeSetup, hostOS)
 
     if makeSetup:
         innoSetup()
diff --git a/setup/win_setup.iss b/setup/win_setup.iss
index 83f016b6..8b6be609 100644
--- a/setup/win_setup.iss
+++ b/setup/win_setup.iss
@@ -27,10 +27,11 @@ UsedUserAreasWarning=no
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
 OutputDir={#nwAppDir}
-OutputBaseFilename=novelwriter_{#nwAppVersion}_win10_full_setup
+OutputBaseFilename=novelwriter_{#nwAppVersion}_win_amd64_setup
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
+ArchitecturesInstallIn64BitMode=x64
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"