From ed7a3e4d68fd29e6d73def6d96aaa111b627304f Mon Sep 17 00:00:00 2001 From: Daniel Staudigel Date: Fri, 11 Nov 2011 23:09:48 -0800 Subject: [PATCH 1/7] Ftfy. --- lib/beta_builder/deployment_strategies/web.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/beta_builder/deployment_strategies/web.rb b/lib/beta_builder/deployment_strategies/web.rb index 7510d2b..c047867 100644 --- a/lib/beta_builder/deployment_strategies/web.rb +++ b/lib/beta_builder/deployment_strategies/web.rb @@ -4,21 +4,21 @@ class Web < Strategy def extended_configuration_for_strategy proc do def deployment_url - File.join(deploy_to, target.downcase, ipa_name) + File.join(deploy_to, ipa_name) end def manifest_url - File.join(deploy_to, target.downcase, "manifest.plist") + File.join(deploy_to, "manifest.plist") end def remote_installation_path - File.join(remote_directory, target.downcase) + File.join(remote_directory) end end end def prepare - plist = CFPropertyList::List.new(:file => "pkg/Payload/#{@configuration.app_name}/Info.plist") + plist = CFPropertyList::List.new(:file => "pkg/Payload/#{@configuration.app_name}.app/Info.plist") plist_data = CFPropertyList.native_types(plist.value) File.open("pkg/dist/manifest.plist", "w") do |io| io << %{ From aa4e235e68669e72f4c287e605ebead53a875275 Mon Sep 17 00:00:00 2001 From: Daniel Staudigel Date: Sat, 12 Nov 2011 11:57:38 -0800 Subject: [PATCH 2/7] Get these out of the built location, not the deploy payload section. --- lib/beta_builder/deployment_strategies/web.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/beta_builder/deployment_strategies/web.rb b/lib/beta_builder/deployment_strategies/web.rb index c047867..67e8b8f 100644 --- a/lib/beta_builder/deployment_strategies/web.rb +++ b/lib/beta_builder/deployment_strategies/web.rb @@ -18,7 +18,7 @@ def remote_installation_path end def prepare - plist = CFPropertyList::List.new(:file => "pkg/Payload/#{@configuration.app_name}.app/Info.plist") + plist = CFPropertyList::List.new(:file => "#{@configuration.built_app_path}/Info.plist") plist_data = CFPropertyList.native_types(plist.value) File.open("pkg/dist/manifest.plist", "w") do |io| io << %{ From d26644b6b3ef5dcb0f12da5691de6f24df6cdb8a Mon Sep 17 00:00:00 2001 From: Daniel Staudigel Date: Sat, 12 Nov 2011 11:57:51 -0800 Subject: [PATCH 3/7] Package it up with Apple's script, not your own thing. --- lib/beta_builder.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb index 57505c3..33f21b1 100644 --- a/lib/beta_builder.rb +++ b/lib/beta_builder.rb @@ -141,13 +141,16 @@ def define end FileUtils.rm_rf('pkg') && FileUtils.mkdir_p('pkg') - FileUtils.mkdir_p("pkg/Payload") - FileUtils.mv(@configuration.built_app_path, "pkg/Payload/#{@configuration.app_file_name}") - Dir.chdir("pkg") do - system("zip -r '#{@configuration.ipa_name}' Payload") - end +# FileUtils.mkdir_p("pkg/Payload") +# FileUtils.mv(@configuration.built_app_path, "pkg/Payload/#{@configuration.app_file_name}") +# Dir.chdir("pkg") do +# system("zip -r '#{@configuration.ipa_name}' Payload") +# end + + system("/usr/bin/xcrun -sdk iphoneos PackageApplication -v '#{@configuration.built_app_path}' -o '/tmp/#{@configuration.ipa_name}' --sign 'iPhone Distribution: Virtual World Computing, LLC' --embed adhoc.mobileprovision") + FileUtils.mkdir('pkg/dist') - FileUtils.mv("pkg/#{@configuration.ipa_name}", "pkg/dist") + FileUtils.mv("/tmp/#{@configuration.ipa_name}", "pkg/dist") end if @configuration.deployment_strategy From 8fa80cac2453bbf770bfbd7d4d2073c57cac0ceb Mon Sep 17 00:00:00 2001 From: Daniel Staudigel Date: Sat, 12 Nov 2011 11:58:02 -0800 Subject: [PATCH 4/7] Indent these things betterly. --- lib/beta_builder/deployment_strategies/web.rb | 113 +++++++++--------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/lib/beta_builder/deployment_strategies/web.rb b/lib/beta_builder/deployment_strategies/web.rb index 67e8b8f..b85156a 100644 --- a/lib/beta_builder/deployment_strategies/web.rb +++ b/lib/beta_builder/deployment_strategies/web.rb @@ -21,65 +21,64 @@ def prepare plist = CFPropertyList::List.new(:file => "#{@configuration.built_app_path}/Info.plist") plist_data = CFPropertyList.native_types(plist.value) File.open("pkg/dist/manifest.plist", "w") do |io| - io << %{ - - - - - items - - - assets - - - kind - software-package - url - #{@configuration.deployment_url} - - - metadata - - bundle-identifier - #{plist_data['CFBundleIdentifier']} - bundle-version - #{plist_data['CFBundleVersion']} - kind - software - title - #{plist_data['CFBundleDisplayName']} - - - - - - } + io << %{ + + + + items + + + assets + + + kind + software-package + url + #{@configuration.deployment_url} + + + metadata + + bundle-identifier + #{plist_data['CFBundleIdentifier']} + bundle-version + #{plist_data['CFBundleVersion']} + kind + software + title + #{plist_data['CFBundleDisplayName']} + + + + + +} end File.open("pkg/dist/index.html", "w") do |io| - io << %{ - - - - - - Beta Download - - - -
-
Tap Here to Install
#{@configuration.target}
On Your Device
-

Link didn't work?
- Make sure you're visiting this page on your device, not your computer.

- - - } + io << %{ + + + + + Beta Download + + + +
+
Tap Here to Install
#{@configuration.target}
On Your Device
+

Link didn't work?
+ Make sure you're visiting this page on your device, not your computer.

+
+ + +} end end From 754953ee51a8162290641cd6ba09416e644e273a Mon Sep 17 00:00:00 2001 From: Daniel Staudigel Date: Sat, 12 Nov 2011 18:45:22 -0800 Subject: [PATCH 5/7] Pulled out app-specific configuration. --- lib/beta_builder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb index 33f21b1..57e7ca3 100644 --- a/lib/beta_builder.rb +++ b/lib/beta_builder.rb @@ -147,7 +147,7 @@ def define # system("zip -r '#{@configuration.ipa_name}' Payload") # end - system("/usr/bin/xcrun -sdk iphoneos PackageApplication -v '#{@configuration.built_app_path}' -o '/tmp/#{@configuration.ipa_name}' --sign 'iPhone Distribution: Virtual World Computing, LLC' --embed adhoc.mobileprovision") + system("/usr/bin/xcrun -sdk iphoneos PackageApplication -v '#{@configuration.built_app_path}' -o '/tmp/#{@configuration.ipa_name}' --sign '#{@config.signing_identity}' --embed #{@configuration.provisioning_profile}") FileUtils.mkdir('pkg/dist') FileUtils.mv("/tmp/#{@configuration.ipa_name}", "pkg/dist") From 8727bc8c919ca05da88760e72f82e9ee02fd1fa9 Mon Sep 17 00:00:00 2001 From: Daniel Staudigel Date: Mon, 14 Nov 2011 18:44:03 -0800 Subject: [PATCH 6/7] Fix. --- lib/beta_builder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb index 57e7ca3..f2b4d8f 100644 --- a/lib/beta_builder.rb +++ b/lib/beta_builder.rb @@ -147,7 +147,7 @@ def define # system("zip -r '#{@configuration.ipa_name}' Payload") # end - system("/usr/bin/xcrun -sdk iphoneos PackageApplication -v '#{@configuration.built_app_path}' -o '/tmp/#{@configuration.ipa_name}' --sign '#{@config.signing_identity}' --embed #{@configuration.provisioning_profile}") + system("/usr/bin/xcrun -sdk iphoneos PackageApplication -v '#{@configuration.built_app_path}' -o '/tmp/#{@configuration.ipa_name}' --sign '#{@configuration.signing_identity}' --embed #{@configuration.provisioning_profile}") FileUtils.mkdir('pkg/dist') FileUtils.mv("/tmp/#{@configuration.ipa_name}", "pkg/dist") From bef32cf33a2258cf627d381eab06d6c7b328eb37 Mon Sep 17 00:00:00 2001 From: Daniel Staudigel Date: Mon, 14 Nov 2011 18:44:14 -0800 Subject: [PATCH 7/7] Include version string in the webpage. --- lib/beta_builder/deployment_strategies/web.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/beta_builder/deployment_strategies/web.rb b/lib/beta_builder/deployment_strategies/web.rb index b85156a..0ec694a 100644 --- a/lib/beta_builder/deployment_strategies/web.rb +++ b/lib/beta_builder/deployment_strategies/web.rb @@ -72,7 +72,7 @@ def prepare