This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Accommodate latest HTML doc structure in configtool


Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/ChangeLog,v
retrieving revision 1.53
diff -u -5 -r1.53 ChangeLog
--- ChangeLog	24 Apr 2003 11:11:14 -0000	1.53
+++ ChangeLog	25 Apr 2003 09:13:36 -0000
@@ -1,5 +1,10 @@
+2003-04-25  John Dallaway  <jld at ecoscentric dot com>
+
+	* standalone/wxwin/docsystem.cpp: Accommodate the latest HTML doc
+	structure.
+
 2003-04-24  John Dallaway  <jld at ecoscentric dot com>

 	* standalone/wxwin/mainwin.cpp: Fix behaviour of user tools warning
 	message box.
 
Index: standalone/wxwin/docsystem.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/docsystem.cpp,v
retrieving revision 1.3
diff -u -5 -r1.3 docsystem.cpp
--- standalone/wxwin/docsystem.cpp	10 Apr 2003 15:30:44 -0000	1.3
+++ standalone/wxwin/docsystem.cpp	25 Apr 2003 09:13:38 -0000
@@ -604,11 +604,11 @@

     // The CVS repository has an HTML subdirectory, but the
     // packaged version doesn't
     if (wxDirExists(docDir + sep + wxT("html")))
         docDir = docDir + sep + wxString(wxT("html"));
-
+
     wxString projectDir = FindIndexFilesDir(reposDir);
 
     projectFile = projectDir + sep + wxT("eCos.hhp");
     wxString contentsFile = projectDir + sep + wxT("eCos.hhc");
     wxString keywordFile = projectDir + sep + wxT("eCos.hhk");
@@ -708,11 +708,11 @@
         }
 
         node = node->Next();
     }

-    CreateHHCPackagesSection(wxT("Packages"), wxEmptyString, stream, docDir);
+//    CreateHHCPackagesSection(wxT("Packages"), wxEmptyString, stream, docDir);
     
     CreateHHCWriteFooter(stream);

 #if 0 // def __WXGTK__
     // Hack to restore correct colour to short description window
@@ -930,77 +930,82 @@
         // Get a list of all tutorials
 
         wxArrayString tutorials;

         wxString sep(wxFILE_SEP_PATH);
-
+
         wxString docDir(reposDir + sep + wxString(wxT("doc"))) ;
-        
+
         // The CVS repository has an HTML subdirectory, but the
         // packaged version doesn't
         if (wxDirExists(docDir + sep + wxT("html")))
             docDir = docDir + sep + wxString(wxT("html"));
 
         docDir += sep ;
         docDir += wxString(wxT("tutorials"));

         wxLogNull log;
         wxDir dir(docDir);
-        
+
         if (dir.IsOpened())
         {
             wxString filename;
             bool cont = dir.GetFirst(& filename, wxT("*"), wxDIR_DIRS);
             while (cont)
             {
                 if (filename != wxT(".") && filename != wxT(".."))
                     tutorials.Add(filename);
-                
+
                 cont = dir.GetNext(& filename);
             }
         }

-        AddStartSection(wxT("Getting Started with eCos"), wxT(""));
+//        AddStartSection(wxT("Getting Started with eCos"), wxT(""));
         size_t i;
         for (i = 0; i < tutorials.GetCount(); i++)
         {
             wxString tutorial(tutorials[i]);
             wxString tutorialRelativePath = wxT("tutorials/") + tutorial + wxT("/ecos-tutorial.html");

             // Use a more friendly name than just the directory if it's available
             AddIndexByList(TranslateTutorialDirectory(tutorial), tutorialRelativePath, tutorialRelativePath);
         }
-        AddEndSection();
+//        AddEndSection();

-        AddIndexByList(wxT("eCos User's Guide"), wxT("guides/ecos-user-guide.html"), wxT("guides/ecos-user-guide.html"));
-        AddIndexByList(wxT("RedBoot User's Guide"), wxT("redboot/redboot.html"), wxT("redboot/redboot.html"));
-        AddIndexByList(wxT("eCos Component Writer's Guide"), wxT("cdl/cdl-guide.html"), wxT("cdl/cdl-guide.html"));
-        AddIndexByList(wxT("eCos Reference Manual"), wxT("ref/ecos-reference-manual.html"), wxT("ref/ecos-reference-manual.html"));
-        AddIndexByList(wxT("eCos-EL/IX Compatibility Guide"), wxT("ecos-elix/elix-compatibility.html"), wxT("ecos-elix/elix-compatibility.html"));
+        AddIndexByList(wxT("User Guide"), wxT("user-guide/ecos-user-guide.html"), wxT("user-guide/ecos-user-guide.html"));
+//        AddIndexByList(wxT("RedBoot User's Guide"), wxT("redboot/redboot.html"), wxT("redboot/redboot.html"));
+#ifdef __WXGTK__
+        // FIXME: wxHtmlParser (version 2.4.0) doesn't like the eCos Reference HTML on Linux so just index the initial page for now
+        AddIndexItem(wxT("eCos Reference"), wxT("ref/ecos-ref.html"));
+#else
+        AddIndexByList(wxT("eCos Reference"), wxT("ref/ecos-ref.html"), wxT("ref/ecos-ref.html"));
+#endif
+        AddIndexByList(wxT("Component Writer's Guide"), wxT("cdl-guide/cdl-guide.html"), wxT("cdl-guide/cdl-guide.html"));
+//        AddIndexByList(wxT("eCos-EL/IX Compatibility Guide"), wxT("ecos-elix/elix-compatibility.html"), wxT("ecos-elix/elix-compatibility.html"));
 
         //// TOOLCHAIN REFERENCE MANUALS
-        AddStartSection(wxT("GNUPro Toolkit Reference Manual"));
+//        AddStartSection(wxT("GNUPro Toolkit Reference Manual"));
         // Start at indent 1 to avoid a spurious level
-        AddIndexByClass(wxT("ARM"), wxT("ref/gnupro-ref/arm/ARM_COMBO_front.html"), wxT("ref/gnupro-ref/arm/ARM_COMBOTOC.html"), 1);
-        AddIndexByClass(wxT("Fujitsu SPARClite"), wxT("ref/gnupro-ref/sparclite/index.html"), wxT("ref/gnupro-ref/sparclite/index.html"), 1);
-        AddIndexByClass(wxT("Matsushita MN10300"), wxT("ref/gnupro-ref/mn10300/am33_front.html"), wxT("ref/gnupro-ref/mn10300/am33toc.html"), 1);
-        AddIndexByClass(wxT("PowerPC"), wxT("ref/gnupro-ref/powerpc/index.html"), wxT("ref/gnupro-ref/powerpc/index.html"));
-        AddIndexByClass(wxT("Toshiba MIPS TX39"), wxT("/gnupro-ref/tx39/index.html"), wxT("/gnupro-ref/tx39/index.html"));
-        
+//        AddIndexByClass(wxT("ARM"), wxT("ref/gnupro-ref/arm/ARM_COMBO_front.html"), wxT("ref/gnupro-ref/arm/ARM_COMBOTOC.html"), 1);
+//        AddIndexByClass(wxT("Fujitsu SPARClite"), wxT("ref/gnupro-ref/sparclite/index.html"), wxT("ref/gnupro-ref/sparclite/index.html"), 1);
+//        AddIndexByClass(wxT("Matsushita MN10300"), wxT("ref/gnupro-ref/mn10300/am33_front.html"), wxT("ref/gnupro-ref/mn10300/am33toc.html"), 1);
+//        AddIndexByClass(wxT("PowerPC"), wxT("ref/gnupro-ref/powerpc/index.html"), wxT("ref/gnupro-ref/powerpc/index.html"));
+//        AddIndexByClass(wxT("Toshiba MIPS TX39"), wxT("/gnupro-ref/tx39/index.html"), wxT("/gnupro-ref/tx39/index.html"));
+
         // Don't parse HTML, just add this item, if the page exists.
         // Presumably the HTML can't be parsed for some reason.
-        AddIndexItem(wxT("Toshiba MIPS TX49"), wxT("ref/gnupro-ref/tx49/tx49_ref.html"));
-
-        AddIndexByClass(wxT("Hitachi SuperH"), wxT("ref/gnupro-ref/sh/SH_front.html"), wxT("ref/gnupro-ref/sh/SHTOC.html"), 1);
-        
-        AddIndexItem(wxT("NEC V850"), wxT("ref/gnupro-ref/v850/v850_ref_3.html"));
-        AddIndexByClass(wxT("NEC VR4300"), wxT("ref/gnupro-ref/vr4300/Vr43REF_front.html"), wxT("ref/gnupro-ref/vr4300/Vr43REFTOC.html"), 1);
-        AddEndSection();
+//        AddIndexItem(wxT("Toshiba MIPS TX49"), wxT("ref/gnupro-ref/tx49/tx49_ref.html"));
+
+//        AddIndexByClass(wxT("Hitachi SuperH"), wxT("ref/gnupro-ref/sh/SH_front.html"), wxT("ref/gnupro-ref/sh/SHTOC.html"), 1);
+
+//        AddIndexItem(wxT("NEC V850"), wxT("ref/gnupro-ref/v850/v850_ref_3.html"));
+//        AddIndexByClass(wxT("NEC VR4300"), wxT("ref/gnupro-ref/vr4300/Vr43REF_front.html"), wxT("ref/gnupro-ref/vr4300/Vr43REFTOC.html"), 1);
+//        AddEndSection();
     }
 
     DoIndexDocs(reposDir, projectFile, force);
-    
+
     return TRUE;
 }

 // Some things should be translated in the contents
 void ecHtmlIndexer::AddEntityTranslation(const wxString& entity, const wxString& translation)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]