Migrated from framework/ to split repositories.

horde · Oct 10, 2017 · 62bc845 · 62bc845
1 parent 3ce6762
commit 62bc845
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/bin/horde-bootstrap b/bin/horde-bootstrap
@@ -15,7 +15,7 @@ require_once 'PEAR/Command/Channels.php';
 require_once 'PEAR/Command/Install.php';
 require_once 'PEAR/Frontend/CLI.php';
 
-$framework = __DIR__ . '/../../framework';
+$framework = __DIR__ . '/../..';
 require_once $framework . '/Exception/lib/Horde/Exception.php';
 require_once $framework . '/Exception/lib/Horde/Exception/Pear.php';
 require_once $framework . '/Pear/lib/Horde/Pear/Package/Xml.php';

diff --git a/data/jenkins/config/config.xml b/data/jenkins/config/config.xml
@@ -9,11 +9,7 @@ if (!isset($options['toolsdir'])) {
 $toolsdir = $options['toolsdir'];
 
 $directory = $config->getPath();
-if (basename(dirname($directory)) == 'framework') {
-    $sourcepath = 'framework/' . basename($directory);
-} else {
-    $sourcepath = basename($directory);
-}
+$sourcepath = basename($directory);
 
 $component = $config->getComponent();
 $description = $component->getDescription();

diff --git a/lib/Components/Dependencies/Bootstrap.php b/lib/Components/Dependencies/Bootstrap.php
@@ -81,7 +81,7 @@ public function getInstance($interface)
                 );
                 break;
             case 'Horde_Cli':
-                require_once __DIR__ . '/../../../../framework/Cli/lib/Horde/Cli.php';
+                require_once __DIR__ . '/../../../../Cli/lib/Horde/Cli.php';
                 $this->_instances[$interface] = new Horde_Cli();
                 break;
             }

diff --git a/lib/Components/Helper/Root.php b/lib/Components/Helper/Root.php
@@ -102,18 +102,10 @@ public function __construct(
     public function getPackageXml($name)
     {
         $package_file = $this->getRoot() . '/' . $name . '/package.xml';
-        if (!file_exists($package_file)) {
-            $package_file = $this->getRoot() . '/framework/' . $name
-                . '/package.xml';
-        }
         if (!file_exists($package_file) && substr($name, 0, 6) == 'Horde_') {
-            $package_file = $this->getRoot() . '/framework/'
+            $package_file = $this->getRoot()
                 . substr($name, 6) . '/package.xml';
         }
-        if (!file_exists($package_file)) {
-            $package_file = $this->getRoot() . '/bundles/' . $name
-                . '/package.xml';
-        }
         if (!file_exists($package_file)) {
             throw new Components_Exception(sprintf('Unknown package %s.', $name));
         }