Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: HipByte/RubyMotion
base: d6f37b045a
...
head fork: HipByte/RubyMotion
compare: fca66307a7
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
2  lib/motion/project/builder.rb
@@ -72,7 +72,7 @@ def build(config, platform, opts)
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]
+ 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
View
12 lib/motion/project/config.rb
@@ -60,6 +60,7 @@ def relpath(path)
def initialize(project_dir, build_mode)
@project_dir = project_dir
@files = Dir.glob(File.join(project_dir, 'app/**/*.rb'))
+ @info_plist = {}
@dependencies = {}
@frameworks = ['UIKit', 'Foundation', 'CoreGraphics']
@weak_frameworks = []
@@ -549,7 +550,11 @@ def status_bar_style_const
end
def info_plist
- @info_plist ||= {
+ @info_plist
+ end
+
+ def info_plist_data
+ info_plist.merge!({
'BuildMachineOSBuild' => `sw_vers -buildVersion`.strip,
'MinimumOSVersion' => deployment_target,
'CFBundleDevelopmentRegion' => 'en',
@@ -584,10 +589,7 @@ def info_plist
'DTPlatformVersion' => '5.1',
'DTXcodeBuild' => '4E1019',
'DTPlatformBuild' => '9B176'
- }
- end
-
- def info_plist_data
+ })
Motion::PropertyList.to_s(info_plist)
end
View
2  lib/motion/project/vendor.rb
@@ -159,7 +159,7 @@ def build_xcode(platform, opts)
xcopts = ''
xcopts << "-target \"#{target}\" " if target
xcopts << "-scheme \"#{scheme}\" " if scheme
- sh "/usr/bin/xcodebuild -project \"#{xcodeproj}\" #{xcopts} -configuration \"#{configuration}\" -sdk #{platform.downcase}#{@config.sdk_version} #{@config.arch_flags(platform)} CONFIGURATION_BUILD_DIR=build build"
+ sh "/usr/bin/xcodebuild -project \"#{xcodeproj}\" #{xcopts} -configuration \"#{configuration}\" -sdk #{platform.downcase}#{@config.sdk_version} #{@config.arch_flags(platform)} CONFIGURATION_BUILD_DIR=build IPHONEOS_DEPLOYMENT_TARGET=#{@config.deployment_target} build"
# Copy .a files into the platform build directory.
prods = opts.delete(:products)

No commit comments for this range

Something went wrong with that request. Please try again.