Bug 1107549 - split extension docs into User and Admin docs. r=dkl, a=glob.

1 files changed, 14 insertions, 22 deletions

diff --git a/docs/makedocs.pl b/docs/makedocs.pl
index 811ef8bc5..31ad0c610 100755
--- a/docs/makedocs.pl
+++ b/docs/makedocs.pl
@@ -12,11 +12,13 @@
 #
 # 1) Sphinx documentation builder (python-sphinx package on Debian/Ubuntu)
 #
-# 2) pdflatex, which means the following Debian/Ubuntu packages:
-#    * texlive-latex-base
-#    * texlive-latex-recommended
-#    * texlive-latex-extra
-#    * texlive-fonts-recommended
+# 2a) rst2pdf
+# or
+# 2b) pdflatex, which means the following Debian/Ubuntu packages:
+#     * texlive-latex-base
+#     * texlive-latex-recommended
+#     * texlive-latex-extra
+#     * texlive-fonts-recommended
 #
 # All these TeX packages together are close to a gig :-| But after you've
 # installed them, you can remove texlive-latex-extra-doc to save 400MB.
@@ -143,25 +145,15 @@ foreach my $lang (@langs) {
 
     # Collect up local extension documentation into the extensions/ dir.
     # Clear out old extensions docs
-    rmtree('rst/extensions', 0, 1);
-    mkdir('rst/extensions');
-    rmtree('rst/api/extensions', 0, 1);
-    mkdir('rst/api/extensions');
+    # For the life of me, I cannot get rmtree() to work here. It just returns
+    # silently without deleting anything - no errors.
+    system("rm -rf $lang/rst/extensions/*");
 
     foreach my $ext_name (keys %extensions) {
-        foreach my $path (glob($extensions{$ext_name} . "/*")) {
-            my ($file, $dir) = fileparse($path);
-            if ($file eq 'api') {
-                my $dst = "$docparent/$lang/rst/api/extensions/$ext_name";
-                mkdir($dst) unless -d $dst;
-                rcopy("$path/*", $dst);
-            }
-            else {
-                my $dst = "$docparent/$lang/rst/extensions/$ext_name";
-                mkdir($dst) unless -d $dst;
-                rcopy($path, "$dst/$file");
-            }
-        }
+        my $src = $extensions{$ext_name} . "/*";
+        my $dst = "$docparent/$lang/rst/extensions/$ext_name";
+        mkdir($dst) unless -d $dst;
+        rcopy($src, $dst);
     }
 
     chdir "$docparent/$lang";