From 10d455d560120eab0d2e5c85985c6eaf1a8a22b8 Mon Sep 17 00:00:00 2001 From: Immad Naseer Date: Tue, 16 Feb 2010 14:59:22 -0800 Subject: [PATCH] Changing the tabs in droidgap to spaces --- droidgap | 72 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/droidgap b/droidgap index c5edbfd7..914493d6 100755 --- a/droidgap +++ b/droidgap @@ -6,8 +6,8 @@ class Build def initialize(*a) @android_sdk_path, @name, @pkg, @www, @path = a - @s = File::SEPARATOR - @dir = Dir.pwd + @s + @s = File::SEPARATOR + @dir = Dir.pwd + @s end # runs the build script @@ -18,44 +18,44 @@ class Build copy_libs add_name_to_strings write_java - puts "Complete!" + puts "Complete!" end # removes local.properties and recreates based on android_sdk_path # then generates framework/phonegap.jar def build_jar - puts "Building the JAR..." - FileUtils.rm "#{ @dir }framework#{@s}local.properties" if File.exists? "#{ @dir }framework#{@s}local.properties" + puts "Building the JAR..." + FileUtils.rm "#{ @dir }framework#{@s}local.properties" if File.exists? "#{ @dir }framework#{@s}local.properties" FileUtils.rm "#{ @dir }framework#{@s}phonegap.js" if File.exists? "#{ @dir }framework#{@s}phonegap.js" - FileUtils.rm "#{ @dir }framework#{@s}phonegap.jar" if File.exists? "#{ @dir }framework#{@s}phonegap.jar" + FileUtils.rm "#{ @dir }framework#{@s}phonegap.jar" if File.exists? "#{ @dir }framework#{@s}phonegap.jar" open("#{ @dir }framework#{@s}local.properties", 'w') do |f| f.puts "sdk.dir=#{ @android_sdk_path }" end - Dir.chdir(@dir + "framework") + Dir.chdir(@dir + "framework") `ant jar` - Dir.chdir(@dir) + Dir.chdir(@dir) end # runs android create project # TODO need to allow more flexible SDK targetting # TODO validate Android SDK def create_android - puts "Creating Android project..." + puts "Creating Android project..." `android create project -t 5 -k #{ @pkg } -a #{ @name } -n #{ @name } -p #{ @path }` - FileUtils.mkdir_p "#{ @path }#{@s}assets#{@s}www" + FileUtils.mkdir_p "#{ @path }#{@s}assets#{@s}www" FileUtils.cp_r "#{ @www }#{ @s }.", "#{ @path }#{ @s }assets#{ @s }www#{ @s }" end # creates an AndroidManifest.xml for the project def generate_manifest - puts "Generating manifest..." + puts "Generating manifest..." manifest = "" open(@dir + 'framework/AndroidManifest.xml', 'r') do |old| - manifest = old.read - manifest.gsub! 'android:versionCode="5"', 'android:versionCode="1"' - manifest.gsub! 'package="com.phonegap"', "package=\"#{ @pkg }\"" - manifest.gsub! 'android:name=".StandAlone"', "android:name=\".#{ @name }\"" - manifest.gsub! 'android:minSdkVersion="5"', 'android:minSdkVersion="3"' + manifest = old.read + manifest.gsub! 'android:versionCode="5"', 'android:versionCode="1"' + manifest.gsub! 'package="com.phonegap"', "package=\"#{ @pkg }\"" + manifest.gsub! 'android:name=".StandAlone"', "android:name=\".#{ @name }\"" + manifest.gsub! 'android:minSdkVersion="5"', 'android:minSdkVersion="3"' end open("#{ @path }#{@s}AndroidManifest.xml", 'w') { |x| x.puts manifest } end @@ -63,31 +63,31 @@ class Build # copies stuff from framework into the project # TODO need to allow for www import inc icon def copy_libs - puts "Copying over libraries and assets and creating phonegap.js..." - FileUtils.cp "#{ @dir }framework#{@s}phonegap.jar", "#{ @path }#{@s}libs" - FileUtils.cp "#{ @dir }framework#{@s}res#{@s}values#{@s}strings.xml", "#{ @path }#{@s}res#{@s}values#{@s}strings.xml" - FileUtils.cp "#{ @dir }framework#{@s}res#{@s}layout#{@s}main.xml", "#{ @path }#{@s}res#{@s}layout#{@s}main.xml" - FileUtils.cp "#{ @dir }framework#{@s}res#{@s}layout#{@s}preview.xml", "#{ @path }#{@s}res#{@s}layout#{@s}preview.xml" + puts "Copying over libraries and assets and creating phonegap.js..." + FileUtils.cp "#{ @dir }framework#{@s}phonegap.jar", "#{ @path }#{@s}libs" + FileUtils.cp "#{ @dir }framework#{@s}res#{@s}values#{@s}strings.xml", "#{ @path }#{@s}res#{@s}values#{@s}strings.xml" + FileUtils.cp "#{ @dir }framework#{@s}res#{@s}layout#{@s}main.xml", "#{ @path }#{@s}res#{@s}layout#{@s}main.xml" + FileUtils.cp "#{ @dir }framework#{@s}res#{@s}layout#{@s}preview.xml", "#{ @path }#{@s}res#{@s}layout#{@s}preview.xml" %w(drawable-hdpi drawable-ldpi drawable-mdpi).each do |e| - FileUtils.cp "#{ @dir }framework#{@s}res#{@s}drawable#{@s}icon.png", "#{ @path }#{@s}res#{@s}#{ e }#{@s}icon.png" + FileUtils.cp "#{ @dir }framework#{@s}res#{@s}drawable#{@s}icon.png", "#{ @path }#{@s}res#{@s}#{ e }#{@s}icon.png" end - # concat JS and put into www folder. - Dir.chdir("#{ @dir }framework#{ @s }assets#{ @s }js") - basedir = "." - js = Dir.new(basedir).entries - phonegapjs = IO.read('phonegap.js.base'); - js.each do |script| - next if script[0].chr == "." or script == "phonegap.js.base" - phonegapjs << IO.read(script) - phonegapjs << "\n\n" - end - Dir.chdir("#{ @dir}") - File.open("#{ @path }#{ @s }assets#{ @s }www#{ @s }phonegap.js", 'w') {|f| f.write(phonegapjs) } + # concat JS and put into www folder. + Dir.chdir("#{ @dir }framework#{ @s }assets#{ @s }js") + basedir = "." + js = Dir.new(basedir).entries + phonegapjs = IO.read('phonegap.js.base'); + js.each do |script| + next if script[0].chr == "." or script == "phonegap.js.base" + phonegapjs << IO.read(script) + phonegapjs << "\n\n" + end + Dir.chdir("#{ @dir}") + File.open("#{ @path }#{ @s }assets#{ @s }www#{ @s }phonegap.js", 'w') {|f| f.write(phonegapjs) } end # puts app name in strings def add_name_to_strings - puts "Adding some application name to strings.xml..." + puts "Adding some application name to strings.xml..." x = " #{ @name } @@ -102,7 +102,7 @@ class Build # this is so fucking unholy yet oddly beautiful # not sure if I should thank Ruby or apologize for this abusive use of string interpolation def write_java - puts "Writing application Java code..." + puts "Writing application Java code..." j = " package #{ @pkg };