diff --git a/build_image.py b/build_image.py index 1e51b3c3..56ab71c9 100755 --- a/build_image.py +++ b/build_image.py @@ -311,12 +311,12 @@ def distOsx(): '--file-associations packaging_files/mac/file_types_mac.prop ' + '--icon packaging_files/mac/PolyGlot.icns ' + '--license-file LICENSE.TXT ' + - '--app-version "' + POLYGLOT_BUILD + '"') + '--app-version "' + POLYGLOT_VERSION + '"') os.system(command) if copyDestination != "": - copyInstaller('PolyGlot-' + POLYGLOT_BUILD + '.dmg') + copyInstaller('PolyGlot-' + POLYGLOT_VERSION + '.dmg') ###################################### @@ -501,6 +501,7 @@ def copyInstaller(source): # only remove failure signal once process is successful os.remove(failFile) + os.remove(source) else: print('Built installer missing: ' + source) diff --git a/full_build.sh b/full_build.sh index a7e24d13..0fc058bb 100755 --- a/full_build.sh +++ b/full_build.sh @@ -18,6 +18,7 @@ fi if [ "$#" -eq 0 ] || [ "$1" == "win" ]; then WIN_START_TIME=$(date +%s) echo "Starting Windows build process..." +###### For whatever reason, jpackage will simply not function correctly unless the PC is booted up in advance # VBoxManage startvm "WinDev2001Eval" --type gui # echo "Waiting 25 seconds for target machine to start up..." # sleep 5 diff --git a/pom.xml b/pom.xml index 4878993b..00eb57bd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,8 @@ 3.1 UTF-8 - 12 - 12 + 14 + 14