Permalink
Browse files

fix for osx with java7

  • Loading branch information...
1 parent 265ef8a commit 09fe8df462312b3ca9c7430e5afa0b3ce67b24bd @tka tka committed Feb 12, 2014
Showing with 58 additions and 65 deletions.
  1. +51 −57 Info.plist
  2. BIN lib/java-appbundler/JavaAppLauncher
  3. +2 −2 src/compile_version.rb
  4. +5 −6 src/main.rb
View
@@ -1,57 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
- <dict>
- <key>NSUIElement</key>
- <string>1</string>
- <key>NSHighResolutionCapable</key>
- <string>True</string>
- <key>CFBundleName</key>
- <string>Fire.app</string>
- <key>CFBundleVersion</key>
- <string>1.0.0</string>
- <key>CFBundleAllowMixedLocalizations</key>
- <string>true</string>
- <key>CFBundleExecutable</key>
- <string>JavaAppLauncher</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleIconFile</key>
- <string>icon-osx.icns</string>
- <key>Java</key>
- <dict>
- <key>JVMVersion</key>
- <string>1.6*</string>
- <key>MainClass</key>
- <string>com.kkbox.fireapp.Main</string>
- <key>ClassPath</key>
- <array>
- <string>$JAVAROOT/fire-app.jar</string>
- </array>
- <key>Properties</key>
- <dict>
- <key>apple.laf.useScreenMenuBar</key>
- <string>true</string>
- </dict>
- <key>StartOnMainThread</key>
- <string>true</string>
- <key>VMOptions</key>
- <array>
- <string>-Dfile.encoding=utf8</string>
- <string>-Xverify:none</string>
- <string>-Xss1m</string>
- <string>-XX:-UseParallelOldGC</string>
- <string>-XX:NewRatio=4</string>
- <string>-Xmx384m</string>
- <string>-Xms128m</string>
- <string>-Xbootclasspath/p:$APP_PACKAGE/Contents/Resources/Java/lib/java/jruby-complete.jar</string>
- </array>
- </dict>
- </dict>
-</plist>
+<?xml version="1.0" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>NSUIElement</key>
+ <string>1</string>
+ <key>NSHighResolutionCapable</key>
+ <string>True</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>JavaAppLauncher</string>
+ <key>CFBundleIconFile</key>
+ <string>icon-osx.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.kkbox.fireapp</string>
+ <key>CFBundleDisplayName</key>
+ <string>Fire.app</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>Fire.app</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>GPL</string>
+ <key>LSApplicationCategoryType</key>
+ <string>public.app-category.developer-tools</string>
+ <key>JVMMainClassName</key>
+ <string>com.kkbox.fireapp.Main</string>
+ <key>JVMOptions</key>
+ <array>
+ <string>-Dapple.laf.useScreenMenuBar=true</string>
+ <string>-XstartOnFirstThread</string>
+ <string>-Xss1m</string>
+ <string>-XX:-UseParallelOldGC</string>
+ <string>-XX:NewRatio=4</string>
+ <string>-Xmx384m</string>
+ <string>-Xms128m</string>
+ </array>
+ <key>JVMArguments</key>
+ <array>
+ </array>
+ </dict>
+</plist>
Binary file not shown.
View
@@ -1,5 +1,5 @@
module CompileVersion
- REVISION = '6a851350fe'
- COMPILE_TIME = '201311230023'
+ REVISION = '265ef8ac05'
+ COMPILE_TIME = '201402130143'
UPDATE_URL = ''
end
View
@@ -2,14 +2,13 @@
require 'java'
$LOAD_PATH << 'src'
-require 'pathname'
-resources_dir = Pathname.new(__FILE__).dirname().dirname().dirname().to_s()[5..-1]
-puts resources_dir
-if resources_dir && File.exists?( File.join(resources_dir, 'lib','ruby'))
- LIB_PATH = File.join(resources_dir, 'lib')
+require 'uri'
+resources_dir = File.join(File.dirname( File.dirname(File.dirname( URI.parse(__FILE__).path ))), 'Resources')
+if File.exists?( File.join(resources_dir, 'lib','ruby'))
+ LIB_PATH = File.join(resources_dir, 'lib')
else
- LIB_PATH = File.expand_path 'lib'
+ LIB_PATH = File.expand_path 'lib'
end
# set execjs runtime

0 comments on commit 09fe8df

Please sign in to comment.