diff --git a/script/appleUtils.py b/script/appleUtils.py
index 822badf..e1403d5 100644
--- a/script/appleUtils.py
+++ b/script/appleUtils.py
@@ -373,13 +373,6 @@ def buildPListInfoStatic(destFile, args, jreTarGzFile):
if args.icnsFile != None:
icnsStr = os.path.basename(args.icnsFile)
- classPathStr = '$JAVAROOT/appLauncher.jar'
-# classPathStr = ''
-# for aStr in args.classPath:
-# classPathStr += '$JAVAROOT/' + aStr + ':'
-# if len(classPathStr) > 0:
-# classPathStr = classPathStr[0:-1]
-
f = open(destFile, 'wb')
writeln(f, 0, '')
# writeln(f, 0, '')
@@ -400,11 +393,14 @@ def buildPListInfoStatic(destFile, args, jreTarGzFile):
tupList.append(('CFBundleVersion', args.version))
tupList.append(('NSHighResolutionCapable', 'true'))
tupList.append(('NSHumanReadableCopyright', ''))
+
jrePath = jreUtils.getBasePathForJreTarGzFile(jreTarGzFile)
tupList.append(('JVMRuntime', jrePath))
tupList.append(('JVMMainClassName', 'appLauncher.AppLauncher'))
+ cwdPath = os.path.join('/Applications', args.name + '.app', 'Contents', 'app')
+ tupList.append(('WorkingDirectory', cwdPath))
# Application configuration
for (key, val) in tupList:
@@ -413,11 +409,11 @@ def buildPListInfoStatic(destFile, args, jreTarGzFile):
# JVM options
jvmArgs = list(args.jvmArgs)
- if any(aStr.startswith("-Dapple.laf.useScreenMenuBar") == False for aStr in jvmArgs) == True:
+ 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:
+ 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:
+ 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)
@@ -431,23 +427,18 @@ def buildPListInfoStatic(destFile, args, jreTarGzFile):
writeln(f, 3, '' + aStr + '')
writeln(f, 2, '')
-# # App arguments
-# writeln(f, 2, 'JVMArguments')
-# writeln(f, 3, '')
-# for aStr in args.appArgs:
-# writeln(f, 4, '' + args + '')
-# writeln(f, 3, '')
-
-
# JVM configuration
writeln(f, 2, 'Java')
writeln(f, 2, '')
- tupList = []
-# tupList.append(('JVMVersion', '1.6+'))
-# tupList.append(('MainClass', args.mainClass))
- tupList.append(('WorkingDirectory', '$APP_PACKAGE/Contents/app'))
+ classPathStr = '$JAVAROOT/appLauncher.jar'
+# classPathStr = ''
+# for aStr in args.classPath:
+# classPathStr += '$JAVAROOT/' + aStr + ':'
+# if len(classPathStr) > 0:
+# classPathStr = classPathStr[0:-1]
+ tupList = []
tupList.append(('ClassPath', classPathStr))
for (key, val) in tupList:
diff --git a/tools/buildRelease b/tools/buildRelease
index e0694fe..6af0543 100755
--- a/tools/buildRelease
+++ b/tools/buildRelease
@@ -11,7 +11,7 @@ import time
# Globals
# The default version of DistMaker
-version = '0.46'
+version = '0.47'
def logAndPrint(message="", indent=0, showTime=False):