diff --git a/lib/motion/project/builder.rb b/lib/motion/project/builder.rb
index 4f8fb923..58289b1e 100644
--- a/lib/motion/project/builder.rb
+++ b/lib/motion/project/builder.rb
@@ -89,13 +89,13 @@ module Motion; module Project;
end
# Build targets
+ target_frameworks = []
unless config.targets.empty?
config.targets.each do |target|
target.build(platform)
end
# Prepare target frameworks
- target_frameworks = []
config.targets.select { |t| t.type == :framework && t.load? }.each do |target|
target_frameworks << target.framework_name
end
diff --git a/lib/motion/project/template/ios-action-extension/files/.gitignore b/lib/motion/project/template/ios-action-extension/files/.gitignore
new file mode 100644
index 00000000..ae6aa4dd
--- /dev/null
+++ b/lib/motion/project/template/ios-action-extension/files/.gitignore
@@ -0,0 +1,17 @@
+.repl_history
+build
+tags
+app/pixate_code.rb
+resources/*.nib
+resources/*.momd
+resources/*.storyboardc
+.DS_Store
+nbproject
+.redcar
+#*#
+*~
+*.sw[po]
+.eprj
+.sass-cache
+.idea
+.dat*.*
diff --git a/lib/motion/project/template/ios-action-extension/files/Gemfile b/lib/motion/project/template/ios-action-extension/files/Gemfile
new file mode 100644
index 00000000..764be634
--- /dev/null
+++ b/lib/motion/project/template/ios-action-extension/files/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+# Add your dependencies here:
diff --git a/lib/motion/project/template/ios-action-extension/files/Rakefile.erb b/lib/motion/project/template/ios-action-extension/files/Rakefile.erb
index b003fc92..698986ec 100644
--- a/lib/motion/project/template/ios-action-extension/files/Rakefile.erb
+++ b/lib/motion/project/template/ios-action-extension/files/Rakefile.erb
@@ -1,15 +1,32 @@
# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project/template/ios-extension'
+
+begin
+ require 'bundler'
+ Bundler.require
+rescue LoadError
+end
Motion::Project::App.setup do |app|
# Use `rake config' to see complete project settings.
- app.extension do |ext|
- ext.name = '<%= extension_name %>'
- ext.type = 'ui-services'
- ext.attributes = {
- "NSExtensionActivationRule" => "TRUEPREDICATE",
- "NSExtensionPointName" => "com.apple.ui-services",
- "NSExtensionPointVersion" => "1.0"
- }
- ext.frameworks << "MobileCoreServices"
- end
-end
+ app.name = '<%= name %>'
+ app.frameworks << 'MobileCoreServices'
+ app.info_plist['NSExtension'] = {
+ 'NSExtensionAttributes' => {
+ 'NSExtensionActivationRule' => {
+ 'NSExtensionActivationSupportsFileWithMaxCount' => 0,
+ 'NSExtensionActivationSupportsImageWithMaxCount' => 1,
+ 'NSExtensionActivationSupportsMovieWithMaxCount' => 0,
+ 'NSExtensionActivationSupportsText' => false,
+ 'NSExtensionActivationSupportsWebURLWithMaxCount' => 0
+ },
+ 'NSExtensionPointName' => 'com.apple.ui-services',
+ 'NSExtensionPointVersion' => '1.0'
+ },
+ # Use 'NSExtensionPrincipalClass' if you want to setup the UI in code
+ # 'NSExtensionPrincipalClass' => 'ActionViewController',
+ 'NSExtensionMainStoryboard' => 'MainInterface',
+ 'NSExtensionPointIdentifier' => 'com.apple.ui-services'
+ }
+end
\ No newline at end of file
diff --git a/lib/motion/project/template/ios-action-extension/files/app/action_view_controller.rb b/lib/motion/project/template/ios-action-extension/files/app/action_view_controller.rb
index 24367769..19e179df 100644
--- a/lib/motion/project/template/ios-action-extension/files/app/action_view_controller.rb
+++ b/lib/motion/project/template/ios-action-extension/files/app/action_view_controller.rb
@@ -20,13 +20,14 @@ class ActionViewController < UIViewController
if itemProvider.hasItemConformingToTypeIdentifier(KUTTypeImage)
# This is an image. We'll load it, then place it in our image view.
imageView = WeakRef.new(self.imageView)
- itemProvider.loadItemForTypeIdentifier(KUTTypeImage, options:nil, completionHandler: proc { |image, error|
- if image
+ itemProvider.loadItemForTypeIdentifier(KUTTypeImage, options:nil, completionHandler: proc { |url, error|
+ if url
+ image = UIImage.alloc.initWithData(NSData.dataWithContentsOfURL(url))
NSOperationQueue.mainQueue.addOperationWithBlock(proc {
imageView.setImage(image)
- }.weak!)
+ })
end
- }.weak!)
+ })
imageFound = true
break
diff --git a/lib/motion/project/template/ios-action-extension/files/resources/MainInterface.storyboard b/lib/motion/project/template/ios-action-extension/files/resources/MainInterface.storyboard
new file mode 100644
index 00000000..160d4ac4
--- /dev/null
+++ b/lib/motion/project/template/ios-action-extension/files/resources/MainInterface.storyboard
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/motion/project/template/ios-custom-keyboard/files/.gitignore b/lib/motion/project/template/ios-custom-keyboard/files/.gitignore
new file mode 100644
index 00000000..ae6aa4dd
--- /dev/null
+++ b/lib/motion/project/template/ios-custom-keyboard/files/.gitignore
@@ -0,0 +1,17 @@
+.repl_history
+build
+tags
+app/pixate_code.rb
+resources/*.nib
+resources/*.momd
+resources/*.storyboardc
+.DS_Store
+nbproject
+.redcar
+#*#
+*~
+*.sw[po]
+.eprj
+.sass-cache
+.idea
+.dat*.*
diff --git a/lib/motion/project/template/ios-custom-keyboard/files/Gemfile b/lib/motion/project/template/ios-custom-keyboard/files/Gemfile
new file mode 100644
index 00000000..764be634
--- /dev/null
+++ b/lib/motion/project/template/ios-custom-keyboard/files/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+# Add your dependencies here:
diff --git a/lib/motion/project/template/ios-document-picker/files/.gitignore b/lib/motion/project/template/ios-document-picker/files/.gitignore
new file mode 100644
index 00000000..ae6aa4dd
--- /dev/null
+++ b/lib/motion/project/template/ios-document-picker/files/.gitignore
@@ -0,0 +1,17 @@
+.repl_history
+build
+tags
+app/pixate_code.rb
+resources/*.nib
+resources/*.momd
+resources/*.storyboardc
+.DS_Store
+nbproject
+.redcar
+#*#
+*~
+*.sw[po]
+.eprj
+.sass-cache
+.idea
+.dat*.*
diff --git a/lib/motion/project/template/ios-document-picker/files/Gemfile b/lib/motion/project/template/ios-document-picker/files/Gemfile
new file mode 100644
index 00000000..764be634
--- /dev/null
+++ b/lib/motion/project/template/ios-document-picker/files/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+# Add your dependencies here:
diff --git a/lib/motion/project/template/ios-document-picker/files/Rakefile.erb b/lib/motion/project/template/ios-document-picker/files/Rakefile.erb
index a3e4f916..da908718 100644
--- a/lib/motion/project/template/ios-document-picker/files/Rakefile.erb
+++ b/lib/motion/project/template/ios-document-picker/files/Rakefile.erb
@@ -1,11 +1,18 @@
# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project/template/ios-extension'
+
+begin
+ require 'bundler'
+ Bundler.require
+rescue LoadError
+end
Motion::Project::App.setup do |app|
# Use `rake config' to see complete project settings.
- app.extension do |ext|
- ext.name = '<%= extension_name %>'
- ext.type = "fileprovider-ui"
- ext.attributes = {
+ app.name = '<%= name %>'
+ app.info_plist['NSExtension'] = {
+ 'NSExtensionAttributes' => {
"UIDocumentPickerModes" => [
"UIDocumentPickerModeImport",
"UIDocumentPickerModeOpen",
@@ -15,6 +22,11 @@ Motion::Project::App.setup do |app|
"UIDocumentPickerSupportedFileTypes" => [
"public.content"
]
- }
- end
-end
+ },
+ # 'NSExtensionPrincipalClass' => 'DocumentPickerViewController',
+ 'NSExtensionMainStoryboard' => 'MainInterface',
+ 'NSExtensionPointIdentifier' => 'com.apple.fileprovider-ui'
+ }
+ #
+ app.entitlements['com.apple.security.application-groups'] = '<%= name %>'
+end
\ No newline at end of file
diff --git a/lib/motion/project/template/ios-document-picker/files/app/document_picker_view_controller.rb b/lib/motion/project/template/ios-document-picker/files/app/document_picker_view_controller.rb
index 7189c803..787b147a 100644
--- a/lib/motion/project/template/ios-document-picker/files/app/document_picker_view_controller.rb
+++ b/lib/motion/project/template/ios-document-picker/files/app/document_picker_view_controller.rb
@@ -1,4 +1,4 @@
-class DocumentPickerViewController < UIDocumentPickerExtensionViewController
+class DocumentPickerViewController < UIDocumentPickerExtensionViewController
def openDocument(sender)
documentURL = self.documentStorageURL.URLByAppendingPathComponent("Untitled.txt")
diff --git a/lib/motion/project/template/ios-document-picker/files/document.entitlements b/lib/motion/project/template/ios-document-picker/files/document.entitlements
deleted file mode 100644
index 632d21b1..00000000
--- a/lib/motion/project/template/ios-document-picker/files/document.entitlements
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- com.apple.security.application-groups
-
- group.sdf.Extension-Test
-
-
-
diff --git a/lib/motion/project/template/ios-document-picker/files/resources/MainInterface.storyboard b/lib/motion/project/template/ios-document-picker/files/resources/MainInterface.storyboard
new file mode 100644
index 00000000..cc377324
--- /dev/null
+++ b/lib/motion/project/template/ios-document-picker/files/resources/MainInterface.storyboard
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/motion/project/template/ios-extension-builder.rb b/lib/motion/project/template/ios-extension-builder.rb
index d6ee3e55..ec13c9ac 100644
--- a/lib/motion/project/template/ios-extension-builder.rb
+++ b/lib/motion/project/template/ios-extension-builder.rb
@@ -315,7 +315,7 @@ EOS
ib_resources.each do |src, dest|
if !File.exist?(dest) or File.mtime(src) > File.mtime(dest)
App.info 'Compile', src
- sh "/usr/bin/ibtool --compile \"#{dest}\" \"#{src}\""
+ sh "/usr/bin/ibtool --compile \"#{File.expand_path(dest)}\" \"#{File.expand_path(src)}\""
end
end
end
diff --git a/lib/motion/project/template/ios-extension-builder.rb.orig b/lib/motion/project/template/ios-extension-builder.rb.orig
new file mode 100644
index 00000000..d6ee3e55
--- /dev/null
+++ b/lib/motion/project/template/ios-extension-builder.rb.orig
@@ -0,0 +1,468 @@
+# 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/builder'
+
+module Motion; module Project
+ class Builder
+
+ def codesign(config, platform)
+ entitlements = File.join(config.app_bundle(platform), "Entitlements.plist")
+ File.open(entitlements, 'w') { |io| io.write(config.entitlements_data) }
+ end
+
+ def build(config, platform, opts)
+ config.sdk_version = ENV['RM_TARGET_SDK_VERSION'] if ENV['RM_TARGET_SDK_VERSION']
+ config.deployment_target = ENV['RM_TARGET_DEPLOYMENT_TARGET'] if ENV['RM_TARGET_DEPLOYMENT_TARGET']
+ config.xcode_dir = ENV['RM_TARGET_XCODE_DIR'] if ENV['RM_TARGET_XCODE_DIR']
+
+ datadir = config.datadir
+ unless File.exist?(File.join(datadir, platform))
+ $stderr.puts "This version of RubyMotion does not support `#{platform}'"
+ exit 1
+ end
+
+ archs = config.archs[platform]
+
+ ruby = File.join(config.bindir, 'ruby')
+ llc = File.join(config.bindir, 'llc')
+ @nfd = File.join(config.bindir, 'nfd')
+
+ if config.spec_mode and (config.spec_files - config.spec_core_files).empty?
+ App.fail "No spec files in `#{config.specs_dir}'"
+ end
+
+ config.resources_dirs.flatten!
+ config.resources_dirs.uniq!
+
+ # Locate SDK and compilers.
+ sdk = config.sdk(platform)
+ cc = config.locate_compiler(platform, 'clang')
+ cxx = config.locate_compiler(platform, 'clang++')
+
+ build_dir = File.join(config.versionized_build_dir(platform))
+ App.info 'Build', build_dir
+
+ # Prepare the list of BridgeSupport files needed.
+ bs_files = config.bridgesupport_files
+
+ # Build vendor libraries.
+ vendor_libs = []
+ config.vendor_projects.each do |vendor_project|
+ vendor_project.build(platform)
+ vendor_libs.concat(vendor_project.libs)
+ bs_files.concat(vendor_project.bs_files)
+ end
+
+ # Validate common build directory.
+ if !File.directory?(Builder.common_build_dir) or !File.writable?(Builder.common_build_dir)
+ $stderr.puts "Cannot write into the `#{Builder.common_build_dir}' directory, please remove or check permissions and try again."
+ exit 1
+ end
+
+ # Prepare target frameworks
+ target_frameworks = []
+ config.targets.select { |t| t.type == :framework && t.load? }.each do |target|
+ target.build(platform)
+ target_frameworks << target.framework_name
+ end
+
+ # Build object files.
+ objs_build_dir = File.join(build_dir, 'objs')
+ FileUtils.mkdir_p(objs_build_dir)
+ any_obj_file_built = false
+ project_files = Dir.glob("**/*.rb").map{ |x| File.expand_path(x) }
+ is_default_archs = (archs == config.default_archs[platform])
+ rubyc_bs_flags = bs_files.map { |x| "--uses-bs \"" + x + "\" " }.join(' ')
+
+ build_file = Proc.new do |files_build_dir, path|
+ rpath = path
+ path = File.expand_path(path)
+ if is_default_archs && !project_files.include?(path)
+ files_build_dir = File.expand_path(File.join(Builder.common_build_dir, files_build_dir))
+ end
+ obj = File.join(files_build_dir, "#{path}.o")
+ should_rebuild = (!File.exist?(obj) \
+ or File.mtime(path) > File.mtime(obj) \
+ or File.mtime(ruby) > File.mtime(obj))
+
+ # Generate or retrieve init function.
+ init_func = should_rebuild ? "MREP_#{`/usr/bin/uuidgen`.strip.gsub('-', '')}" : `#{config.locate_binary('nm')} \"#{obj}\"`.scan(/T\s+_(MREP_.*)/)[0][0]
+
+ if should_rebuild
+ App.info 'Compile', rpath
+ FileUtils.mkdir_p(File.dirname(obj))
+ arch_objs = []
+ archs.each do |arch|
+ # Locate arch kernel.
+ kernel = File.join(datadir, platform, "kernel-#{arch}.bc")
+ raise "Can't locate kernel file" unless File.exist?(kernel)
+
+ # Assembly.
+ asm = File.join(files_build_dir, "#{path}.#{arch}.s")
+ arm64 = false
+ compiler_exec_arch = case arch
+ when /^arm/
+ (arm64 = (arch == 'arm64')) ? 'x86_64' : 'i386'
+ else
+ arch
+ end
+ sh "/usr/bin/env VM_PLATFORM=\"#{platform}\" VM_KERNEL_PATH=\"#{kernel}\" VM_OPT_LEVEL=\"#{config.opt_level}\" /usr/bin/arch -arch #{compiler_exec_arch} #{ruby} #{rubyc_bs_flags} --emit-llvm \"#{asm}\" #{init_func} \"#{path}\""
+
+ # Object
+ arch_obj = File.join(files_build_dir, "#{path}.#{arch}.o")
+ if arm64
+ # At the time of this writing Apple hasn't yet contributed the source code of the LLVM backend for the "arm64" architecture, so the RubyMotion compiler can't emit proper assembly yet. We work around this limitation by generating bitcode instead and giving it to the linker. Ugly but should be temporary (right?).
+ @dummy_object_file ||= begin
+ src_path = '/tmp/__dummy_object_file__.c'
+ obj_path = '/tmp/__dummy_object_file__.o'
+ File.open(src_path, 'w') { |io| io.puts "static int foo(void) { return 42; }" }
+ sh "#{cc} -c #{src_path} -o #{obj_path} -arch arm64 -miphoneos-version-min=7.0"
+ obj_path
+ end
+ ld_path = File.join(App.config.xcode_dir, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld')
+ sh "#{ld_path} \"#{asm}\" \"#{@dummy_object_file}\" -arch arm64 -r -o \"#{arch_obj}\""
+ else
+ sh "#{cc} -fexceptions -c -arch #{arch} \"#{asm}\" -o \"#{arch_obj}\""
+ end
+
+ [asm].each { |x| File.unlink(x) } unless ENV['keep_temps']
+ arch_objs << arch_obj
+ end
+
+ # Assemble fat binary.
+ arch_objs_list = arch_objs.map { |x| "\"#{x}\"" }.join(' ')
+ sh "/usr/bin/lipo -create #{arch_objs_list} -output \"#{obj}\""
+ end
+
+ any_obj_file_built = true
+ [obj, init_func]
+ end
+
+ # Resolve file dependencies.
+ if config.detect_dependencies == true
+ config.dependencies = Dependency.new(config.files - config.exclude_from_detect_dependencies, config.dependencies).run
+ end
+
+ parallel = ParallelBuilder.new(objs_build_dir, build_file)
+ parallel.files = config.ordered_build_files
+ parallel.files += config.spec_files if config.spec_mode
+ parallel.run
+
+ objs = app_objs = parallel.objects
+ spec_objs = []
+ if config.spec_mode
+ app_objs = objs[0...config.ordered_build_files.size]
+ spec_objs = objs[-(config.spec_files.size)..-1]
+ end
+
+ FileUtils.touch(objs_build_dir) if any_obj_file_built
+
+ # Generate init file.
+ init_txt = <
+
+extern "C" {
+ void ruby_sysinit(int *, char ***);
+ void ruby_init(void);
+ void ruby_init_loadpath(void);
+ void ruby_script(const char *);
+ void ruby_set_argv(int, char **);
+ void rb_vm_init_compiler(void);
+ void rb_vm_init_jit(void);
+ void rb_vm_aot_feature_provide(const char *, void *);
+ void *rb_vm_top_self(void);
+ void rb_define_global_const(const char *, void *);
+ void rb_rb2oc_exc_handler(void);
+ void rb_exit(int);
+EOS
+ app_objs.each do |_, init_func|
+ init_txt << "void #{init_func}(void *, void *);\n"
+ end
+ init_txt << < 0) {
+ const char *progname = argv[0];
+ ruby_script(progname);
+ }
+#if !__LP64__
+ try {
+#endif
+ void *self = rb_vm_top_self();
+EOS
+ init_txt << config.define_global_env_txt
+
+ unless target_frameworks.empty?
+ init_txt << "NSString *frameworks_path = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @\"../../Frameworks\"];\n"
+ target_frameworks.each do |framework|
+ init_txt << "[[NSBundle bundleWithPath: [frameworks_path stringByAppendingPathComponent: @\"#{framework}\"]] load];\n"
+ end
+ end
+
+ app_objs.each do |_, init_func|
+ init_txt << "#{init_func}(self, 0);\n"
+ end
+ init_txt << < File.mtime(main_exec) \
+ or objs.any? { |path, _| File.mtime(path) > File.mtime(main_exec) } \
+ or File.mtime(main_o) > File.mtime(main_exec) \
+ or vendor_libs.any? { |lib| File.mtime(lib) > File.mtime(main_exec) } \
+ or File.mtime(librubymotion) > File.mtime(main_exec)
+ App.info 'Link', main_exec
+ objs_list = objs.map { |path, _| path }.unshift(init_o, main_o, *config.frameworks_stubs_objects(platform)).map { |x| "\"#{x}\"" }.join(' ')
+ framework_search_paths = config.framework_search_paths.uniq.map { |x| "-F '#{File.expand_path(x)}'" }.join(' ')
+ frameworks = config.frameworks_dependencies.map { |x| "-framework #{x}" }.join(' ')
+ weak_frameworks = config.weak_frameworks.map { |x| "-weak_framework #{x}" }.join(' ')
+ vendor_libs = config.vendor_projects.inject([]) do |libs, vendor_project|
+ libs << vendor_project.libs.map { |x|
+ (vendor_project.opts[:force_load] ? '-force_load ' : '-ObjC ') + "\"#{x}\""
+ }
+ end.join(' ')
+ linker_option = begin
+ m = config.deployment_target.match(/(\d+)/)
+ if m[0].to_i < 7
+ "-stdlib=libstdc++"
+ end
+ end || ""
+ sh "#{cxx} -o \"#{main_exec}\" #{objs_list} #{config.ldflags(platform)} -L#{File.join(datadir, platform)} -lrubymotion-static -lobjc -licucore #{linker_option} #{framework_search_paths} #{frameworks} #{weak_frameworks} #{config.libs.join(' ')} #{vendor_libs}"
+ main_exec_created = true
+ end
+
+ # Compile IB resources.
+ config.resources_dirs.each do |dir|
+ if File.exist?(dir)
+ ib_resources = []
+ ib_resources.concat((Dir.glob(File.join(dir, '**', '*.xib')) + Dir.glob(File.join(dir, '*.lproj', '*.xib'))).map { |xib| [xib, xib.sub(/\.xib$/, '.nib')] })
+ ib_resources.concat(Dir.glob(File.join(dir, '**', '*.storyboard')).map { |storyboard| [storyboard, storyboard.sub(/\.storyboard$/, '.storyboardc')] })
+ ib_resources.each do |src, dest|
+ if !File.exist?(dest) or File.mtime(src) > File.mtime(dest)
+ App.info 'Compile', src
+ sh "/usr/bin/ibtool --compile \"#{dest}\" \"#{src}\""
+ end
+ end
+ end
+ end
+
+ preserve_resources = []
+
+ # Compile Asset Catalog bundles.
+ assets_bundles = config.assets_bundles
+ unless assets_bundles.empty?
+ app_icons_asset_bundle = config.app_icons_asset_bundle
+ if app_icons_asset_bundle
+ app_icons_info_plist_path = config.app_icons_info_plist_path(platform)
+ app_icons_options = "--output-partial-info-plist \"#{app_icons_info_plist_path}\" " \
+ "--app-icon \"#{config.app_icon_name_from_asset_bundle}\""
+ end
+
+ App.info 'Compile', assets_bundles.join(", ")
+ app_resources_dir = File.expand_path(config.app_resources_dir(platform))
+ FileUtils.mkdir_p(app_resources_dir)
+ cmd = "\"#{config.xcode_dir}/usr/bin/actool\" --output-format human-readable-text " \
+ "--notices --warnings --platform #{config.deploy_platform.downcase} " \
+ "--minimum-deployment-target #{config.deployment_target} " \
+ "#{Array(config.device_family).map { |d| "--target-device #{d}" }.join(' ')} " \
+ "#{app_icons_options} --compress-pngs --compile \"#{app_resources_dir}\" " \
+ "\"#{assets_bundles.map { |f| File.expand_path(f) }.join('" "')}\""
+ $stderr.puts(cmd) if App::VERBOSE
+ actool_output = `#{cmd} 2>&1`
+ $stderr.puts(actool_output) if App::VERBOSE
+
+ # Split output in warnings and compiled files
+ actool_output, actool_compilation_results = actool_output.split('/* com.apple.actool.compilation-results */')
+ actool_compiled_files = actool_compilation_results.strip.split("\n")
+ if actool_document_warnings = actool_output.split('/* com.apple.actool.document.warnings */').last
+ # Propagate warnings to the user.
+ actool_document_warnings.strip.split("\n").each { |w| App.warn(w) }
+ end
+
+ # Remove the partial Info.plist line and preserve all other assets.
+ actool_compiled_files.delete(app_icons_info_plist_path) if app_icons_asset_bundle
+ preserve_resources.concat(actool_compiled_files.map { |f| File.basename(f) })
+
+ config.configure_app_icons_from_asset_bundle(platform) if app_icons_asset_bundle
+ end
+
+ # Compile CoreData Model resources and SpriteKit atlas files.
+ config.resources_dirs.each do |dir|
+ if File.exist?(dir)
+ Dir.glob(File.join(dir, '*.xcdatamodeld')).each do |model|
+ momd = model.sub(/\.xcdatamodeld$/, '.momd')
+ if !File.exist?(momd) or File.mtime(model) > File.mtime(momd)
+ App.info 'Compile', model
+ model = File.expand_path(model) # momc wants absolute paths.
+ momd = File.expand_path(momd)
+ sh "\"#{App.config.xcode_dir}/usr/bin/momc\" \"#{model}\" \"#{momd}\""
+ end
+ end
+ if cmd = config.spritekit_texture_atlas_compiler
+ Dir.glob(File.join(dir, '*.atlas')).each do |atlas|
+ if File.directory?(atlas)
+ App.info 'Compile', atlas
+ sh "\"#{cmd}\" \"#{atlas}\" \"#{bundle_path}\""
+ end
+ end
+ end
+ end
+ end
+
+ # Create bundle/Info.plist.
+ bundle_info_plist = File.join(bundle_path, 'Info.plist')
+ if !File.exist?(bundle_info_plist) or File.mtime(config.project_file) > File.mtime(bundle_info_plist)
+ App.info 'Create', bundle_info_plist
+ File.open(bundle_info_plist, 'w') { |io| io.write(config.info_plist_data(platform)) }
+ sh "/usr/bin/plutil -convert binary1 \"#{bundle_info_plist}\""
+ end
+
+ # Copy resources, handle subdirectories.
+ app_resources_dir = config.app_resources_dir(platform)
+ FileUtils.mkdir_p(app_resources_dir)
+ reserved_app_bundle_files = [
+ '_CodeSignature/CodeResources', 'CodeResources', 'embedded.mobileprovision',
+ 'Info.plist', 'PkgInfo', 'ResourceRules.plist',
+ convert_filesystem_encoding(config.name)
+ ]
+ resources_exclude_extnames = ['.xib', '.storyboard', '.xcdatamodeld', '.atlas', '.xcassets']
+ resources_paths = []
+ config.resources_dirs.each do |dir|
+ if File.exist?(dir)
+ resources_paths << Dir.chdir(dir) do
+ Dir.glob('**{,/*/**}/*').reject do |x|
+ # Find files with extnames to exclude or files inside bundles to
+ # exclude (e.g. xcassets).
+ File.extname(x) == '.lproj' ||
+ resources_exclude_extnames.include?(File.extname(x)) ||
+ resources_exclude_extnames.include?(File.extname(x.split('/').first))
+ end.map { |file| File.join(dir, file) }
+ end
+ end
+ end
+ resources_paths.flatten!
+ resources_paths.each do |res_path|
+ res = path_on_resources_dirs(config.resources_dirs, res_path)
+ if reserved_app_bundle_files.include?(res)
+ App.fail "Cannot use `#{res_path}' as a resource file because it's a reserved application bundle file"
+ end
+ dest_path = File.join(app_resources_dir, res)
+ copy_resource(res_path, dest_path)
+ end
+
+ # Compile all .strings files
+ Dir.glob(File.join(app_resources_dir, '{,**/}*.strings')).each do |strings_file|
+ compile_resource_to_binary_plist(strings_file)
+ end
+
+ # Optional support for #eval (OSX-only).
+ if config.respond_to?(:eval_support) and config.eval_support
+ repl_dylib_path = File.join(datadir, '..', 'librubymotion-repl.dylib')
+ dest_path = File.join(app_resources_dir, File.basename(repl_dylib_path))
+ copy_resource(repl_dylib_path, dest_path)
+ preserve_resources << File.basename(repl_dylib_path)
+ end
+
+ # Delete old resource files.
+ resources_files = resources_paths.map { |x| path_on_resources_dirs(config.resources_dirs, x) }
+ Dir.chdir(app_resources_dir) do
+ Dir.glob('*').each do |bundle_res|
+ next if File.directory?(bundle_res)
+ next if reserved_app_bundle_files.include?(bundle_res)
+ next if resources_files.include?(bundle_res)
+ next if preserve_resources.include?(File.basename(bundle_res))
+ App.warn "File `#{bundle_res}' found in app bundle but not in resource directories, removing"
+ FileUtils.rm_rf(bundle_res)
+ end
+ end
+
+ # Generate dSYM.
+ dsym_path = config.app_bundle_dsym(platform)
+ if !File.exist?(dsym_path) or File.mtime(main_exec) > File.mtime(dsym_path)
+ App.info "Create", dsym_path
+ sh "/usr/bin/dsymutil \"#{main_exec}\" -o \"#{dsym_path}\""
+ end
+
+ # Strip all symbols. Only in distribution mode.
+ if main_exec_created and (config.distribution_mode or ENV['__strip__'])
+ App.info "Strip", main_exec
+ sh "#{config.locate_binary('strip')} #{config.strip_args} \"#{main_exec}\""
+ end
+ end
+ end
+end; end
diff --git a/lib/motion/project/template/ios-file-provider/files/Rakefile.erb b/lib/motion/project/template/ios-file-provider/files/Rakefile.erb
index fd8c719b..a3791dc4 100644
--- a/lib/motion/project/template/ios-file-provider/files/Rakefile.erb
+++ b/lib/motion/project/template/ios-file-provider/files/Rakefile.erb
@@ -1,13 +1,24 @@
# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project/template/ios-extension'
+
+begin
+ require 'bundler'
+ Bundler.require
+rescue LoadError
+end
Motion::Project::App.setup do |app|
# Use `rake config' to see complete project settings.
- app.extension do |ext|
- ext.name = '<%= extension_name %>'
- ext.type = "fileprovider-nonui"
- # TODO: its not inside attributes!
- ext.attributes = {
- "NSExtensionFileProviderDocumentGroup" => "group.sdf.Extension-Test"
- }
- end
+ app.name = '<%= name %>'
+ app.info_plist['NSExtension'] = {
+ 'NSExtensionAttributes' => {
+ "NSExtensionFileProviderDocumentGroup" => "<%= name %>"
+ },
+ 'NSExtensionPrincipalClass' => 'FileProvider',
+ 'NSExtensionPointIdentifier' => 'com.apple.fileprovider-nonui'
+ }
+ app.entitlements['com.apple.security.application-groups'] = '<%= name %>'
end
+
+
diff --git a/lib/motion/project/template/ios-file-provider/files/documentFileProvider.entitlements b/lib/motion/project/template/ios-file-provider/files/documentFileProvider.entitlements
deleted file mode 100644
index 632d21b1..00000000
--- a/lib/motion/project/template/ios-file-provider/files/documentFileProvider.entitlements
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- com.apple.security.application-groups
-
- group.sdf.Extension-Test
-
-
-
diff --git a/lib/motion/project/template/ios-photo-editing/files/.gitignore b/lib/motion/project/template/ios-photo-editing/files/.gitignore
new file mode 100644
index 00000000..ae6aa4dd
--- /dev/null
+++ b/lib/motion/project/template/ios-photo-editing/files/.gitignore
@@ -0,0 +1,17 @@
+.repl_history
+build
+tags
+app/pixate_code.rb
+resources/*.nib
+resources/*.momd
+resources/*.storyboardc
+.DS_Store
+nbproject
+.redcar
+#*#
+*~
+*.sw[po]
+.eprj
+.sass-cache
+.idea
+.dat*.*
diff --git a/lib/motion/project/template/ios-photo-editing/files/Gemfile b/lib/motion/project/template/ios-photo-editing/files/Gemfile
new file mode 100644
index 00000000..764be634
--- /dev/null
+++ b/lib/motion/project/template/ios-photo-editing/files/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+# Add your dependencies here:
diff --git a/lib/motion/project/template/ios-photo-editing/files/Rakefile.erb b/lib/motion/project/template/ios-photo-editing/files/Rakefile.erb
index 03c1e89f..172422cf 100644
--- a/lib/motion/project/template/ios-photo-editing/files/Rakefile.erb
+++ b/lib/motion/project/template/ios-photo-editing/files/Rakefile.erb
@@ -1,14 +1,23 @@
# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project/template/ios-extension'
+
+begin
+ require 'bundler'
+ Bundler.require
+rescue LoadError
+end
Motion::Project::App.setup do |app|
# Use `rake config' to see complete project settings.
- app.extension do |ext|
- ext.name = '<%= extension_name %>'
- ext.type = "photo-editing"
- ext.attributes = {
+ app.name = '<%= name %>'
+ app.frameworks << "Photos"
+ app.frameworks << "PhotosUI"
+ app.info_plist['NSExtension'] = {
+ 'NSExtensionAttributes' => {
"PHSupportedMediaTypes" => ["Image"]
- }
- ext.frameworks << "Photos"
- ext.frameworks << "PhotosUI"
- end
-end
+ },
+ 'NSExtensionPrincipalClass' => 'PhotoEditingViewController',
+ 'NSExtensionPointIdentifier' => 'com.apple.photo-editing'
+ }
+end
\ No newline at end of file
diff --git a/lib/motion/project/template/ios-photo-editing/files/app/photo_editing_view_controller.rb b/lib/motion/project/template/ios-photo-editing/files/app/photo_editing_view_controller.rb
index cc42d8e3..c6d001eb 100644
--- a/lib/motion/project/template/ios-photo-editing/files/app/photo_editing_view_controller.rb
+++ b/lib/motion/project/template/ios-photo-editing/files/app/photo_editing_view_controller.rb
@@ -4,7 +4,18 @@ class PhotoEditingViewController < UIViewController
def viewDidLoad
super
- # Do any additional setup after loading the view.
+
+ self.view.backgroundColor = UIColor.whiteColor
+
+ label = UILabel.alloc.init
+ label.text = "Hello World"
+ label.textColor = UIColor.blackColor
+ label.textAlignment = NSTextAlignmentCenter
+ label.setTranslatesAutoresizingMaskIntoConstraints(false)
+ self.view.addSubview(label)
+
+ self.view.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("|-[label]-|", options:0, metrics:nil, views:{"label" => label}))
+ self.view.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("V:|-[label]-|", options:0, metrics:nil, views:{"label" => label}))
end
def didReceiveMemoryWarning
diff --git a/lib/motion/project/template/ios-share-extension/files/.gitignore b/lib/motion/project/template/ios-share-extension/files/.gitignore
new file mode 100644
index 00000000..ae6aa4dd
--- /dev/null
+++ b/lib/motion/project/template/ios-share-extension/files/.gitignore
@@ -0,0 +1,17 @@
+.repl_history
+build
+tags
+app/pixate_code.rb
+resources/*.nib
+resources/*.momd
+resources/*.storyboardc
+.DS_Store
+nbproject
+.redcar
+#*#
+*~
+*.sw[po]
+.eprj
+.sass-cache
+.idea
+.dat*.*
diff --git a/lib/motion/project/template/ios-share-extension/files/Gemfile b/lib/motion/project/template/ios-share-extension/files/Gemfile
new file mode 100644
index 00000000..764be634
--- /dev/null
+++ b/lib/motion/project/template/ios-share-extension/files/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+# Add your dependencies here:
diff --git a/lib/motion/project/template/ios-share-extension/files/Rakefile.erb b/lib/motion/project/template/ios-share-extension/files/Rakefile.erb
index ec350838..466fb094 100644
--- a/lib/motion/project/template/ios-share-extension/files/Rakefile.erb
+++ b/lib/motion/project/template/ios-share-extension/files/Rakefile.erb
@@ -1,15 +1,31 @@
# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project/template/ios-extension'
+
+begin
+ require 'bundler'
+ Bundler.require
+rescue LoadError
+end
Motion::Project::App.setup do |app|
# Use `rake config' to see complete project settings.
- app.extension do |ext|
- ext.name = '<%= extension_name %>'
- ext.type = "share-services"
- ext.attributes = {
- "NSExtensionActivationRule" => "TRUEPREDICATE"
- "NSExtensionPointName" => "1.0"
- "NSExtensionPointVersion" => "1.0"
- }
- ext.frameworks << "MobileCoreServices"
- end
+ app.name = '<%= name %>'
+ app.frameworks << 'Social'
+ app.info_plist['NSExtension'] = {
+ 'NSExtensionAttributes' => {
+ 'NSExtensionActivationRule' => {
+ 'NSExtensionActivationSupportsFileWithMaxCount' => 0,
+ 'NSExtensionActivationSupportsImageWithMaxCount' => 1,
+ 'NSExtensionActivationSupportsMovieWithMaxCount' => 0,
+ 'NSExtensionActivationSupportsText' => false,
+ 'NSExtensionActivationSupportsWebURLWithMaxCount' => 0
+ },
+ 'NSExtensionPointName' => 'com.apple.share-services',
+ 'NSExtensionPointVersion' => '1.0'
+ },
+ 'NSExtensionPrincipalClass' => 'ShareViewController',
+ 'NSExtensionPointIdentifier' => 'com.apple.share-services'
+ }
end
+
diff --git a/lib/motion/project/template/ios-today-extension/files/Rakefile.erb b/lib/motion/project/template/ios-today-extension/files/Rakefile.erb
index e51dd8b0..04480220 100644
--- a/lib/motion/project/template/ios-today-extension/files/Rakefile.erb
+++ b/lib/motion/project/template/ios-today-extension/files/Rakefile.erb
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
$:.unshift("/Library/RubyMotion/lib")
-require 'motion/project/template/ios-extension.rb'
+require 'motion/project/template/ios-extension'
begin
require 'bundler'