Browse files

switch over from iphonesim fork to ios-sim

  • Loading branch information...
1 parent ac831a6 commit d5a751d22c6fd51d25ada61833efb584214d29b9 @moredip committed Jun 14, 2012
View
3 .gitmodules
@@ -1,3 +1,6 @@
[submodule "vendor/iphonesim"]
path = vendor/iphonesim
url = git://github.com/moredip/iphonesim.git
+[submodule "vendor/ios-sim"]
+ path = vendor/ios-sim
+ url = https://github.com/phonegap/ios-sim.git
View
11 Rakefile
@@ -6,3 +6,14 @@ task "build_iphonesim" do
sh 'xcodebuild -project vendor/iphonesim/iphonesim.xcodeproj/ clean build'
cp 'vendor/iphonesim/build/Release/iphonesim', 'native/iphonesim'
end
+
+desc "compile ios-sim binary"
+task "build_ios_sim" do
+ native_dir = File.expand_path( '../native',__FILE__)
+ Dir.mktmpdir do |tmp_dir|
+ sh %Q{xcodebuild -project vendor/ios-sim/ios-sim.xcodeproj -configuration Debug SYMROOT='#{tmp_dir}' clean build}
+ FileUtils.cp( File.join(tmp_dir,'Debug','ios-sim'), native_dir )
+ end
+end
+
+task :default => [:build_ios_sim, :build]
View
8 lib/sim_launcher/simulator.rb
@@ -11,7 +11,7 @@ def showsdks
def launch_ios_app(app_path, sdk_version, device_family)
sdk_version ||= SdkDetector.new(self).latest_sdk_version
- run_synchronous_command( :launch, app_path, sdk_version, device_family )
+ run_synchronous_command( :launch, app_path, '--sdk', sdk_version, '--family', device_family, '--exit' )
end
def launch_ipad_app( app_path, sdk )
@@ -44,11 +44,7 @@ def xcode_version
end
def iphonesim_path(version)
- if version < 4.3
- File.join( File.dirname(__FILE__), '..', '..', 'native', 'iphonesim-legacy' )
- else
- File.join( File.dirname(__FILE__), '..', '..', 'native', 'iphonesim' )
- end
+ File.join( File.dirname(__FILE__), '..', '..', 'native', 'ios-sim' )
end
end
end
View
2 lib/sim_launcher/version.rb
@@ -1,3 +1,3 @@
module SimLauncher
- VERSION = "0.3.10"
+ VERSION = "0.4.0"
end
View
BIN native/ios-sim
Binary file not shown.
View
BIN native/iphonesim
Binary file not shown.
View
BIN native/iphonesim-legacy
Binary file not shown.
1 vendor/ios-sim
@@ -0,0 +1 @@
+Subproject commit 0d756d07719af0e9443501c3c598306585ee0575

0 comments on commit d5a751d

Please sign in to comment.