Allow configurations to be reconfigured for pulling in source list changes after initial config pass

phausler · phausler · commit d9cf62b023c9 · 2015-12-04T14:01:26.000-08:00
After building from a full swift project build a configuration file is emitted to store the settings used for this build pass. When iterating with adding files or changing flags the ninja target `reconfigure` should be run to re-invoke the configure script to pick up on new changes to build.py
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@ project.xcworkspace
 
 Build
 .build
+.configuration
 
diff --git a/configure b/configure
@@ -44,6 +44,68 @@ from lib.workspace import Workspace
 
 import sys
 
+def reconfigure(config, path):
+    with open(path, 'r') as infile:
+        info = json.load(infile)
+        if 'version' in info and info['version'] == config.version:
+            if 'command' in info:
+                config.command = info['command']
+            if 'project' in info:
+                config.command = info['project']
+            if 'script_path' in info:
+                config.script_path = Path(info['script_path'])
+            if 'build_script_path' in info:
+                config.build_script_path = Path(info['build_script_path'])
+            if 'source_root' in info:
+                config.source_root = Path(info['source_root'])
+            if 'target' in info:
+                config.target = Target(info['target'])
+            if 'system_root' in info:
+                config.system_root = Path(info['system_root'])
+            if 'toolchain' in info:
+                config.toolchain = info['toolchain']
+            if 'build_directory' in info:
+                config.build_directory = Path(info['build_directory'])
+            if 'intermediate_directory' in info:
+                config.intermediate_directory = Path(info['intermediate_directory'])
+            if 'module_cache_directory' in info:
+                config.module_cache_directory = Path(info['module_cache_directory'])
+            if 'install_directory' in info:
+                config.install_directory = Path(info['install_directory'])
+            if 'prefix' in info:
+                config.prefix = info['prefix']
+            if 'swift_install' in info:
+                config.swift_install = info['swift_install']
+            if 'clang' in info:
+                config.clang = info['clang']
+            if 'clangxx' in info:
+                config.clangxx = info['clangxx']
+            if 'swift' in info:
+                config.swift = info['swift']
+            if 'swiftc' in info:
+                config.swiftc = info['swiftc']
+            if 'ar' in info:
+                config.ar = info['ar']
+            if 'swift_sdk' in info:
+                config.swift_sdk = info['swift_sdk']
+            if 'bootstrap_directory' in info:
+                config.bootstrap_directory = Path(info['bootstrap_directory'])
+            if 'verbose' in info:
+                config.verbose = info['verbose']
+            if 'extra_c_flags' in info:
+                config.extra_c_flags = info['extra_c_flags']
+            if 'extra_swift_flags' in info:
+                config.extra_swift_flags = info['extra_swift_flags']
+            if 'extra_ld_flags' in info:
+                config.extra_ld_flags = info['extra_ld_flags']
+            if 'build_mode' in info:
+                config.build_mode = info['build_mode']
+            if 'variables' in info:
+                config.variables = info['variables']
+        else:
+            sys.exit("invalid version")
+
+
 def main():
     config = Configuration()
     CWD                           = Path.path(os.getcwd())
@@ -64,49 +126,56 @@ def main():
     config.swift_sdk              = os.getenv("SDKROOT", None)
     config.script_path            = config.source_root.path_by_appending("build.py")
     config.build_script_path      = config.source_root.path_by_appending("build.ninja")
+    config.config_path            = config.source_root.path_by_appending(".configuration")
 
     parser = argparse.ArgumentParser(description='Configure and emit ninja build scripts for building.')
     parser.add_argument('--target', dest='target', type=str, default=Target.default())
     parser.add_argument('--sysroot', dest='sysroot', type=str, default=None)
     parser.add_argument('--toolchain', dest='toolchain', type=str, default=None)
     parser.add_argument('--bootstrap', dest='bootstrap', type=str, default=os.path.join(os.path.dirname(os.path.abspath(__file__)), "bootstrap"))
+    parser.add_argument('--reconfigure', dest='reconfigure', action="store_true")
     parser.add_argument('-v', '--verbose', dest='verbose', action="store_true")
     args, extras = parser.parse_known_args()
-
-    config.build_mode = Configuration.Debug # by default build in debug mode
-
-    for arg in extras:
-        if arg.lower() == 'debug':
-            config.build_mode = Configuration.Debug
-        elif arg.lower() == 'release':
-            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:]
-
-    config.target = Target(args.target)
-
-    config.system_root = Path.path(args.sysroot)
-    if config.target.sdk == OSType.MacOSX and config.system_root is None and Target(Target.default()).sdk == OSType.MacOSX:
-        import subprocess
-        config.system_root = Path.path(subprocess.Popen(['xcrun', '--show-sdk-path'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate()[0])
-        swift_path = Path.path(subprocess.Popen(['xcrun', '--find', 'swift'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate()[0]).parent().parent()
-        config.swift_sdk = swift_path.absolute()
-    elif config.swift_sdk is None:
-        config.swift_sdk = "/usr"
-    config.toolchain = Path.path(args.toolchain)
-    config.bootstrap_directory = Path.path(args.bootstrap)
-    config.verbose = args.verbose
-    if config.toolchain is not None:
-        config.ar = os.path.join(config.toolchain.relative(), "bin", "ar")
-    elif config.ar is None:
-        config.ar = "ar"
-
+    
+    if args.reconfigure:
+        reconfigure(config, config.config_path.absolute())
+    else:
+        config.build_mode = Configuration.Debug # by default build in debug mode
+
+        for arg in extras:
+            if arg.lower() == 'debug':
+                config.build_mode = Configuration.Debug
+            elif arg.lower() == 'release':
+                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:]
+
+        config.target = Target(args.target)
+
+        config.system_root = Path.path(args.sysroot)
+        if config.target.sdk == OSType.MacOSX and config.system_root is None and Target(Target.default()).sdk == OSType.MacOSX:
+            import subprocess
+            config.system_root = Path.path(subprocess.Popen(['xcrun', '--show-sdk-path'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate()[0])
+            swift_path = Path.path(subprocess.Popen(['xcrun', '--find', 'swift'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate()[0]).parent().parent()
+            config.swift_sdk = swift_path.absolute()
+        elif config.swift_sdk is None:
+            config.swift_sdk = "/usr"
+        config.toolchain = Path.path(args.toolchain)
+        config.bootstrap_directory = Path.path(args.bootstrap)
+        config.verbose = args.verbose
+        if config.toolchain is not None:
+            config.ar = os.path.join(config.toolchain.relative(), "bin", "ar")
+        elif config.ar is None:
+            config.ar = "ar"
+
+    config.write(config.config_path.absolute())
     Configuration.current = config
 
     execfile(config.script_path.absolute())
 
+
 if __name__ == "__main__":
     main()
diff --git a/lib/config.py b/lib/config.py
@@ -7,9 +7,14 @@
 # See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 #
 
+import json
+
+from path import Path
+
 class Configuration:
     Debug = "debug"
     Release = "release"
+    version = 1
 
     command = None
     current = None
@@ -30,13 +35,50 @@ class Configuration:
     clangxx = None
     swift = None
     swiftc = None
+    ar = None
     swift_sdk = None
     bootstrap_directory = None
     verbose = False
     extra_c_flags = None
     extra_swift_flags = None
     extra_ld_flags = None
     build_mode = None
+    config_path = None # dont save this; else it would be recursive
     variables = {}
     def __init__(self):
-        pass
+        pass
+
+    def write(self, path):
+        info = {
+            'version' : self.version,
+            'command' : self.command,
+            'project' : self.project,
+            'script_path' : self.script_path.absolute(),
+            'build_script_path' : self.build_script_path.absolute(),
+            'source_root' : self.source_root.absolute(),
+            'target' : self.target.triple,
+            'system_root' : self.system_root.absolute(),
+            'toolchain' : self.toolchain,
+            'build_directory' : self.build_directory.absolute(),
+            'intermediate_directory' : self.intermediate_directory.absolute(),
+            'module_cache_directory' : self.module_cache_directory.absolute(),
+            'install_directory' : self.install_directory.absolute(),
+            'prefix' : self.prefix,
+            'swift_install' : self.swift_install,
+            'clang' : self.clang,
+            'clangxx' : self.clangxx,
+            'swift' : self.swift,
+            'swiftc' : self.swiftc,
+            'ar' : self.ar,
+            'swift_sdk' : self.swift_sdk,
+            'bootstrap_directory' : self.bootstrap_directory.absolute(),
+            'verbose' : self.verbose,
+            'extra_c_flags' : self.extra_c_flags,
+            'extra_swift_flags' : self.extra_swift_flags,
+            'extra_ld_flags' : self.extra_ld_flags,
+            'build_mode' : self.build_mode,
+            'variables' : self.variables,
+        }
+        with open(path, 'w+') as outfile:
+            json.dump(info, outfile)
+        
diff --git a/lib/script.py b/lib/script.py
@@ -213,7 +213,17 @@ def generate_products(self):
         for product in self.products:
             script += product.generate()
 
-        script += "\n\n"
+        script += """
+
+rule RunReconfigure
+    command = ./configure --reconfigure
+    description = Reconfiguring build script.
+
+build ${BUILD_DIR}/.reconfigure: RunReconfigure
+
+build reconfigure: phony | ${BUILD_DIR}/.reconfigure
+
+"""
         script += self.extra
         script += "\n\n"
 

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,5 @@ project.xcworkspace`
`15`	`15`
`16`	`16`	`Build`
`17`	`17`	`.build`
	`18`	`+.configuration`
`18`	`19`