[Python-modules-commits] r17753 - in packages/sphinx/trunk/debian (dh_sphinxdoc)

[jwilk at users.alioth.debian.org]

    Date: Friday, July 8, 2011 @ 20:23:35
  Author: jwilk
Revision: 17753

dh_sphinxdoc: symlink JavaScript code in _static/ subdirectory even if it's not referenced by anything.

Modified:
  packages/sphinx/trunk/debian/dh_sphinxdoc

Modified: packages/sphinx/trunk/debian/dh_sphinxdoc
===================================================================
--- packages/sphinx/trunk/debian/dh_sphinxdoc	2011-07-08 20:02:20 UTC (rev 17752)
+++ packages/sphinx/trunk/debian/dh_sphinxdoc	2011-07-08 20:23:35 UTC (rev 17753)
@@ -96,13 +96,13 @@
     open(F, '<', $searchfn) or error("cannot open $searchfn");
     my $search = <F>;
     close F;
-    my @js = $search =~ m{<script type="text/javascript" src="([^"]++)"></script>}g;
+    my %js = map { $_, 1 } $search =~ m{<script type="text/javascript" src="([^"]++)"></script>}g;
     my $loads_searchindex = $search =~ m/\QjQuery(function() { Search.loadIndex("searchindex.js"); });\E/;
     my ($has_source) = $search =~ m{HAS_SOURCE:\s*(true|false)};
     my ($url_root) = $search =~ m{URL_ROOT:\s*'([^']*)'};
-    (@js and $loads_searchindex and defined $has_source and defined $url_root) or error("$searchfn doesn't look like Sphinx search page");
+    (%js and $loads_searchindex and defined $has_source and defined $url_root) or error("$searchfn doesn't look like Sphinx search page");
     $url_root =~ m{^([a-z]+:/)?/} and error("URL_ROOT in $searchfn is not relative");
-    for my $js (@js)
+    for my $js (keys(%js))
     {
         -f "$path/$js" or -l "$path/$js" or error("$path/$js is missing");
     }
@@ -111,7 +111,12 @@
         -f "$path/$page.html" or error("$path/$page.html is missing");
         -f "$path/_sources/$page.txt" or error("$path/_sources/$page.txt is missing") if $has_source;
     }
-    return @js;
+    if (opendir(D, "$path/_static/"))
+    {
+        grep { /[.]js$/ and $js{"_static/$_"} = 1; } readdir(D);
+        closedir(D);
+    }
+    return keys(%js);
 }
 
 sub unknown_javascript($)