add a phony artifact for installation via a ninja target

remove the old install script since the ninja script now can properly install the products

Author: phausler

build.py

@@ -359,4 +359,19 @@
 
 script.add_product(foundation)
 
+script.add_text("""
+rule InstallFoundation
+    command = mkdir -p "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $
+    cp "${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX}" "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $
+    mkdir -p "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}"; $
+    cp "${BUILD_DIR}/Foundation/Foundation.swiftmodule" "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}/"; $
+    cp "${BUILD_DIR}/Foundation/Foundation.swiftdoc" "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}/"; $
+    mkdir -p "${DSTROOT}/${PREFIX}/local/include"; $
+    rsync -r "${BUILD_DIR}/Foundation/${PREFIX}/lib/swift/CoreFoundation" "${DSTROOT}/${PREFIX}/lib/swift/"
+
+build ${BUILD_DIR}/.install: InstallFoundation ${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX}
+
+build install: phony | ${BUILD_DIR}/.install
+""")
+
 script.generate()

configure

@@ -51,6 +51,7 @@ def main():
     config.module_cache_directory = Path.path(os.getenv("BUILD_DIR", config.build_directory.path_by_appending("ModuleCache")))
     config.intermediate_directory = Path.path(os.getenv("INTERMEDIATE_DIR", config.build_directory.path_by_appending("Intermediates")))
     config.install_directory      = Path.path(os.getenv("DSTROOT", "/"))
+    config.prefix                 = os.getenv("PREFIX", "/usr")
     config.clang                  = os.getenv("CLANG", "clang")
     config.clangxx                = os.getenv("CLANGXX", "clang")
     config.swift                  = os.getenv("SWIFT", "swift")

install

@@ -24,6 +24,7 @@ class Configuration:
     intermediate_directory = None
     module_cache_directory = None
     install_directory = None
+    prefix = None
     swift_install = None
     clang = None
     clangxx = None

lib/config.py

@@ -13,6 +13,8 @@
 class Script:
     products = []
     workspaces = []
+    extra = ""
+
     def __init__(self):
         pass
 
@@ -24,6 +26,8 @@ def add_workspace(self, workspace):
         self.products = None
         self.workspaces.append(workspace)
 
+    def add_text(self, text):
+        self.extra += text + "\n\n"
 
     def generate_products(self):
         verbose_flags = """
@@ -51,6 +55,11 @@ def generate_products(self):
 SWIFTC                = """ + Configuration.current.swiftc + """
 SDKROOT               = """ + Configuration.current.swift_sdk + """
 AR                    = """ + Configuration.current.ar + """
+OS                    = """ + Configuration.current.target.swift_sdk_name + """
+ARCH                  = """ + Configuration.current.target.swift_arch + """
+DYLIB_PREFIX          = """ + Configuration.current.target.dynamic_library_prefix + """
+DYLIB_SUFFIX          = """ + Configuration.current.target.dynamic_library_suffix + """
+PREFIX                = """ + Configuration.current.prefix + """
 """
         if Configuration.current.system_root is not None:
             base_flags += """
@@ -109,16 +118,18 @@ def generate_products(self):
         elif Configuration.current.build_mode == Configuration.Release:
             swift_flags += " "
 
+
+
         ld_flags = """
-TARGET_LDFLAGS       = --target=${TARGET} -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """ """
+EXTRA_LD_FLAGS       = """ + Configuration.current.extra_ld_flags
+
+        ld_flags += """
+TARGET_LDFLAGS       = --target=${TARGET} ${EXTRA_LD_FLAGS} -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """ """
         if Configuration.current.system_root is not None:
             ld_flags += "--sysroot=${SYSROOT}"
 
         if Configuration.current.bootstrap_directory is not None:
             ld_flags += """ -L${TARGET_BOOTSTRAP_DIR}/usr/lib"""
-        
-
-        ld_flags += Configuration.current.extra_ld_flags
 
         if Configuration.current.toolchain is not None:
             c_flags += " -B" + Configuration.current.toolchain.path_by_appending("bin").relative()
@@ -186,7 +197,7 @@ def generate_products(self):
 
         swift_build_command = """
 rule SwiftExecutable
-    command = mkdir -p `dirname $out`; ${SWIFTC} ${TARGET_SWIFTEXE_FLAGS} $flags $in -o $out
+    command = mkdir -p `dirname $out`; ${SWIFTC} ${TARGET_SWIFTEXE_FLAGS} ${EXTRA_LD_FLAGS} $flags $in -o $out
     description = SwiftExecutable: $out
 """
 
@@ -198,6 +209,8 @@ def generate_products(self):
             script += product.generate()
 
         script += "\n\n"
+        script += self.extra
+        script += "\n\n"
 
         return script