CI: correctly handle ldc2.conf directory

Signed-off-by: Andrei Horodniceanu <[email protected]>

Author: the-horo

.cirrus.yml

@@ -65,12 +65,17 @@ packaging_steps_template: &PACKAGING_STEPS_TEMPLATE
     cd build
     ninja install > /dev/null
     cd ..
-    perl -pi -e s?$PWD/install/?%%ldcbinarypath%%/../?g install/etc/ldc2.conf
+    perl -pi -e s?$PWD/install/?%%ldcbinarypath%%/../?g install/etc/ldc2.conf/*
     if [[ "$CI_OS" == "freebsd" ]]; then
-      perl -pi -e "s?,druntime-ldc\",?,druntime-ldc\", \"-gcc=$CC\",?" install/etc/ldc2.conf
+      cat > install/etc/ldc2.conf/35-ldc-default-CC.conf <<EOF
+    "default":
+    {
+        switches ~= [ "-gcc=${CC}" ];
+    }
+    EOF
     fi
     cp $CIRRUS_WORKING_DIR/{LICENSE,packaging/README} install
-    cat install/etc/ldc2.conf
+    cat install/etc/ldc2.conf/*
     # Now rename the installation dir to test portability
     mv install installed
   # Run hello-world integration test with shared libs

.github/actions/5-install/action.yml

@@ -20,7 +20,7 @@ runs:
         else
           # the cross-compiled runtime libs have already been installed:
           # * lib/: runtime library artifacts
-          # * etc/ldc2.conf
+          # * etc/ldc2.conf/30-ldc-runtime-lib.conf
 
           # now extend by installing the cross-compiled compiler:
           # * bin/: executables

.github/actions/5a-ios/action.yml

@@ -32,8 +32,7 @@ runs:
           CMAKE_OSX_DEPLOYMENT_TARGET="$deployment_target" \
           BUILD_LTO_LIBS=ON
 
-        section="
-        \"$arch-apple-ios\":
+        section="\"$arch-apple-ios\":
         {
             switches ~= [
                 \"-Xcc=-isysroot\",
@@ -44,5 +43,5 @@ runs:
             ];
             rpath = \"%%ldcbinarypath%%/../lib-ios-$arch\";
         };"
-        echo "$section" >> installed/etc/ldc2.conf
-        cat installed/etc/ldc2.conf
+        echo "$section" >> installed/etc/ldc2.conf/31-ldc-runtime-lib-ios-$arch.conf
+        cat installed/etc/ldc2.conf/*

.github/actions/merge-macos/action.yml

@@ -39,77 +39,26 @@ runs:
         rm lib-{x86_64,arm64}/libLTO.dylib
 
         # ldc2.conf:
-        # 1) make a backup copy
-        cp etc/ldc2.conf /tmp/ldc2.conf.bak
-        # 2) strip to the header comments (remove all existing sections, only keep `default:` or `"default":` line)
-        sed -E -i '' '/^"?default"?:$/q' etc/ldc2.conf
-        # 3) append all sections (except for wasm)
-        cat >>etc/ldc2.conf <<EOF
-        {
-            // default switches injected before all explicit command-line switches
-            switches = [
-                "-defaultlib=phobos2-ldc,druntime-ldc",
-            ];
-            // default switches appended after all explicit command-line switches
-            post-switches = [
-                "-I%%ldcbinarypath%%/../import",
-            ];
-            // default directories to be searched for libraries when linking
-            lib-dirs = [];
-            // default rpath when linking against the shared default libs
-            rpath = "";
-        };
 
-        // macOS:
-
-        "x86_64-apple-":
+        # 1) x86_64 ios config
+        # already present
+        # 2) arm64 ios config
+        cp ../ldc2-arm64/etc/ldc2.conf/31-ldc-runtime-lib-ios-arm64.conf etc/ldc2.conf
+        # 3) x86_64 & arm64 macos
+        rm etc/ldc2.conf/30-ldc-runtime-lib.conf # the old ldc2-x86_64 config
+        for arch in x86_64 arm64; do
+          cat > etc/ldc2.conf/30-ldc-runtime-lib-${arch}.conf <<EOF
+        "${arch}-apple-":
         {
             lib-dirs = [
-                "%%ldcbinarypath%%/../lib-x86_64",
+                "%%ldcbinarypath%%/../lib-${arch}",
             ];
-            rpath = "%%ldcbinarypath%%/../lib-x86_64";
+            rpath = "%%ldcbinarypath%%/../lib-${arch}";
         };
-
-        "arm64-apple-":
-        {
-            lib-dirs = [
-                "%%ldcbinarypath%%/../lib-arm64",
-            ];
-            rpath = "%%ldcbinarypath%%/../lib-arm64";
-        };
-
-        // iOS:
-
-        "x86_64-apple-ios":
-        {
-            switches ~= [
-                "-Xcc=-isysroot",
-                "-Xcc=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk",
-            ];
-            lib-dirs = [
-                "%%ldcbinarypath%%/../lib-ios-x86_64",
-            ];
-            rpath = "%%ldcbinarypath%%/../lib-ios-x86_64";
-        };
-
-        "arm64-apple-ios":
-        {
-            switches ~= [
-                "-Xcc=-isysroot",
-                "-Xcc=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk",
-            ];
-            lib-dirs = [
-                "%%ldcbinarypath%%/../lib-ios-arm64",
-            ];
-            rpath = "%%ldcbinarypath%%/../lib-ios-arm64";
-        };
-
-        // WebAssembly
         EOF
-        # 4) append the wasm section from the backup
-        sed -n '/^"\^wasm/,$p' /tmp/ldc2.conf.bak | sed '/^\};$/q' >> etc/ldc2.conf
+        done
 
-        cat etc/ldc2.conf
+        cat etc/ldc2.conf/*
 
     - name: Run x86_64/arm64 macOS/iOS cross-compilation smoke tests
       shell: bash

.github/actions/merge-windows/action.yml

@@ -20,23 +20,23 @@ runs:
         mv ldc2-*-x64 ldc2-multilib
         cd ldc2-multilib
         mv lib lib64
+        mv etc/ldc2.conf/30-ldc-runtime-{lib,lib64}.conf
         cp -R ../ldc2-x86/lib lib32
         cp ../ldc2-x86/bin/{*.dll,*.pdb,curl-ca-bundle.crt} lib32/
     - name: Merge ldc2.conf
       shell: pwsh
       run: |
         cd ldc2-multilib
-        (cat etc\ldc2.conf).replace('%%ldcbinarypath%%/../lib', '%%ldcbinarypath%%/../lib64') | Set-Content etc\ldc2.conf
-        $conf32 = '
-        "i[3-6]86-.*-windows-msvc":
+        (cat etc\ldc2.conf\30-ldc-runtime-lib64.conf).replace('%%ldcbinarypath%%/../lib', '%%ldcbinarypath%%/../lib64') | Set-Content etc\ldc2.conf\30-ldc-runtime-lib64.conf
+        $conf32 = '"i[3-6]86-.*-windows-msvc":
         {
             lib-dirs = [
                 "%%ldcbinarypath%%/../lib32",
             ];
         };
         '
-        Add-Content etc\ldc2.conf $conf32 -NoNewline
-        cat etc\ldc2.conf
+        Set-Content etc\ldc2.conf\31-ldc-runtime-lib32.conf $conf32
+        cat etc\ldc2.conf\*
 
     - name: Generate hello.d
       shell: bash
@@ -88,16 +88,15 @@ runs:
       shell: pwsh
       run: |
         cd ldc2-multilib
-        $conf = '
-        "(aarch|arm)64-.*-windows-msvc":
+        $conf = '"(aarch|arm)64-.*-windows-msvc":
         {
             lib-dirs = [
                 "%%ldcbinarypath%%/../libarm64",
             ];
         };
         '
-        Add-Content etc\ldc2.conf $conf -NoNewline
-        cat etc\ldc2.conf
+        Set-Content etc\ldc2.conf\31-ldc-runtime-libarm64.conf $conf
+        cat etc\ldc2.conf\*
     - name: Run arm64 hello-world cross-compilation smoke tests
       shell: cmd
       run: |