From 0647f48316ff16d934dc81b32d727ee9172c55c6 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Fri, 12 Nov 2021 13:15:34 -0600
Subject: [PATCH 01/14] If this is a ddev project, and we're outside of ddev,
 run ddev's drush command.

---
 targets/the-build.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/targets/the-build.xml b/targets/the-build.xml
index da0a7e57..f84705ee 100644
--- a/targets/the-build.xml
+++ b/targets/the-build.xml
@@ -87,11 +87,18 @@
     <!-- Use the project directory name as the project name, if it's not configured. -->
     <basename property="projectname" file="${build.dir}" suffix="local" />
 
-    <!-- Configure the 'drush' Phing task. -->
+    <!-- Configure the 'drush' Phing task. By default, we run the installed drush. -->
     <property name="drush.bin" value="${build.dir}/vendor/bin/drush" />
-    <property name="drush.root" value="${build.dir}/${drupal.root}" />
-    <property name="drush.config" value="${build.dir}/drush/drushrc.php" />
-
+    <!-- If this is a ddev project, and we're outside of ddev, run ddev's drush command instead.  -->
+    <if>
+        <and>
+            <available file="${build.dir}/.ddev/config.yaml" />
+            <not><isset property="env.IS_DDEV_PROJECT" /></not>
+        </and>
+        <then>
+            <property name="drush.bin" value="ddev drush" override="true" />
+        </then>
+    </if>
 
     <!-- Configure the composer command, depending on whether `composer` or `composer.phar` is available. -->
     <exec command="command -v composer" outputProperty="composer.path.composer" />

From 0118ae045d3d1c55857cb38b8d692a71006e3a69 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Fri, 12 Nov 2021 19:33:09 -0600
Subject: [PATCH 02/14] Do a different database connection check that will work
 with 'ddev drush ...'

---
 targets/drupal.xml | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/targets/drupal.xml b/targets/drupal.xml
index 91ddcaa0..98ee5d47 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -179,34 +179,23 @@ Or, you can specify the export file directly:
 
     <!-- Target: drupal-has-database-connection
 
-         Check for a Drupal database connection. If the database doesn't exist and we have
-         the permissions, the database will be created.
+         Check for a Drupal database connection.
          -->
     <target name="drupal-has-database-connection" depends="set-site" hidden="true">
-        <trycatch>
-            <try>
-                <drush command="sql-query">
-                    <param>SELECT 1</param>
-                </drush>
+        <drush command="status" returnProperty="drupal_has_database_connection">
+            <option name="fields" value="db-status" />
+            <option name="format" value="string" />
+        </drush>
+
+        <if>
+            <equals arg1="${drupal_has_database_connection}" arg2="Connected" />
+            <then>
                 <echo msg="Drupal database connection available." />
-            </try>
-            <catch>
-                <trycatch>
-                    <try>
-                        <!-- If there's a database and it is accessible, this code will
-                             not be run. This code can help with setting up new
-                             multisites, since they will use new databases that may or may
-                             not exist yet.
-                             -->
-                        <drush command="sql-create" assume="yes" />
-                        <echo msg="Drupal database connection available." />
-                    </try>
-                    <catch>
-                        <fail msg="Drupal database connection not available." />
-                    </catch>
-                </trycatch>
-            </catch>
-        </trycatch>
+            </then>
+            <else>
+                <fail msg="Drupal database connection not available." />
+            </else>
+        </if>
     </target>
 
 

From f781b238573657c2ad078293dfcdb200bb48306f Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Fri, 12 Nov 2021 19:46:37 -0600
Subject: [PATCH 03/14] When installing the-build, update the ddev config to
 use the right project name.

---
 targets/install.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/targets/install.xml b/targets/install.xml
index c2639781..83fb62ca 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -165,6 +165,9 @@
 
     <!-- Target: setup-templates -->
     <target name="setup-templates" depends="set-site">
+        <!-- Set the project name in the ddev config. -->
+        <replaceregexp match="name: .*" replace="name: ${projectname}" file=".ddev/config.yaml" />
+
         <!-- Copy the build file template.
 
              This doesn't do any property substitution except for the "projectname",

From a2a8acd3d1cfb3d8ddc16a7ef0e458a0523ff48d Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Fri, 12 Nov 2021 19:52:29 -0600
Subject: [PATCH 04/14] Only use 'ddev drush' if ddev is actually available
 (thanks, Circle\!)

---
 targets/the-build.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/targets/the-build.xml b/targets/the-build.xml
index f84705ee..24dfea0d 100644
--- a/targets/the-build.xml
+++ b/targets/the-build.xml
@@ -90,9 +90,11 @@
     <!-- Configure the 'drush' Phing task. By default, we run the installed drush. -->
     <property name="drush.bin" value="${build.dir}/vendor/bin/drush" />
     <!-- If this is a ddev project, and we're outside of ddev, run ddev's drush command instead.  -->
+    <exec command="which ddev" returnProperty="which_ddev" />
     <if>
         <and>
             <available file="${build.dir}/.ddev/config.yaml" />
+            <equals arg1="${which_ddev}" arg2="0" />
             <not><isset property="env.IS_DDEV_PROJECT" /></not>
         </and>
         <then>

From 5f03ba31d7c4b1b01e85535c27c815f55cfd02b4 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Tue, 16 Nov 2021 15:11:06 -0600
Subject: [PATCH 05/14] Fix validating clean config on CircleCI

---
 targets/drupal.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/targets/drupal.xml b/targets/drupal.xml
index 98ee5d47..b49d27da 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -31,8 +31,11 @@
       <!-- Assembling this property at run time. -->
       <property name="drupal.validate_clean_config.dir" value="${build.dir}/${drupal.root}/${drupal.site.config_sync_directory}" />
 
-        <!-- Use git to list local (not yet committed) changes to the config directory. -->
-        <exec command="git status --porcelain ${drupal.validate_clean_config.dir}" outputProperty="modified_files" />
+        <!-- Use git to list local (not yet committed) changes to the config
+             directory. Suppress errors so that this command will run even if
+             the project isn't a git directory (e.g. on the-build's CircleCI
+             test!) -->
+        <exec command="git status --porcelain ${drupal.validate_clean_config.dir} 2>/dev/null" outputProperty="modified_files" />
 
         <if>
             <and>

From 04ff99e04c22a5b11eb2df9262ec38e86e7bd5ac Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Tue, 16 Nov 2021 15:22:09 -0600
Subject: [PATCH 06/14] Revert "Fix validating clean config on CircleCI" (this
 wasn't necessary)

This reverts commit 5f03ba31d7c4b1b01e85535c27c815f55cfd02b4.
---
 targets/drupal.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/targets/drupal.xml b/targets/drupal.xml
index b49d27da..98ee5d47 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -31,11 +31,8 @@
       <!-- Assembling this property at run time. -->
       <property name="drupal.validate_clean_config.dir" value="${build.dir}/${drupal.root}/${drupal.site.config_sync_directory}" />
 
-        <!-- Use git to list local (not yet committed) changes to the config
-             directory. Suppress errors so that this command will run even if
-             the project isn't a git directory (e.g. on the-build's CircleCI
-             test!) -->
-        <exec command="git status --porcelain ${drupal.validate_clean_config.dir} 2>/dev/null" outputProperty="modified_files" />
+        <!-- Use git to list local (not yet committed) changes to the config directory. -->
+        <exec command="git status --porcelain ${drupal.validate_clean_config.dir}" outputProperty="modified_files" />
 
         <if>
             <and>

From e8dd7612a01bf14b43cdb19d695686806c3b529c Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Tue, 16 Nov 2021 15:39:46 -0600
Subject: [PATCH 07/14] Revert "Do a different database connection check that
 will work with 'ddev drush ...'" -- this actually only works after Drupal is
 installed.

This reverts commit 0118ae045d3d1c55857cb38b8d692a71006e3a69.
---
 targets/drupal.xml | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/targets/drupal.xml b/targets/drupal.xml
index 98ee5d47..91ddcaa0 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -179,23 +179,34 @@ Or, you can specify the export file directly:
 
     <!-- Target: drupal-has-database-connection
 
-         Check for a Drupal database connection.
+         Check for a Drupal database connection. If the database doesn't exist and we have
+         the permissions, the database will be created.
          -->
     <target name="drupal-has-database-connection" depends="set-site" hidden="true">
-        <drush command="status" returnProperty="drupal_has_database_connection">
-            <option name="fields" value="db-status" />
-            <option name="format" value="string" />
-        </drush>
-
-        <if>
-            <equals arg1="${drupal_has_database_connection}" arg2="Connected" />
-            <then>
+        <trycatch>
+            <try>
+                <drush command="sql-query">
+                    <param>SELECT 1</param>
+                </drush>
                 <echo msg="Drupal database connection available." />
-            </then>
-            <else>
-                <fail msg="Drupal database connection not available." />
-            </else>
-        </if>
+            </try>
+            <catch>
+                <trycatch>
+                    <try>
+                        <!-- If there's a database and it is accessible, this code will
+                             not be run. This code can help with setting up new
+                             multisites, since they will use new databases that may or may
+                             not exist yet.
+                             -->
+                        <drush command="sql-create" assume="yes" />
+                        <echo msg="Drupal database connection available." />
+                    </try>
+                    <catch>
+                        <fail msg="Drupal database connection not available." />
+                    </catch>
+                </trycatch>
+            </catch>
+        </trycatch>
     </target>
 
 

From b9a1634a5d95650f62f1f9681510f5ba9d007358 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Tue, 16 Nov 2021 15:46:35 -0600
Subject: [PATCH 08/14] Try adding escaped quotes to the db query when testing
 for a database connection.

---
 targets/drupal.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/targets/drupal.xml b/targets/drupal.xml
index 91ddcaa0..e48ebd8c 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -183,10 +183,25 @@ Or, you can specify the export file directly:
          the permissions, the database will be created.
          -->
     <target name="drupal-has-database-connection" depends="set-site" hidden="true">
+
+        <!-- We have to format the test query differently when using "ddev drush" vs. when using "drush" directly. -->
+        <property name="test_query" value="SELECT 1" />
+        <exec command="which ddev" returnProperty="which_ddev" />
+        <if>
+            <and>
+                <available file="${build.dir}/.ddev/config.yaml" />
+                <equals arg1="${which_ddev}" arg2="0" />
+                <not><isset property="env.IS_DDEV_PROJECT" /></not>
+            </and>
+            <then>
+                <property name="test_query" override="true">\"SELECT 1\"</property>
+            </then>
+        </if>
+
         <trycatch>
             <try>
                 <drush command="sql-query">
-                    <param>SELECT 1</param>
+                    <param>${test_query}</param>
                 </drush>
                 <echo msg="Drupal database connection available." />
             </try>

From 7cdc28b6019fb88a0604261366f9ea35f1e21d96 Mon Sep 17 00:00:00 2001
From: Byron Duvall <duvall@palantir.net>
Date: Thu, 23 Dec 2021 10:16:45 -0500
Subject: [PATCH 09/14] add relative symlink patch for Phing

---
 composer.json                         | 10 +++-
 patches/phing-relative-symlinks.patch | 76 +++++++++++++++++++++++++++
 targets/drupal.xml                    |  2 +-
 3 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 patches/phing-relative-symlinks.patch

diff --git a/composer.json b/composer.json
index 22c3e02d..7de3324f 100644
--- a/composer.json
+++ b/composer.json
@@ -12,9 +12,10 @@
         "bin/the-build-installer"
     ],
     "require": {
-        "palantirnet/phing-drush-task": "^1.1",
+        "cweagans/composer-patches": "^1.7",
         "drupal/coder": "^8.3.6",
         "drush/drush": "^9 || ^10",
+        "palantirnet/phing-drush-task": "^1.1",
         "pear/http_request2": "^2.3",
         "pear/versioncontrol_git": "@dev",
         "phing/phing": "^2.14",
@@ -27,5 +28,12 @@
     },
     "config": {
         "sort-packages": true
+    },
+    "extra": {
+        "patches": {
+            "phing/phing": {
+                "Support relative symliks in Phing": "patches/phing-relative-symlinks.patch"
+            }
+        }
     }
 }
diff --git a/patches/phing-relative-symlinks.patch b/patches/phing-relative-symlinks.patch
new file mode 100644
index 00000000..1733b4ff
--- /dev/null
+++ b/patches/phing-relative-symlinks.patch
@@ -0,0 +1,76 @@
+diff --git a/classes/phing/tasks/ext/SymlinkTask.php b/classes/phing/tasks/ext/SymlinkTask.php
+index f132b4f747..87844a0d09 100644
+--- a/classes/phing/tasks/ext/SymlinkTask.php
++++ b/classes/phing/tasks/ext/SymlinkTask.php
+@@ -206,6 +206,46 @@ public function isRelative()
+         return $this->relative;
+     }
+ 
++    /**
++     * Given an existing path, convert it to a path relative to a given starting path.
++     *
++     * @param string $endPath   Absolute path of target
++     * @param string $startPath Absolute path where traversal begins
++     *
++     * @return string Path of target relative to starting path
++     */
++    public function makePathRelative($endPath, $startPath)
++    {
++        // Normalize separators on Windows
++        if ('\\' === DIRECTORY_SEPARATOR) {
++            $endPath = str_replace('\\', '/', $endPath);
++            $startPath = str_replace('\\', '/', $startPath);
++        }
++
++        // Split the paths into arrays
++        $startPathArr = explode('/', trim($startPath, '/'));
++        $endPathArr = explode('/', trim($endPath, '/'));
++
++        // Find for which directory the common path stops
++        $index = 0;
++        while (isset($startPathArr[$index]) && isset($endPathArr[$index]) && $startPathArr[$index] === $endPathArr[$index]) {
++            ++$index;
++        }
++
++        // Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)
++        $depth = count($startPathArr) - $index;
++
++        // Repeated "../" for each level need to reach the common path
++        $traverser = str_repeat('../', $depth);
++
++        $endPathRemainder = implode('/', array_slice($endPathArr, $index));
++
++        // Construct $endPath from traversing to the common path, then to the remaining $endPath
++        $relativePath = $traverser.('' !== $endPathRemainder ? $endPathRemainder.'/' : '');
++
++        return '' === $relativePath ? './' : $relativePath;
++    }
++
+     /**
+      * Generates an array of directories / files to be linked
+      * If _filesets is empty, returns getTarget()
+@@ -235,11 +275,7 @@ protected function getMap()
+                 throw new BuildException('Link must be an existing directory when using fileset');
+             }
+ 
+-            if ($this->isRelative()) {
+-                $fromDir = $fs->getDir($this->getProject())->getPath();
+-            } else {
+-                $fromDir = $fs->getDir($this->getProject())->getAbsolutePath();
+-            }
++            $fromDir = $fs->getDir($this->getProject())->getAbsolutePath();
+ 
+             if (!is_dir($fromDir)) {
+                 $this->log('Directory doesn\'t exist: ' . $fromDir, Project::MSG_WARN);
+@@ -300,6 +336,11 @@ protected function symlink($target, $link)
+     {
+         $fs = FileSystem::getFileSystem();
+ 
++        if ($this->isRelative()) {
++           $link =(new PhingFile($link))->getAbsolutePath();
++           $target = rtrim($this->makePathRelative($target, dirname($link)), '/');
++        }
++
+         if (is_link($link) && @readlink($link) == $target) {
+             $this->log('Link exists: ' . $link, Project::MSG_INFO);
+ 
diff --git a/targets/drupal.xml b/targets/drupal.xml
index 01ac1a6a..19161f98 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -270,7 +270,7 @@ Or, you can specify the export file directly:
     <target name="drupal-first-install" depends="set-site" hidden="true">
         <fail unless="drupal.site.admin_user" />
 
-        <symlink link="${build.dir}/${drupal.root}/modules/contrib/the_build_utility" target="${build.thebuild.dir}/defaults/standard/modules/the_build_utility" />
+        <symlink link="${build.dir}/${drupal.root}/modules/contrib/the_build_utility" target="${build.thebuild.dir}/defaults/standard/modules/the_build_utility" relative="true" />
 
         <composer command="require" composer="${composer.composer}">
             <arg value="drupal/admin_toolbar" />

From fba2a70be49abbc2133919cf61c9697ecd6480ed Mon Sep 17 00:00:00 2001
From: Byron Duvall <duvall@palantir.net>
Date: Thu, 23 Dec 2021 10:41:50 -0500
Subject: [PATCH 10/14] use URL for Phing patch

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7de3324f..c3aa7bfe 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
     "extra": {
         "patches": {
             "phing/phing": {
-                "Support relative symliks in Phing": "patches/phing-relative-symlinks.patch"
+                "Support relative symliks in Phing": "https://raw.githubusercontent.com/palantirnet/the-build/7cdc28b6019fb88a0604261366f9ea35f1e21d96/patches/phing-relative-symlinks.patch"
             }
         }
     }

From b6dd36721f02e64269477408afbce96a031cfbba Mon Sep 17 00:00:00 2001
From: Byron Duvall <duvall@palantir.net>
Date: Mon, 3 Jan 2022 12:12:38 -0500
Subject: [PATCH 11/14] use symlink phing task for includeresource

---
 defaults/install/build.xml           |  2 +-
 src/TheBuild/IncludeResourceTask.php | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/defaults/install/build.xml b/defaults/install/build.xml
index 209c358c..c5267f3c 100644
--- a/defaults/install/build.xml
+++ b/defaults/install/build.xml
@@ -45,7 +45,7 @@
 
         <!-- Include styleguide resources in the theme. This approach will symlink
              resources in development environments, and copy them for artifact builds. -->
-        <!-- <includeresource source="styleguide/source/assets/css" dest="${drupal.root}/themes/custom/example_theme/css" /> -->
+        <!-- <includeresource relative="true" source="${build.dir}/styleguide/source/assets/css" dest="${build.dir}/${drupal.root}/themes/custom/example_theme/css" /> -->
     </target>
 
 
diff --git a/src/TheBuild/IncludeResourceTask.php b/src/TheBuild/IncludeResourceTask.php
index 43d43feb..451378b6 100644
--- a/src/TheBuild/IncludeResourceTask.php
+++ b/src/TheBuild/IncludeResourceTask.php
@@ -32,6 +32,12 @@ class IncludeResourceTask extends \Task {
    */
   protected $dest = NULL;
 
+  /**
+   * Whether to create relative symlinks
+   *
+   * @var boolean
+   */
+  private $relative = false;
 
   /**
    * Init tasks.
@@ -44,6 +50,10 @@ public function init() {
     if (!is_null($mode)) {
       $this->setMode($mode);
     }
+    $relative = $this->getProject()->getProperty('includeresource.relative');
+    if (!is_null($relative)) {
+      $this->setRelative($relative);
+    }
   }
 
 
@@ -70,7 +80,11 @@ public function main() {
     }
     else {
       $this->log(sprintf("Linking '%s' to '%s'", $this->source->getPath(), $this->dest->getPath()));
-      FileSystem::getFileSystem()->symlink($this->source->getPath(), $this->dest->getPath());
+      $symlink_task = $this->project->createTask("symlink");
+      $symlink_task->setTarget($this->source->getPath());
+      $symlink_task->setLink($this->dest->getPath());
+      $symlink_task->setRelative($this->relative);
+      $symlink_task->main();
     }
   }
 
@@ -122,4 +136,12 @@ public function setDest(PhingFile $dest) {
     $this->dest = $dest;
   }
 
+  /**
+   * @param boolean $relative
+   */
+  public function setRelative($relative)
+  {
+      $this->relative = $relative;
+  }
+
 }

From 39e6044f524758c04d8ba2d185c3207adb171e70 Mon Sep 17 00:00:00 2001
From: Byron Duvall <duvall@palantir.net>
Date: Mon, 3 Jan 2022 13:05:37 -0500
Subject: [PATCH 12/14] make relative symlinks the default

---
 src/TheBuild/IncludeResourceTask.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TheBuild/IncludeResourceTask.php b/src/TheBuild/IncludeResourceTask.php
index 451378b6..d25c5576 100644
--- a/src/TheBuild/IncludeResourceTask.php
+++ b/src/TheBuild/IncludeResourceTask.php
@@ -37,7 +37,7 @@ class IncludeResourceTask extends \Task {
    *
    * @var boolean
    */
-  private $relative = false;
+  private $relative = true;
 
   /**
    * Init tasks.

From 576ed7e3813da3a46e0f8d1cc1c49d3a9111fba6 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Fri, 7 Jan 2022 13:19:26 -0600
Subject: [PATCH 13/14] Use 'protected' instead of 'private' (coding
 standards).

---
 src/TheBuild/IncludeResourceTask.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TheBuild/IncludeResourceTask.php b/src/TheBuild/IncludeResourceTask.php
index d25c5576..a3a75215 100644
--- a/src/TheBuild/IncludeResourceTask.php
+++ b/src/TheBuild/IncludeResourceTask.php
@@ -37,7 +37,7 @@ class IncludeResourceTask extends \Task {
    *
    * @var boolean
    */
-  private $relative = true;
+  protected $relative = true;
 
   /**
    * Init tasks.

From 74ffd5012b5f029d84b875c60ac6e106dbd17ec5 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Fri, 7 Jan 2022 13:20:00 -0600
Subject: [PATCH 14/14] Document where the patch came from.

---
 patches/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 patches/README.md

diff --git a/patches/README.md b/patches/README.md
new file mode 100644
index 00000000..cad5547e
--- /dev/null
+++ b/patches/README.md
@@ -0,0 +1,9 @@
+### phing-relative-symlinks.patch
+
+Source: [https://github.com/phingofficial/phing/pull/695](https://github.com/phingofficial/phing/pull/695)
+
+This patch updates Phing's SymlinkTask to allow creating relative symlinks, using the syntax:
+
+```
+<symlink link="path/to/destination" target="path/to/target" relative="true" />
+```