@@ -15,6 +15,12 @@ unless $app_config["env"].nil? #if env is here then it is an old app new_config["vendor"] = $app_config["env"]["vendor"] new_config["bbver"] = $app_config["env"]["bbver"] new_config["applog"] = $app_config["env"]["applog"] + new_config["iphone"] = Hash.new + new_config["iphone"]["configuration"] = "Debug" + new_config["iphone"]["sdk"] = "iphonesimulator3.0" + new_config["iphone"]["codesignidentity"] = "" + new_config["iphone"]["entitlements"] = "" + $app_config = new_config File.open( 'build.yml', 'w' ) do |out| bin/upgrade-rhodes-app @@ -57,6 +57,18 @@ namespace "config" do $guid="364FFCAF-C71D-4543-B293-9058E31CFFEE" $applog = File.join($homedir,$app_config["applog"]) if $app_config["applog"] + if $app_config["iphone"].nil? + $signidentity = $config["env"]["iphone"]["codesignidentity"] + $entitlements = $config["env"]["iphone"]["entitlements"] + $configuration = $config["env"]["iphone"]["configuration"] + $sdk = $config["env"]["iphone"]["sdk"] + else + $signidentity = $app_config["iphone"]["codesignidentity"] + $entitlements = $app_config["iphone"]["entitlements"] + $configuration = $app_config["iphone"]["configuration"] + $sdk = $app_config["iphone"]["sdk"] + end + unless File.exists? $homedir + "/.profile" File.open($homedir + "/.profile") {|f| f << "#" } end @@ -84,10 +96,10 @@ namespace "build" do set_app_name($app_config["name"]) unless $app_config["name"].nil? cp $app_path + "/icon/icon.png", $config["build"]["iphonepath"] - set_signing_identity($config["env"]["iphone"]["codesignidentity"],$config["env"]["iphone"]["entitlements"].to_s) if $config["env"]["iphone"]["codesignidentity"].to_s != "" + set_signing_identity($signidentity,$entitlements.to_s) if $signidentity.to_s != "" chdir $config["build"]["iphonepath"] - args = ['build', '-target', 'rhorunner', '-configuration', $config["env"]["iphone"]["configuration"], '-sdk', $config["env"]["iphone"]["sdk"]] + args = ['build', '-target', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk] puts Jake.run("xcodebuild",args) unless $? == 0 @@ -105,13 +117,13 @@ namespace "run" do desc "Builds everything, launches iphone simulator" task :iphone => ["config:iphone", "build:iphone:rhodes"] do - unless $config["env"]["iphone"]["sdk"] =~ /^iphonesimulator/ - puts "SDK must be one of the iphonesimulator sdks" + unless $sdk =~ /^iphonesimulator/ + puts "SDK must be one of the iphonesimulator sdks to run in the iphone simulator" exit 1 end `killall "iPhone Simulator"` - rhorunner = $config["build"]["iphonepath"] + "/build/#{$config["env"]["iphone"]["configuration"]}-iphonesimulator/rhorunner.app" + rhorunner = $config["build"]["iphonepath"] + "/build/#{$configuration}-iphonesimulator/rhorunner.app" Find.find($simapp) do |path| if File.basename(path) == "rhorunner.app" @@ -148,7 +160,7 @@ namespace "clean" do task :rhodes => ["config:iphone"] do chdir $config["build"]["iphonepath"] - args = ['clean', '-target', 'rhorunner', '-configuration', $config["env"]["iphone"]["configuration"], '-sdk', $config["env"]["iphone"]["sdk"]] + args = ['clean', '-target', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk] puts Jake.run("xcodebuild",args) unless $? == 0 puts "Error cleaning" platform/iphone/rbuild/iphone.rake @@ -4,3 +4,8 @@ version: 1.2.2 vendor: rhomobile bbver: 4.6 applog: rholog.txt +iphone: + configuration: Debug + sdk: iphonesimulator3.0 + codesignidentity: + entitlements: \ No newline at end of file res/generators/templates/application/build.yml @@ -12,12 +12,6 @@ env: jde: C:/Program Files/Research In Motion/BlackBerry JDE 4.2.0 mds: C:/Program Files/Research In Motion/BlackBerry Email and MDS Services Simulators 4.1.2/MDS sim: 8100 - iphone: - configuration: Debug - sdk: iphonesimulator3.0 - codesignidentity: - entitlements: - build: bbpath: platform/bb wmpath: platform/wm @@ -26,7 +20,6 @@ build: symbianpath: platform/symbian bb: bbsignpwd: "somepasswordhere" - excludedirs: bb: - public/js/iui rhobuild.yml.example 6dc192af12c5aef7f8c8c20852c70e99c9ccb652 ldm314 Brian@.(none) http://github.com/rhomobile/rhodes/commit/566ffd29b49a1c0da75ecd02215446c784e1dcfd 566ffd29b49a1c0da75ecd02215446c784e1dcfd 2009-10-26T14:19:40-07:00 2009-10-26T14:19:40-07:00 move iphone build properties to applications config. backwards compatible with older apps 360dcf3eda31dfb6f909356d159f3f480ca6961f ldm314 Brian@.(none)