Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor modifications to make.py, and made Inno Setyp 64 bit

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-10-17 15:05:58 +02:00
parent db2eb98c27
commit 614572ca80
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
make.py
+29 -18
View File
@@ -254,24 +254,29 @@ if __name__ == "__main__":
buildWindowed = True buildWindowed = True
oneFile = False oneFile = False
makeSetup = False makeSetup = False
doFreeze = False
if "help" in sys.argv: helpMsg = (
print( "\n"
"\n" "novelWriter Make Tool\n"
"novelWriter Make Tool\n" "=====================\n"
"=====================\n" "This tool provides build commands for distibuting novelWriter as a\n"
"This tool provides build commands for distibuting novelWriter as\n" "package. The available options are as follows:\n"
"a package. The available options are as follows:\n" "\n"
"\n" "freeze Freeze the package and produces a folder of all\n"
"onefile Build a standalone executable with all dependencies\n" " dependecies using pyinstaller.\n"
" bundled. This does not produce a setup.exe on Windows.\n" "onefile Build a standalone executable with all dependencies\n"
"pip Run pip to install all package dependencies for\n" " bundled. Implies 'freeze', cannot be used with 'setup'.\n"
" novelWriter and this build tool.\n" "pip Run pip to install all package dependencies for\n"
"setup Build a setup.exe installer for Windows. This option\n" " novelWriter and this build tool.\n"
" automaticall disables the 'onefile' option.\n" "setup Build a setup.exe installer for Windows. This option\n"
"clean This will attempt to delete the 'build' and 'dist'\n" " automaticall disables the 'onefile' option.\n"
" folders in the current folder.\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) sys.exit(0)
if not os.path.isfile(os.path.join(os.getcwd(), "novelWriter.py")): if not os.path.isfile(os.path.join(os.getcwd(), "novelWriter.py")):
@@ -291,8 +296,13 @@ if __name__ == "__main__":
sys.argv.remove("pip") sys.argv.remove("pip")
installPackages() installPackages()
if "freeze" in sys.argv:
sys.argv.remove("freeze")
doFreeze = True
if "onefile" in sys.argv: if "onefile" in sys.argv:
sys.argv.remove("onefile") sys.argv.remove("onefile")
doFreeze = True
oneFile = True oneFile = True
if "setup" in sys.argv: if "setup" in sys.argv:
@@ -304,7 +314,8 @@ if __name__ == "__main__":
print("Error: Argument 'setup' for Inno Setup is Windows only.") print("Error: Argument 'setup' for Inno Setup is Windows only.")
sys.exit(1) sys.exit(1)
freezePackage(buildWindowed, oneFile, makeSetup, hostOS) if doFreeze:
freezePackage(buildWindowed, oneFile, makeSetup, hostOS)
if makeSetup: if makeSetup:
innoSetup() innoSetup()
setup/win_setup.iss
+2 -1
View File
@@ -27,10 +27,11 @@ UsedUserAreasWarning=no
;PrivilegesRequired=lowest ;PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=dialog PrivilegesRequiredOverridesAllowed=dialog
OutputDir={#nwAppDir} OutputDir={#nwAppDir}
OutputBaseFilename=novelwriter_{#nwAppVersion}_win10_full_setup OutputBaseFilename=novelwriter_{#nwAppVersion}_win_amd64_setup
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
WizardStyle=modern WizardStyle=modern
ArchitecturesInstallIn64BitMode=x64
[Languages] [Languages]
Name: "english"; MessagesFile: "compiler:Default.isl" Name: "english"; MessagesFile: "compiler:Default.isl"