From 9658ca09e92212c8370dfe81d2c802ca83e26fdd Mon Sep 17 00:00:00 2001
From: Graham Percival
Date: Fri, 14 May 2010 17:41:57 +0100
Subject: [PATCH] Build: don't include AJAX by default.
---
Documentation/GNUmakefile | 5 ++
Documentation/lilypond-texi2html.init | 79 +++++++++++++++------------
stepmake/stepmake/texinfo-rules.make | 10 ++--
3 files changed, 55 insertions(+), 39 deletions(-)
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 5a8cec7c06..ef979addab 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -178,7 +178,12 @@ local-clean:
ifeq ($(out),www)
local-WWW-1: $(OUT_TEXINFO_MANUALS) $(PDF_FILES) info
+ifeq ($(AJAX_SEARCH),1)
local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(OUT_JS_FILES) $(OUT_PHP_FILES) $(source-links) $(OMF_FILES)
+else
+local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(source-links) $(OMF_FILES)
+endif
+
endif
diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 2ea8175c47..96f4cb2d28 100644
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -799,15 +799,17 @@ sub lilypond_css_lines ($$)
$Texi2HTML::THISDOC{'CSS_LINES'} .=
"\n";
- # Add the JavaScript file only if we have an index.
- # Unfortunately, init_out is called after css_lines, so as a workaround
- # here we have to check again for the existence of an index...
- my $ix = main::get_index ("cp");
- $have_index_entries = (scalar $ix > 0);
- my $reldir = "";
- $reldir = "../" unless $bigpage;
- if ($have_index_entries) {
- $Texi2HTML::THISDOC{'CSS_LINES'} .= "\n";
+ if ($ENV{'AJAX_SEARCH'} == 1) {
+ # Add the JavaScript file only if we have an index.
+ # Unfortunately, init_out is called after css_lines, so as a workaround
+ # here we have to check again for the existence of an index...
+ my $ix = main::get_index ("cp");
+ $have_index_entries = (scalar $ix > 0);
+ my $reldir = "";
+ $reldir = "../" unless $bigpage;
+ if ($have_index_entries) {
+ $Texi2HTML::THISDOC{'CSS_LINES'} .= "\n";
+ }
}
}
@@ -1324,16 +1326,19 @@ sub lilypond_generate_page_toc_body($)
push (@toc_entries, generate_ly_toc_entries($_, \%parentelements, $page_toc_depth, 0, $element));
}
# search box
- local $/=undef;
- my $name = "search-box";
- $lang = $Texi2HTML::THISDOC{current_lang};
- open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$lang/$name.ihtml" or
+ # I'm assuming that we wouldn't keep the google search box? -gp
+ if (!($ENV{AJAX_SEARCH} == 1)) {
+ local $/=undef;
+ my $name = "search-box";
+ $lang = $Texi2HTML::THISDOC{current_lang};
+ open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$lang/$name.ihtml" or
open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$name.ihtml" or
die "no such file: $name.ihtml: $!";
- my $search_string = decode ('UTF-8', );
- $search_string = "\n" . $search_string . "\n";
- push (@toc_entries, $search_string);
- close FILE;
+ my $search_string = decode ('UTF-8', );
+ $search_string = "\n" . $search_string . "\n";
+ push (@toc_entries, $search_string);
+ close FILE;
+ }
push (@toc_entries, "\n");
if ($web_manual) {
@@ -1376,11 +1381,13 @@ sub lilypond_print_toc_div ($$)
"
\n";
# AJAX search box, written in JavaScript
- if ($have_index_entries) {
- my ($docu_dir, $docu_name) = split_texi_filename ($Texi2HTML::THISDOC{'input_file_name'});
- print $fh '\n";
+ }
}
print $fh '