From f90c3a3dd4d2cd83eca782f40e4776917c3dd0c6 Mon Sep 17 00:00:00 2001
From: mh17 <mh17>
Date: Wed, 3 Mar 2010 15:03:08 +0000
Subject: [PATCH] *.rel now optional
---
doc/scripts/build | 2 +-
doc/scripts/docgen | 2 +-
doc/scripts/navbar.rel | 6 +++---
doc/scripts/new | 2 --
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/doc/scripts/build b/doc/scripts/build
index 27c4fdff7..0e6836c88 100755
--- a/doc/scripts/build
+++ b/doc/scripts/build
@@ -3,7 +3,7 @@
# must be run from ZMap/doc directory
docgen *.html
-cd desigm
+cd Design_notes
docgen *.html
cd modules
docgen *.html
diff --git a/doc/scripts/docgen b/doc/scripts/docgen
index c8a1a3ba9..b400e3277 100755
--- a/doc/scripts/docgen
+++ b/doc/scripts/docgen
@@ -22,7 +22,7 @@ sub menudiv
my $in_fieldset = 0;
$file = shift @_;
- open(NAVBAR, $file) or die("Can't open $file\n");
+ open(NAVBAR, $file) or return; # *.rel is optional, we assume navbar.rel is OK
while ($line = <NAVBAR>)
{
diff --git a/doc/scripts/navbar.rel b/doc/scripts/navbar.rel
index 50fe1226c..497bb0c00 100644
--- a/doc/scripts/navbar.rel
+++ b/doc/scripts/navbar.rel
@@ -1,8 +1,8 @@
,Home,
index,Documentation Root
-design/index,Index,
-design/misc/about,About,
-,ZMap Modules,design/modules/
+Design_notes/index,Index,
+Design_notes/misc/about,About,
+,ZMap Modules,Design_notes/modules/
zmapApp,,
zmapConfig,,
zmapControl,,
diff --git a/doc/scripts/new b/doc/scripts/new
index 92d6f8031..cd1519a97 100755
--- a/doc/scripts/new
+++ b/doc/scripts/new
@@ -5,8 +5,6 @@ echo "<fieldset> <legend>Summary</legend>" >>$1.html
echo "Forthcoming..." >>$1.html
echo "</fieldset>" >>$1.html
-echo ",Related" > $1.rel
-
docgen $1
echo now update scripts/navbar.rel and design/index.html
\ No newline at end of file
--
GitLab