From 04b7fb608650805fb0ea8e1f134000a3b6808b48 Mon Sep 17 00:00:00 2001
From: Simon <simwarg@gmail.com>
Date: Mon, 18 Jul 2016 13:57:23 +0200
Subject: [PATCH] Updated docs for xcode6 tool. Also, xcode6 tool tested for
 XCode 7 (successfully)

---
 demos/xcode6/wscript    | 16 ++++++++++------
 waflib/extras/xcode6.py |  6 ++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/demos/xcode6/wscript b/demos/xcode6/wscript
index 8804fce8..9126673b 100644
--- a/demos/xcode6/wscript
+++ b/demos/xcode6/wscript
@@ -7,32 +7,36 @@ VERSION = '1.0'
 """
 This demo will create an XCode project containing
 an App bundle target, a dynamic library target,
-a static library target and an executable target
+a static library target and an executable target.
+The generated XCode project can then be opened
+and XCode can build those targets.
+Tested in XCode 6 & 7.
 """
 
 def configure(conf):
 	
 	conf.env.FRAMEWORK_VERSION = '1.0'
 	conf.env.ARCHS = 'x86_64'
-	conf.env.MACOSX_DEPLOYMENT_TARGET = '10.9'
-	conf.env.SDKROOT = 'macosx10.9'
+	conf.env.INSTALL_PATH = '/my/install/path'
 
+	# This must be called at the end of configure()
 	conf.load('xcode6')
 
 def build(bld):
-
+	bld.load('xcode6')
 	tg = bld.framework(
 		includes='include',
 
 		# Specify source files.
+		# This will become the groups (folders) inside XCode.
 		# Give a dictionary to group by name. Use a list to add everything in one 
 		source_files={
 			'MyLibSource': bld.path.ant_glob('src/MyLib/*.cpp|*.m|*.mm'),
 			'Include': bld.path.ant_glob(incl=['include/MyLib/*.h', 'include'], dir=True)
 		},
 
-		# export_headers will put the files in the Header
-		# buildphase in Xcode - i.e ship them with your .framework
+		# export_headers will put the files in the
+		# 'Header Build Phase' in Xcode - i.e tell XCode to ship them with your .framework
 		export_headers=bld.path.ant_glob(incl=['include/MyLib/*.h', 'include/MyLib/SupportLib'], dir=True),
 		target='MyLib',
 		install='~/Library/Frameworks'
diff --git a/waflib/extras/xcode6.py b/waflib/extras/xcode6.py
index ac161320..e0f9b836 100644
--- a/waflib/extras/xcode6.py
+++ b/waflib/extras/xcode6.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 # encoding: utf-8
-# XCode 3/XCode 4 generator for Waf
+# XCode 3/XCode 4/XCode 6/Xcode 7 generator for Waf
 # Based on work by Nicolas Mercier 2011
 # Extended by Simon Warg 2015, https://github.com/mimon
 # XCode project file format based on http://www.monobjc.net/xcode-project-file-format.html
@@ -48,7 +48,9 @@ def build(bld):
 
 	# You can also make bld.dylib, bld.app, bld.stlib ...
 
-$ waf configure xcode6
+# To generate your XCode project, open the folder with the wscript
+# in your terminal and run the following:
+# $ waf configure xcode6
 """
 
 # TODO: support iOS projects