Skip to content

Commit

Permalink
Updates build and moves fully to J14.
Browse files Browse the repository at this point in the history
  • Loading branch information
Draque Thompson committed Mar 18, 2020
1 parent 20b64c8 commit 99d778b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions build_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')


######################################
Expand Down Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions full_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<version>3.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>12</maven.compiler.source>
<maven.compiler.target>12</maven.compiler.target>
<maven.compiler.source>14</maven.compiler.source>
<maven.compiler.target>14</maven.compiler.target>
</properties>
<dependencies>
<dependency>
Expand Down

0 comments on commit 99d778b

Please sign in to comment.