Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.gem
pkg/*
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
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'
end

spec = eval(File.read('mirahndroid.gemspec'))

Rake::GemPackageTask.new(spec) do |pkg|
Gem::PackageTask.new(spec) do |pkg|
end

require 'rake/testtask'
Expand Down
11 changes: 0 additions & 11 deletions assets/build.xml.patch

This file was deleted.

11 changes: 11 additions & 0 deletions assets/custom_rules.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="imported" basedir=".">
<target name="-pre-compile" description="Compiles project's .mirah files into .class files">
<exec executable="mirahc" dir="src">
<arg line="-c ${sdk.dir}/platforms/${target}/android.jar:gen/" />
<arg value="-d" />
<arg value="../bin/classes/" />
<arg value="." />
</exec>
</target>
</project>
6 changes: 2 additions & 4 deletions bin/mirahndroid
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,15 @@ 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
File.open File.join(java_file_dir, activity + '.mirah'), 'w' do |f|
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
Expand Down
2 changes: 1 addition & 1 deletion mirahndroid.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down