Emit debugging and running information hints when building TestFoundation

Author: phausler

build.py

@@ -20,8 +20,6 @@
 	foundation.CFLAGS = '-DDEPLOYMENT_TARGET_MACOSX '
 	foundation.LDFLAGS = '-licucore -twolevel_namespace -Wl,-alias_list,CoreFoundation/Base.subproj/DarwinSymbolAliases -sectcreate __UNICODE __csbitmaps CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap -sectcreate __UNICODE __properties CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data CoreFoundation/CharacterSets/CFUnicodeData-L.mapping -segprot __UNICODE r r '
 
-foundation.SWIFTCFLAGS = ''
-
 # For now, we do not distinguish between public and private headers (they are all private to Foundation)
 # These are really part of CF, which should ultimately be a separate target
 foundation.ROOT_HEADERS_FOLDER_PATH = "/usr/lib/swift"
@@ -47,11 +45,21 @@
 	'-I./'
 ])
 
-foundation.SWIFTCFLAGS += " ".join([
+swift_cflags = [
 	'-I${BUILD_DIR}/Foundation/usr/lib/swift'
-])
+]
+
+if "XCTEST_BUILD_DIR" in Configuration.current.variables:
+	swift_cflags += [
+		'-I${XCTEST_BUILD_DIR}',
+		'-L${XCTEST_BUILD_DIR}',
+	]
+foundation.SWIFTCFLAGS = " ".join(swift_cflags)
 
-foundation.LDFLAGS += '-lpthread -ldl -lm -lswiftCore'
+foundation.LDFLAGS += '-lpthread -ldl -lm -lswiftCore '
+
+if "XCTEST_BUILD_DIR" in Configuration.current.variables:
+	foundation.LDFLAGS += '-L${XCTEST_BUILD_DIR}'
 
 headers = CopyHeaders(
 module = 'CoreFoundation/Base.subproj/linux.modulemap',
@@ -360,7 +368,7 @@
 
 script.add_product(foundation)
 
-script.add_text("""
+extra_script = """
 rule InstallFoundation
     command = mkdir -p "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $
     cp "${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX}" "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $
@@ -373,6 +381,31 @@
 build ${BUILD_DIR}/.install: InstallFoundation ${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX}
 
 build install: phony | ${BUILD_DIR}/.install
-""")
+
+"""
+if "XCTEST_BUILD_DIR" in Configuration.current.variables:
+	extra_script += """
+rule RunTestFoundation
+    command = echo "**** RUNNING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/:${XCTEST_BUILD_DIR} ${BUILD_DIR}/TestFoundation/TestFoundation\\n**** DEBUGGING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/:${XCTEST_BUILD_DIR} lldb ${BUILD_DIR}/TestFoundation/TestFoundation\\n"
+    description = Building Tests
+
+build ${BUILD_DIR}/.test: RunTestFoundation | TestFoundation
+
+build test: phony | ${BUILD_DIR}/.test
+
+"""
+else:
+	extra_script += """
+rule RunTestFoundation
+    command = echo "**** RUNNING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/ ${BUILD_DIR}/TestFoundation/TestFoundation\\n**** DEBUGGING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/ lldb ${BUILD_DIR}/TestFoundation/TestFoundation\\n"
+    description = Building Tests
+
+build ${BUILD_DIR}/.test: RunTestFoundation | TestFoundation
+
+build test: phony | ${BUILD_DIR}/.test
+
+"""
+
+script.add_text(extra_script)
 
 script.generate()

configure

@@ -73,16 +73,16 @@ def main():
     parser.add_argument('-v', '--verbose', dest='verbose', action="store_true")
     args, extras = parser.parse_known_args()
 
-    if len(extras) > 0:
-        mode = extras[0].lower()
-        if mode == 'debug':
+    config.build_mode = Configuration.Release # by default build a release mode
+
+    for arg in extras:
+        if arg == 'debug':
             config.build_mode = Configuration.Debug
-        elif mode == 'release':
+        elif arg == 'release':
             config.build_mode = Configuration.Release
-        if len(extras) > 1 or config.build_mode is None:
-            pass # fail here
-    else:
-        config.build_mode = Configuration.Release
+        elif arg.startswith('-D'): # accept -DNAME=value as extra parameters to the configuration of the build.ninja
+            key, val = arg[2:].split("=", 1)
+            config.variables[key] = val
 
     config.command = [os.path.abspath(__file__)] + sys.argv[1:]
 

lib/config.py

@@ -37,5 +37,6 @@ class Configuration:
     extra_swift_flags = None
     extra_ld_flags = None
     build_mode = None
+    variables = {}
     def __init__(self):
         pass

lib/phases.py

@@ -416,8 +416,7 @@ def generate(self):
 
         return """
 build """ + appName + """: SwiftExecutable """ + swiftSources + self.generate_dependencies() + """ """ + libDependencyName + """
-    flags = -I""" + Configuration.current.build_directory.path_by_appending(self.product.name).relative() + self.product.ROOT_HEADERS_FOLDER_PATH + " -I" + Configuration.current.build_directory.path_by_appending(self.product.name).relative() + " -L" + Configuration.current.build_directory.path_by_appending(self.product.name).relative() + """
-
+    flags = -I""" + Configuration.current.build_directory.path_by_appending(self.product.name).relative() + self.product.ROOT_HEADERS_FOLDER_PATH + " -I" + Configuration.current.build_directory.path_by_appending(self.product.name).relative() + " -L" + Configuration.current.build_directory.path_by_appending(self.product.name).relative() + " " + TargetConditional.value(self.product.SWIFTCFLAGS) + """
 build """ + self.executableName + """: phony | """ + appName + """
 """
 

lib/script.py

@@ -30,6 +30,10 @@ def add_text(self, text):
         self.extra += text + "\n\n"
 
     def generate_products(self):
+        variables = ""
+        for key, val in Configuration.current.variables.iteritems():
+            variables += key + "=" + val
+        variables += "\n"
         verbose_flags = """
 VERBOSE_FLAGS = """ 
         if Configuration.current.verbose:
@@ -148,7 +152,7 @@ def generate_products(self):
 AR_FLAGS              = rcs
 """
 
-        flags = verbose_flags + base_flags + c_flags + swift_flags + cxx_flags + ld_flags + ar_flags
+        flags = variables + verbose_flags + base_flags + c_flags + swift_flags + cxx_flags + ld_flags + ar_flags
 
         cp_command = """
 rule Cp