assets/rakelib/ruboto.rake in ruboto-1.0.1 vs assets/rakelib/ruboto.rake in ruboto-1.0.2
- old
+ new
@@ -52,27 +52,27 @@
unless DX_FILENAME
puts 'You need to install the Android SDK Build-tools!'
exit 1
end
-def manifest;
+def manifest
@manifest ||= REXML::Document.new(File.read(MANIFEST_FILE))
end
-def package;
+def package
manifest.root.attribute('package')
end
-def build_project_name;
+def build_project_name
@build_project_name ||= REXML::Document.new(File.read('build.xml')).elements['project'].attribute(:name).value
end
-def scripts_path;
+def scripts_path
@sdcard_path ||= "/mnt/sdcard/Android/data/#{package}/files/scripts"
end
-def app_files_path;
+def app_files_path
@app_files_path ||= "/data/data/#{package}/files"
end
PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
UPDATE_MARKER_FILE = File.join(PROJECT_DIR, 'bin', 'LAST_UPDATE')
@@ -362,11 +362,11 @@
file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
next unless File.exists? GEM_FILE
puts "Generating #{BUNDLE_JAR}"
require 'bundler'
- # Issue #547 https://github.com/ruboto/ruboto/issues/547
+ # FIXME(uwe): Issue #547 https://github.com/ruboto/ruboto/issues/547
if true || Gem::Version.new(Bundler::VERSION) <= Gem::Version.new('1.5.0')
require 'bundler/vendored_thor'
# Store original RubyGems/Bundler environment
platforms = Gem.platforms
@@ -492,10 +492,10 @@
# files = classes.grep(dbs)
# FileUtils.rm_f(files)
# ODOT
# FIXME(uwe): Extract files with case sensitive names for ARJDBC 1.2.7-1.3.x
- puts `jar xf #{jar} arjdbc/mssql/MSSQLRubyJdbcConnection.class arjdbc/sqlite3/SQLite3RubyJdbcConnection.class`
+ puts `jar xf #{jar} arjdbc/postgresql/PostgreSQLRubyJdbcConnection.class arjdbc/mssql/MSSQLRubyJdbcConnection.class arjdbc/sqlite3/SQLite3RubyJdbcConnection.class`
# EMXIF
elsif jar =~ /shared\/jopenssl.jar$/
jar_load_code = <<-END_CODE
require 'jruby'