[DOC-CVS] [doc-base] master: Unsupport trunk/

Author: Jakub Vrana (vrana)
Committer: Jakub Vrána (vrana)
Date: 2025-04-15T21:30:55+02:00

Commit: https://github.com/php/doc-base/commit/c2fd6c07f7d33c7d46b2853362391b745f2e07a0
Raw diff: https://github.com/php/doc-base/commit/c2fd6c07f7d33c7d46b2853362391b745f2e07a0.diff

Unsupport trunk/

Changed paths:
  M  configure.php


Diff:

diff --git a/configure.php b/configure.php
index f74c1708b..990d61651 100755
--- a/configure.php
+++ b/configure.php
@@ -553,20 +553,12 @@ function find_xml_files($path) // {{{
 
 checking("whether the language is supported");
 $LANGDIR = "{$ac['rootdir']}/{$ac['LANG']}";
-if (file_exists("{$LANGDIR}/trunk")) {
-    $LANGDIR .= '/trunk';
-}
 if (!file_exists($LANGDIR) || !is_readable($LANGDIR)) {
     checkerror("No language directory found.");
 }
 
 $ac['LANGDIR'] = basename($LANGDIR);
-if ($ac['LANGDIR'] == 'trunk') {
-    $ac['LANGDIR'] = '../' . basename(dirname($LANGDIR)) . '/trunk';
-    $ac['EN_DIR'] = '../en/trunk';
-} else {
-    $ac['EN_DIR'] = 'en';
-}
+$ac['EN_DIR'] = 'en';
 checkvalue("yes");
 
 checking("for partial build");
@@ -1120,11 +1112,7 @@ function phd_version()
         $globdir = dirname($ac["GENERATE"]) . "/{../../}versions.xml";
     }
     else {
-        if (file_exists($ac['rootdir'] . '/en/trunk')) {
-            $globdir = $ac['rootdir'] . '/en/trunk';
-        } else {
-            $globdir = $ac['rootdir'] . '/en';
-        }
+        $globdir = $ac['rootdir'] . '/en';
         $globdir .= "/*/*/versions.xml";
     }
     echo ' transforming,';