Permalink
Browse files

update rawr

  • Loading branch information...
1 parent 409c995 commit ad06c98ed837e899840e6239ce2686122e69cbf0 @tka tka committed Apr 29, 2013
Showing with 17 additions and 9 deletions.
  1. +1 −1 Gemfile
  2. +6 −6 Gemfile.lock
  3. +3 −1 Rakefile
  4. +2 −1 build_configuration.rb
  5. +5 −0 src/compile_version.rb
View
@@ -1,6 +1,6 @@
# A sample Gemfile
source "https://rubygems.org"
gem "rake"
-gem "rawr", "1.6.4", :git => "git://github.com/rawr/rawr.git"
+gem "rawr", "1.6.6", :git => "git://github.com/rawr/rawr.git"
gem "user-choices"
# gem "rails"
View
@@ -1,16 +1,16 @@
GIT
remote: git://github.com/rawr/rawr.git
- revision: 9164e420e6802aafb52e30cab7f1f866e6334b18
+ revision: 65b1cba5c284d4ed5ecffed1d59684232308ab2f
specs:
- rawr (1.6.4)
+ rawr (1.6.6)
GEM
remote: https://rubygems.org/
specs:
- builder (3.1.4)
- hoe (3.4.0)
+ builder (3.2.0)
+ hoe (3.6.0)
rake (>= 0.8, < 11.0)
- rake (10.0.3)
+ rake (10.0.4)
s4t-utils (1.0.4)
hoe (>= 1.3.0)
user-choices (1.1.6.1)
@@ -25,5 +25,5 @@ PLATFORMS
DEPENDENCIES
rake
- rawr (= 1.6.4)!
+ rawr (= 1.6.6)!
user-choices
View
@@ -45,6 +45,7 @@ INFO_ENDL
%w{ruby images applescript documents javascripts}.each do | copy_dir |
%x{cp -R lib/#{copy_dir} #{CONFIG.osx_output_dir}/#{CONFIG.project_name}.app/Contents/Resources/lib }
end
+ %x{chmod 644 #{CONFIG.osx_output_dir}/#{CONFIG.project_name}.app/Contents/Resources/Java/fire-app.jar}
Dir.chdir CONFIG.osx_output_dir
%x{mv #{CONFIG.project_name}.app Fire.app;}
@osx_bundle_file="fire.app.osx.#{@compile_time}-#{@revision}.zip"
@@ -69,7 +70,7 @@ INFO_ENDL
%x{cp -R lib/#{copy_dir} #{CONFIG.windows_output_dir}/lib }
end
- %x{mv package/windows/package/windows/*.exe package/windows}
+ %x{chmod 644 #{CONFIG.windows_output_dir}/fire-app.jar}
%x{rm -rf package/windows/package}
Dir.chdir 'package'
%x{rm -rf fire.app windows/*.xml; mv windows fire.app}
@@ -93,6 +94,7 @@ INFO_ENDL
f.write("#!/usr/bin/env bash\ncd $(dirname $0)\njava -client -jar fire-app.jar $@")
end
%x{chmod +x package/fire.app/run.sh}
+ %x{chmod 644 package/fire.app/fire-app.jar}
Dir.chdir 'package'
@linux_bundle_file="fire.app.linux.#{@compile_time}-#{@revision}.zip"
%x{zip -9 -r #{@packages_dir}/#{@linux_bundle_file} fire.app}
View
@@ -62,7 +62,8 @@
# Undocumented option 'target_jvm_version'
# default value: 1.6
#
- #c.target_jvm_version = 1.6
+ c.target_jvm_version = 1.6
+ c.source_jvm_version = 1.6
# Undocumented option 'jvm_arguments'
# default value: ""
View
@@ -1,5 +1,10 @@
module CompileVersion
+<<<<<<< HEAD
REVISION = 'e6d27b9d0c'
COMPILE_TIME = '201304291426'
+=======
+ REVISION = '95af139f91'
+ COMPILE_TIME = '201304291610'
+>>>>>>> cd57afa... update rawr
UPDATE_URL = ''
end

0 comments on commit ad06c98

Please sign in to comment.