AtHeartEngineer/DistMaker
1
0
Fork 0
mirror of https://github.com/JHUAPL/DistMaker.git synced 2026-01-09 14:37:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added support for hdiutil (alternative to genisoimage)

Browse Source 
Added support to properly override various JVM args.
This commit is contained in:
Norberto Lopez
2016-06-13 23:04:43 +00:00
parent 6ee04cd0f2
commit a2b926fa1b
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
script/appleUtils.py
View File

@@ -3,6 +3,7 @@
import copy import copy
import math import math
import os import os
import platform
import shutil import shutil
import subprocess import subprocess
import tempfile import tempfile
@@ -59,7 +60,11 @@ def buildRelease(args, buildPath):
# Create the DMG image via genisoimage # Create the DMG image via genisoimage
dmgFile = os.path.join(buildPath, aDistName + '.dmg') dmgFile = os.path.join(buildPath, aDistName + '.dmg')
# cmd = ['genisoimage', '-o', dmgFile, '-quiet', '-V', appName, '-max-iso9660-filenames', '-hfs-unlock', '-uid', '501', '-gid', '80', '-r', '-D', '-apple', tmpPath] # cmd = ['genisoimage', '-o', dmgFile, '-quiet', '-V', appName, '-max-iso9660-filenames', '-hfs-unlock', '-uid', '501', '-gid', '80', '-r', '-D', '-apple', tmpPath]
cmd = ['genisoimage', '-o', dmgFile, '-quiet', '-V', appName, '-max-iso9660-filenames', '-hfs-unlock', '-D', '-r', '-apple', tmpPath] if platform.system() == 'Darwin':
# cmd = ['hdiutil', 'create', '-fs', 'HFS+' '-o', dmgFile, '-quiet', '-volname', appName, '-srcfolder', tmpPath]
cmd = ['hdiutil', 'makehybrid', '-hfs', '-o', dmgFile, '-default-volume-name', appName, tmpPath]
else:
cmd = ['genisoimage', '-o', dmgFile, '-quiet', '-V', appName, '-max-iso9660-filenames', '-hfs-unlock', '-D', '-r', '-apple', tmpPath]
print('\tForming DMG image. File: ' + dmgFile) print('\tForming DMG image. File: ' + dmgFile)
proc = miscUtils.executeAndLog(cmd, "\t\tgenisoimage: ") proc = miscUtils.executeAndLog(cmd, "\t\tgenisoimage: ")
if proc.returncode != 0: if proc.returncode != 0:
@@ -398,18 +403,23 @@ def buildPListInfoStatic(destFile, args, jreTarGzFile):
writeln(f, 2, '<string>' + str(val) + '</string>') writeln(f, 2, '<string>' + str(val) + '</string>')
# JVM options # JVM options
jvmArgs = list(args.jvmArgs)
if any(aStr.startswith("-Dapple.laf.useScreenMenuBar") == False for aStr in jvmArgs) == True:
jvmArgs.append('-Dapple.laf.useScreenMenuBar=true')
if any(aStr.startswith("-Dcom.apple.macos.useScreenMenuBar") == False for aStr in jvmArgs) == True:
jvmArgs.append('-Dcom.apple.macos.useScreenMenuBar=true')
if any(aStr.startswith("-Dcom.apple.macos.use-file-dialog-packages") == False for aStr in jvmArgs) == True:
jvmArgs.append('-Dcom.apple.macos.use-file-dialog-packages=true')
jvmArgs.append('-Dcom.apple.mrj.application.apple.menu.about.name=' + args.name)
jvmArgs.append('-Dapple.awt.application.name=' + args.name)
jvmArgs.append('-Djava.system.class.loader=appLauncher.RootClassLoader')
# if icnsStr != None:
# jvmArgs.append('-Xdock:icon=Contents/Resources/' + icnsStr)
writeln(f, 2, '<key>JVMOptions</key>') writeln(f, 2, '<key>JVMOptions</key>')
writeln(f, 2, '<array>') writeln(f, 2, '<array>')
for aStr in args.jvmArgs: for aStr in jvmArgs:
writeln(f, 3, '<string>' + aStr + '</string>') writeln(f, 3, '<string>' + aStr + '</string>')
# if icnsStr != None:
# writeln(f, 3, '<string>-Xdock:icon=Contents/Resources/' + icnsStr + '</string>')
writeln(f, 3, '<string>-Dapple.laf.useScreenMenuBar=true</string>')
writeln(f, 3, '<string>-Dcom.apple.macos.useScreenMenuBar=true</string>')
writeln(f, 3, '<string>-Dcom.apple.macos.use-file-dialog-packages=true</string>')
writeln(f, 3, '<string>-Dcom.apple.mrj.application.apple.menu.about.name=' + args.name + '</string>')
writeln(f, 3, '<string>-Dapple.awt.application.name=' + args.name + '</string>')
writeln(f, 3, '<string>-Djava.system.class.loader=appLauncher.RootClassLoader</string>')
writeln(f, 2, '</array>') writeln(f, 2, '</array>')
# # App arguments # # App arguments