Build using the .xcworkspace to let xcodebuild find the WTF.a depende…

…ncy automatically
CLARKYJ · Jan 17, 2014 · d36612a · d36612a
1 parent 9fa1244
commit d36612a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/make.py b/make.py
@@ -21,14 +21,11 @@ class PebbleKitiOSException (Exception):
 def build(out, derived_data_path):
  outdir = out if out else tempfile.mkdtemp()
 
- wtf = FrameworkBuild("WTF/WTF.xcodeproj",
- "WTF iOS", "Production", outdir, name="wtf",
- derived_data_path=derived_data_path)
- wtf.build()
-
- jsc = FrameworkBuild("JavaScriptCore/JavaScriptCore.xcodeproj",
- "JavaScriptCore iOS", "Production", outdir,
+ jsc = FrameworkBuild(workspace="JavaScriptCore-iOS.xcworkspace",
+ scheme="JavaScriptCore-iOS",
  name="JavaScriptCore",
+ conf="Production",
+ outdir=outdir,
  derived_data_path=derived_data_path)
  jsc.build()
 

diff --git a/xcodebuild.py b/xcodebuild.py
@@ -118,8 +118,9 @@ def public_headers_path(self):
 
 
 class FrameworkBuild(object):
- def __init__(self, project, scheme=None, conf="Release", outdir=None,
- name=None, derived_data_path=None):
+ def __init__(self, project=None, workspace=None, scheme=None,
+ conf="Release", outdir=None, name=None,
+ derived_data_path=None):
  self.scheme = scheme
  self.name = name
  self.devicebuild = XcodeBuild(project,