Merge branch 'main' into testing

This commit is contained in:
Veronica K. B. Olsen
2021-03-28 15:23:02 +02:00
11 changed files with 127 additions and 45 deletions
+16 -2
View File
@@ -291,7 +291,8 @@ def makeMinimalPackage(targetOS):
else:
targName = ""
outFile = os.path.join("dist", f"novelWriter-{__version__}-minimal{targName}.zip")
zipFile = f"novelWriter-{__version__}-minimal{targName}.zip"
outFile = os.path.join("dist", zipFile)
if os.path.isfile(outFile):
os.unlink(outFile)
@@ -332,7 +333,17 @@ def makeMinimalPackage(targetOS):
zipObj.write(aFile)
print("")
print("Built file: %s" % outFile)
print("Created File: %s" % outFile)
try:
shaFile = open(outFile+".sha256", mode="w")
subprocess.call(["sha256sum", zipFile], stdout=shaFile, cwd="dist")
shaFile.close()
print("SHA256 Sum: %s" % (outFile+".sha256"))
except Exception as e:
print("Could not generate sha256 file")
print(str(e))
print("")
return
@@ -710,6 +721,9 @@ def winInstall():
targetPy = os.path.join(targetDir, "novelWriter.pyw")
targetIcon = os.path.join(targetDir, "nw", "assets", "icons", "novelwriter.ico")
if not os.path.isfile(targetPy):
shutil.copy2(os.path.join(targetDir, "novelWriter.py"), targetPy)
print("Collecting Info ...")
print("Desktop Folder: %s" % desktopDir)
print("Start Menu Folder: %s" % startMenuDir)