Permalink
Browse files

* Corrected URL to RubotoCore on GitHub

  • Loading branch information...
1 parent 0fbf9a8 commit fd9fe03fe5fcf3b94fd35b3ba392f06fbc16f99c @donv donv committed Dec 24, 2011
Showing with 6 additions and 6 deletions.
  1. +1 −1 .project
  2. +1 −1 assets/src/InheritingActivity.java
  3. +3 −3 lib/ruboto/util/update.rb
  4. +1 −1 ruboto.gemspec
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>ruboto-core</name>
+ <name>ruboto</name>
<comment></comment>
<projects>
</projects>
@@ -140,7 +140,7 @@ public void run() {
}
private static final String RUBOTO_APK = "RubotoCore-release.apk";
- private static final String RUBOTO_URL = "https://github.com/downloads/ruboto/ruboto-core/" + RUBOTO_APK;
+ private static final String RUBOTO_URL = "https://github.com/downloads/ruboto/ruboto/" + RUBOTO_APK;
// Called when the button is pressed.
public void getRubotoCore(View view) {
@@ -67,7 +67,7 @@ def update_test(force = nil)
ant_setup_line = /^(\s*<\/project>)/
run_tests_override = <<-EOF
-<!-- BEGIN added by ruboto-core -->
+<!-- BEGIN added by ruboto -->
<macrodef name="run-tests-helper">
<attribute name="emma.enabled" default="false"/>
@@ -108,15 +108,15 @@ def update_test(force = nil)
<target name="run-tests-quick" description="Runs tests with previously installed packages">
<run-tests-helper />
</target>
-<!-- END added by ruboto-core -->
+<!-- END added by ruboto -->
EOF
ant_script = File.read('build.xml')
# TODO(uwe): Old patches without delimiter. Remove when we stop supporting upgrading from ruboto-core 0.2.0 and older.
ant_script.gsub!(/\s*<macrodef name="run-tests-helper">.*?<\/macrodef>\s*/m, '')
ant_script.gsub!(/\s*<target name="run-tests-quick".*?<\/target>\s*/m, '')
# TODO end
- ant_script.gsub!(/\s*<!-- BEGIN added by ruboto-core -->.*?<!-- END added by ruboto-core -->\s*/m, '')
+ ant_script.gsub!(/\s*<!-- BEGIN added by ruboto(?:-core)? -->.*?<!-- END added by ruboto(?:-core)? -->\s*/m, '')
raise "Bad ANT script" unless ant_script.gsub!(ant_setup_line, "#{run_tests_override}\n\n\\1")
File.open('build.xml', 'w'){|f| f << ant_script}
end
View
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
s.summary = %q{A platform for developing apps using JRuby on Android.}
s.homepage = %q{http://ruboto.org/}
s.description = %Q{Ruboto - JRuby on Android\nA generator and framework for developing full stand-alone apps for Android usign the Ruby language and libraries.}
- s.rubyforge_project = "ruboto/ruboto-core"
+ s.rubyforge_project = "ruboto/ruboto"
s.files = FileList['[A-Z]*', "assets/**/*", "bin/*", 'lib/**/*', 'test/**/*'].to_a
s.executables = ['ruboto']
s.default_executable = 'ruboto'

0 comments on commit fd9fe03

Please sign in to comment.