diff --git a/.gitignore b/.gitignore index c111b33..34b1125 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.gem +pkg/* \ No newline at end of file diff --git a/README.md b/README.md index 20d205b..669ff2a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Create an app using `mirahndroid create` (use `mirahndroid help create` to see t You can compile your app by running `ant debug` in the root of your app. -Install it by running `adb install -r bin/YourAppName-debug.apk` +Install it by running `adb installd` ## License diff --git a/Rakefile b/Rakefile index 7e0d1dd..043e595 100644 --- a/Rakefile +++ b/Rakefile @@ -1,9 +1,9 @@ require 'rake/clean' require 'rubygems' -require 'rake/gempackagetask' -require 'rake/rdoctask' +require 'rubygems/package_task' +require 'rdoc/task' -Rake::RDocTask.new do |rd| +RDoc::Task.new do |rd| rd.main = "README.rdoc" rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*") rd.title = 'Your application title' @@ -11,7 +11,7 @@ end spec = eval(File.read('mirahndroid.gemspec')) -Rake::GemPackageTask.new(spec) do |pkg| +Gem::PackageTask.new(spec) do |pkg| end require 'rake/testtask' diff --git a/assets/build.xml.patch b/assets/build.xml.patch deleted file mode 100644 index 199b86c..0000000 --- a/assets/build.xml.patch +++ /dev/null @@ -1,11 +0,0 @@ -66a67,76 -> description="Compiles project's .mirah files into .class files"> -> -> -> -> -> -> -> -> diff --git a/assets/custom_rules.xml b/assets/custom_rules.xml new file mode 100644 index 0000000..afd9aea --- /dev/null +++ b/assets/custom_rules.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/bin/mirahndroid b/bin/mirahndroid index e8d9603..d13b1c0 100755 --- a/bin/mirahndroid +++ b/bin/mirahndroid @@ -56,7 +56,8 @@ command :create do |c| end.join ' ' `android create project #{params}` - `patch #{File.join(path, 'build.xml')} #{File.join(file_root, "assets/build.xml.patch")}` + #`patch #{File.join(path, 'build.xml')} #{File.join(file_root, "assets/build.xml.patch")}` + FileUtils.cp File.join(file_root, 'assets/custom_rules.xml'), File.join(path, 'custom_rules.xml') FileUtils.rm File.join(java_file_dir, activity + '.java') mirah = ERB.new(File.read(File.join(file_root, 'assets/starter_activity.mirah.erb'))).result binding @@ -64,9 +65,6 @@ command :create do |c| f << mirah end - File.open File.join(path, 'default.properties'), 'a' do |f| - f << "target-version=#{target}\n" - end puts "Project generated! Edit your starter activity at #{File.expand_path File.join(java_file_dir, activity + '.mirah')}" end end diff --git a/mirahndroid.gemspec b/mirahndroid.gemspec index e5237b5..c756863 100644 --- a/mirahndroid.gemspec +++ b/mirahndroid.gemspec @@ -2,7 +2,7 @@ require 'rake' spec = Gem::Specification.new do |s| s.name = 'mirahndroid' - s.version = '0.0.01' + s.version = '0.0.02' s.author = 'Daniel Jackoway' s.email = 'mirahndroid@danieljackoway.com' s.homepage = 'http://github.com/jackowayed/mirahndroid'