kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-04-03 22:49:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[WatchKit] Revert addition of separate host app, apperantly it already existed in another form.

Browse Source
This commit is contained in:
Eloy Durán
2014-11-24 18:23:42 +01:00
parent 756ea30e49
commit 0a8f116a0e
3 changed files with 0 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/motion/project/template/ios-watch-extension.rb
View File

@@ -40,14 +40,6 @@ desc "Build everything"
task :build => ['build:simulator', 'build:device']
namespace :build do
namespace :host_app do
task :simulator do
# TODO Try to re-use the env variables used when passing build settings from apps to extensions.
rakefile = File.expand_path('../ios-watch-host.rb', __FILE__)
sh "rake -I '#{File.join(App.config.motiondir, 'lib')}' -f '#{rakefile}' build:simulator simulator watch_app_name='#{App.config.name}' #{'--trace' if App::VERBOSE}"
end
end
def pre_build_actions(platform)
# TODO: Ensure Info.plist gets regenerated on each build so it has ints for
# Instruments and strings for normal builds.

86
lib/motion/project/template/ios-watch-host-config.rb
View File

@@ -1,86 +0,0 @@
# encoding: utf-8
# Copyright (c) 2012, HipByte SPRL and contributors
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require 'motion/project/template/ios/config'
require 'motion/project/template/ios-watch-host-config'
module Motion; module Project;
class IOSWatchAppHostConfig < IOSConfig
register :'ios-watch-host'
def initialize(project_dir, build_mode)
super
@files = []
@resources_dirs = []
@name = ENV['watch_app_name'].sub(/ WatchKit Extension$/, '') << ' Watch App'
end
# TODO datadir should not depend on the template name
def datadir(target=deployment_target)
File.join(motiondir, 'data', 'ios', target)
end
# TODO datadir should not depend on the template name
def supported_versions
@supported_versions ||= Dir.glob(File.join(motiondir, 'data', 'ios', '*')).select{|path| File.directory?(path)}.map do |path|
File.basename path
end
end
# TODO there are more differences, but they seem less important atm.
def merged_info_plist(platform)
plist = super
plist['CFBundleIdentifier'] = identifier + '.watchapp'
plist['UIDeviceFamily'] << '4' # TODO Are numbers in apps generated by Xcode!
plist['WKWatchKitApp'] = true
plist
end
def main_cpp_file_txt(_)
main_txt = <<EOS
#import <UIKit/UIKit.h>
#include <dlfcn.h>
extern "C" {
int
main(int argc, char **argv)
{
int retval = 0;
if (dlopen("/System/Library/PrivateFrameworks/SockPuppetGizmo.framework/SockPuppetGizmo", 0x2) != NULL) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
retval = UIApplicationMain(argc, argv, @"SPApplication", @"SPApplicationDelegate");
[pool release];
} else {
NSLog(@"Unable to load SockPuppetGizmo.framework");
retval = 1;
}
return retval;
}
}
EOS
main_txt
end
end
end; end

116
lib/motion/project/template/ios-watch-host.rb
View File

@@ -1,116 +0,0 @@
# encoding: utf-8
# Copyright (c) 2012, HipByte SPRL and contributors
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require 'motion/project/app'
require 'motion/util/version'
App = Motion::Project::App
App.template = :'ios-watch-host'
require 'motion/project'
require 'motion/project/template/ios-watch-host-config'
desc "Build the simulator version"
task :default => :"build:simulator"
desc "Build everything"
task :build => ['build:simulator', 'build:device']
namespace :build do
#def pre_build_actions(platform)
## TODO: Ensure Info.plist gets regenerated on each build so it has ints for
## Instruments and strings for normal builds.
#rm_f File.join(App.config.app_bundle(platform), 'Info.plist')
## TODO this should go into a iOS specific Builder class which performs this
## check before building.
#App.config.resources_dirs.flatten.each do |dir|
#next unless File.exist?(dir)
#Dir.entries(dir).grep(/^Resources$/i).each do |basename|
#path = File.join(dir, basename)
#if File.directory?(path)
#suggestion = basename == 'Resources' ? 'Assets' : 'assets'
#App.fail "An iOS application cannot be installed if it contains a " \
#"directory called `resources'. Please rename the " \
#"directory at path `#{path}' to, for instance, " \
#"`#{File.join(dir, suggestion)}'."
#end
#end
#end
#end
desc "Build the simulator version"
task :simulator do
#pre_build_actions('iPhoneSimulator')
App.build('iPhoneSimulator')
end
desc "Build the device version"
task :device do
#pre_build_actions('iPhoneOS')
App.build('iPhoneOS')
App.codesign('iPhoneOS')
end
end
desc "Run the simulator"
task :simulator do
Rake::Task["build:simulator"].invoke
app = App.config.app_bundle('iPhoneSimulator')
if ENV['TMUX']
tmux_default_command = `tmux show-options -g default-command`.strip
unless tmux_default_command.include?("reattach-to-user-namespace")
App.warn(<<END
It appears you are using tmux without 'reattach-to-user-namespace', the simulator might not work properly. You can either disable tmux or run the following commands:
$ brew install reattach-to-user-namespace
$ echo 'set-option -g default-command "reattach-to-user-namespace -l $SHELL"' >> ~/.tmux.conf
END
)
end
end
family_int = 1 # iPhone
target = App.config.sdk_version
simulate_device = App.config.device_family_string(nil, family_int, target, nil)
# Launch the simulator.
xcode = App.config.xcode_dir
env = "DYLD_FRAMEWORK_PATH=\"#{xcode}/../Frameworks\":\"#{xcode}/../OtherFrameworks\""
env << " RM_BUILT_EXECUTABLE=\"#{File.expand_path(App.config.app_bundle_executable('iPhoneSimulator'))}\""
env << ' SIM_SPEC_MODE=1' if App.config.spec_mode
sim = File.join(App.config.bindir, 'ios/sim')
debug = (ENV['debug'] ? 1 : (App.config.spec_mode ? '0' : '2'))
app_args = (ENV['args'] or '')
App.info 'Simulate', app
at_exit { system("stty echo") } if $stdout.tty? # Just in case the simulator launcher crashes and leaves the terminal without echo.
Signal.trap(:INT) { } if ENV['debug']
system "#{env} #{sim} #{debug} #{family_int} \"#{simulate_device}\" #{target} \"#{xcode}\" \"#{app}\" #{app_args}"
App.config.print_crash_message if $?.exitstatus != 0 && !App.config.spec_mode
exit($?.exitstatus)
end