[Synopsis-changes] Synopsis/Synopsis/docs/RefManual Makefile,1.37,1.38 Manual.texi,1.2,1.3 synopsis.py,1.1,1.2

Stefan Seefeld stefan at synopsis.fresco.org
Thu Nov 20 21:38:23 UTC 2003


Update of /cvs/synopsis/Synopsis/docs/RefManual
In directory frida:/tmp/cvs-serv24187/docs/RefManual

Modified Files:
	Makefile Manual.texi synopsis.py 
Log Message:
RefManual now builds html, info, pdf. Only need to fix the bugs now :-)

Index: Makefile
===================================================================
RCS file: /cvs/synopsis/Synopsis/docs/RefManual/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -d -r1.37 -r1.38
--- Makefile	20 Nov 2003 04:52:05 -0000	1.37
+++ Makefile	20 Nov 2003 21:38:21 -0000	1.38
@@ -10,47 +10,51 @@ cxx_h		:= $(wildcard $(topdir)/Synopsis/
 cxx_h_syn	:= $(patsubst $(topdir)/%.h, %.h.syn, $(cxx_h))
 cxx_cc		:= $(wildcard $(topdir)/Synopsis/Parser/C++/syn/*.cc)
 cxx_cc		+= $(wildcard $(topdir)/Synopsis/Parser/C++/occ/*.cc)
+texi-help	:= aux cp cps fn fns ky log pg toc tp tps vr vrs
 
-TEXI		:= core-ast.texi core-type.texi core-util.texi \
-		   parser-c++.texi parser-idl.texi parser-py.texi \
-		   linker.texi \
-		   formatter-ascii.texi formatter-html.texi formatter-dump.texi formatter-dia.texi \
-		   formatter-db.texi formatter-dot.texi formatter-html-simple.texi formatter-texi.texi
 
+TEXI		:= ast.texi type.texi util.texi \
+            parsers-c++.texi parsers-idl.texi parsers-py.texi \
+            processors.texi \
+            formatters-ascii.texi formatters-html.texi formatters-dump.texi \
+            formatters-dia.texi formatters-db.texi formatters-dot.texi \
+            formatters-html-simple.texi formatters-texi.texi
 
-all: py.syn
+all: html pdf info
+
+pdf: Manual.pdf
 
 vpath %.py $(topdir)
 vpath %.cc $(topdir)
 vpath %.h $(topdir)
 vpath %.hh $(topdir)
 
-html:   c++.syn
+html:   all.syn
 	@echo formatting $@
 	@$(synopsis) html --output=$@ $^
 
 # Compile Python files
 $(py_syn): %.syn: %.py
 	@echo parsing $^
-	if [ ! -d $(dir $@) ]; then mkdir -p $(dir $@); fi
+	mkdir -p $(dir $@)
 	$(synopsis) python --output=$@ $^
 
 # Compile C++ .hh files
 $(cxx_hh_syn): %.hh.syn: $(topdir)/%.hh
 	@echo parsing $^
-	if [ ! -d $(dir $@) ]; then mkdir -p $(dir $@); fi
+	mkdir -p $(dir $@)
 	$(synopsis) cxx --output=$@ $?
 
 # Compile C++ .h files
 $(cxx_h_syn): %.h.syn: $(topdir)/%.h
 	@echo parsing $^
-	@if [ ! -d $(dir $@) ]; then mkdir -p $(dir $@); fi
+	mkdir -p $(dir $@)
 	$(synopsis) cxx --output=$@ $?
 
 # Compile C++ .cc files
 $(cxx_cc_syn): %.cc.syn: $(topdir)/%.cc
 	@echo parsing $^
-	@if [ ! -d $(dir $@) ]; then mkdir -p $(dir $@); fi
+	mkdir -p $(dir $@)
 	$(synopsis) cxx --output=$@ $?
 
 # Link Python files together
@@ -68,67 +72,77 @@ all.syn: py.syn c++.syn
 	@echo linking all files together
 	@$(synopsis) link --output=$@ $^
 
-texi-help	:= aux cp cps fn fns ky log pg toc tp tps vr vrs
-
-html-doxygen:   all.syn
-	@echo formatting $@
-	@$(synopsis) -Wc,formatter=Doxygen $^
-
-core-ast.syn:	py.syn
+ast.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Core::AST' -o $@ $^
-core-type.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::AST' --output=$@ $^
+
+type.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Core::Type' -o $@ $^
-core-util.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Type' --output=$@ $^
+
+util.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Core::Util' -o $@ $^
-parser-c++-py.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Util' --output=$@ $^
+
+parsers-c++-py.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Parser::C++' -o $@ $^
-parser-c++-cpp.syn:	c++.syn
+	$(synopsis) strip --scope='Synopsis::Parsers::Cxx' --output=$@ $^
+
+parsers-c++-cpp.syn:	c++.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -o $@ $^
-parser-c++.syn:	parser-c++-py.syn parser-c++-cpp.syn
+	$(synopsis) link --output=$@ $^
+
+parsers-c++.syn:	parsers-c++-py.syn parsers-c++-cpp.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -o $@ $^
-parser-idl.syn:	py.syn
+	$(synopsis) link --output=$@ $^
+
+parsers-idl.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Parser::IDL' -o $@ $^
-parser-py.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Parsers::IDL' --output=$@ $^
+
+parsers-py.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Parser::Python' -o $@ $^
-linker.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Parsers::Python' --output=$@ $^
+
+processors.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Linker' -o $@ $^
-formatter-ascii.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Processors' --output=$@ $^
+
+formatters-ascii.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Formatter::ASCII' -o $@ $^
-formatter-html.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Formatters::ASCII' --output=$@ $^
+
+formatters-html.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Formatter::HTML' -o $@ $^
-formatter-dump.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Formatters::HTML' --output=$@ $^
+
+formatters-dump.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Formatter::DUMP' -o $@ $^
-formatter-dia.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Formatters::Dump' --output=$@ $^
+
+formatters-dia.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Formatter::Dia' -o $@ $^
-formatter-db.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Formatters::Dia' --output=$@ $^
+
+formatters-db.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Formatter::DocBook' -o $@ $^
-formatter-dot.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Formatters::DocBook' --output=$@ $^
+
+formatters-dot.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Formatter::Dot' -o $@ $^
-formatter-html-simple.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Formatters::Dot' --output=$@ $^
+
+formatters-html-simple.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Formatter::HTML_Simple' -o $@ $^
-formatter-texi.syn:	py.syn
+	$(synopsis) strip --scope='Synopsis::Formatters::HTML_Simple' --output=$@ $^
+
+formatters-texi.syn:	py.syn
 	@echo linking $@
-	@$(synopsis) -Wc,linker=All -Wl,-s,'Synopsis::Formatter::TexInfo' -o $@ $^
+	$(synopsis) strip --scope='Synopsis::Formatters::TexInfo' --output=$@ $^
 
 %.texi:   %.syn
 	@echo formatting $@
-	@$(synopsis) -Wc,formatter=TexInfo -o $@ $^
+	$(synopsis) texi --output=$@ $^
 
 Manual.pdf:	$(TEXI) Manual.texi
 	@echo generating $@
@@ -139,16 +153,16 @@ info:	$(TEXI) Manual.texi
 	makeinfo Manual.texi
 
 install: all
-	mkdir -p $(datadir)/synopsis
-	cp -pr html $(datadir)/synopsis
+	mkdir -p $(datadir)/Synopsis
+	cp -pr html $(datadir)/Synopsis
 	mkdir -p $(infodir)
 	install -m644 synopsis.info* $(infodir)
-	install -m644 Manual.pdf $(datadir)/synopsis
+	install -m644 Manual.pdf $(datadir)/Synopsis
 
 clean:
-	rm -rf $(sdir) *.pyc *.pyo *.syn $(TEXI) \
-	$(addprefix Manual., $(texi-help))
+	rm -rf Synopsis link xref *.syn links.toc $(TEXI) \
+     $(addprefix Manual., $(texi-help))
 
 distclean:  clean
-	rm -rf html html-doxygen syn links.toc Manual.pdf *.info* 
+	rm -rf html Manual.pdf *.info* 
 

Index: Manual.texi
===================================================================
RCS file: /cvs/synopsis/Synopsis/docs/RefManual/Manual.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- Manual.texi	10 Jul 2001 06:26:19 -0000	1.2
+++ Manual.texi	20 Nov 2003 21:38:21 -0000	1.3
@@ -52,9 +52,9 @@ some intro here
 * Acknowledgments::             Thanks!
 * Overview::                    How does it work
 * Core::                        The backbone of the synopsis tool
-* Parser::                      Parser plugins
-* Linker::                      Linker plugins
-* Formatter::                   Formatter plugins
+* Parsers::                     Parser plugins
+* Processors::                  Processor plugins
+* Formatters::                  Formatter plugins
 @end menu
 
 @node Copying, Acknowledgments, Top, Top
@@ -77,7 +77,7 @@ is provided "as is" with no express or i
 @chapter Overview
 To be written...
 
- at node Core, Parser, Overview, Top
+ at node Core, Parsers, Overview, Top
 @chapter The Core Module
 The backbone of synopsis is an Abstract Syntax Tree, together with a
 Type dictionary. Both are designed to be sufficiently abstract to support
@@ -91,50 +91,50 @@ to manipulate the data and or to generat
 @page
 
 @menu
-* Core.AST::    AST type hierarchy                    
-* Core.Type::   Type type hierarchy                
-* Core.Util::   Common utils
+* AST::    AST type hierarchy                    
+* Type::   Type type hierarchy                
+* Util::   Common utils
 @end menu
 
- at node Core.AST, Core.Type, Core, Core
+ at node AST, Type, Core, Core
 @section The AST Module
- at include core-ast.texi
+ at include ast.texi
 @page
- at node Core.Type, Core.Util, Core.AST, Core
+ at node Type, Util, AST, Core
 @section The Type Module
- at include core-type.texi
+ at include type.texi
 @page
- at node Core.Util,  , Core.Type, Core
+ at node Util,  , Type, Core
 @section The Util Module
- at include core-util.texi
+ at include util.texi
 
- at node Parser, Linker, Core, Top
- at chapter The Parser Module
+ at node Parsers, Processors, Core, Top
+ at chapter The Parsers Module
 Synopsis provides a set of parsers that generate an Abstract Syntax Tree
 from various programming languages. They are usually part of third party
 projects, such that we only need to provide a thin wrapper to bind them
 to the synopsis core.
 @page
 @section The C++ Module
- at include parser-c++.texi
+ at include parsers-c++.texi
 @page
 @section The IDL Module
- at include parser-idl.texi
+ at include parsers-idl.texi
 @page
 @section The Python Module
- at include parser-py.texi
+ at include parsers-py.texi
 
- at node Linker, Formatter, Parser, Top
- at chapter The Linker Module
+ at node Processors, Formatters, Parsers, Top
+ at chapter The Processors Module
 The linker performs some first modifications to the AST/Type dictionary
 as to resolve cross references (even across languages !), strip off
 unwanted scopes, parse the comments that are associated with the declarations
 for cross references, etc.
- at include linker.texi
+ at include processors.texi
 
- at node Formatter,  , Linker, Top
+ at node Formatters,  , Processors, Top
 
- at chapter The Formatter Module
+ at chapter The Formatters Module
 The backbone of synopsis is an Abstract Syntax Tree, which can be
 traversed using the Visitor Pattern. One of the main uses of Visitors
 is to provide different Formatters, which traverse the AST to generate
@@ -143,48 +143,48 @@ purposes, ranging from online browsing, 
 hardcopies.
 
 @menu
-* Formatter.ASCII::             ASCII formatter            
-* Formatter.HTML::              HTML formatter
-* Formatter.DUMP::              DUMP formatter (for debugging)
-* Formatter.Dia::               Dia formatter    
-* Formatter.DocBook::           DocBook formatter
-* Formatter.Dot::               Dot formatter
-* Formatter.HTML_Simple::       small HTML formatter
-* Formatter.TexInfo::           TexInfo formatter
+* Formatters.ASCII::             ASCII formatter            
+* Formatters.HTML::              HTML formatter
+* Formatters.Dump::              Dump formatter (for debugging)
+* Formatters.Dia::               Dia formatter    
+* Formatters.DocBook::           DocBook formatter
+* Formatters.Dot::               Dot formatter
+* Formatters.HTML_Simple::       small HTML formatter
+* Formatters.TexInfo::           TexInfo formatter
 @end menu
 
 @page
- at node Formatter.ASCII, Formatter.HTML, Formatter, Formatter
+ at node Formatters.ASCII, Formatters.HTML, Formatters, Formatters
 @section The ASCII Module
- at include formatter-ascii.texi
+ at include formatters-ascii.texi
 @page
- at node Formatter.HTML, Formatter.DUMP, Formatter.ASCII, Formatter
+ at node Formatters.HTML, Formatters.Dump, Formatters.ASCII, Formatters
 @section The HTML Module
- at include formatter-html.texi
+ at include formatters-html.texi
 @page
- at node Formatter.DUMP, Formatter.Dia, Formatter.HTML, Formatter
- at section The DUMP Module
- at include formatter-dump.texi
+ at node Formatters.Dump, Formatters.Dia, Formatters.HTML, Formatters
+ at section The Dump Module
+ at include formatters-dump.texi
 @page
- at node Formatter.Dia, Formatter.DocBook, Formatter.DUMP, Formatter
+ at node Formatters.Dia, Formatters.DocBook, Formatters.Dump, Formatters
 @section The Dia Module
- at include formatter-dia.texi
+ at include formatters-dia.texi
 @page
- at node Formatter.DocBook, Formatter.Dot, Formatter.Dia, Formatter
+ at node Formatters.DocBook, Formatters.Dot, Formatters.Dia, Formatters
 @section The DocBook Module
- at include formatter-db.texi
+ at include formatters-db.texi
 @page
- at node Formatter.Dot, Formatter.HTML_Simple, Formatter.DocBook, Formatter
+ at node Formatters.Dot, Formatters.HTML_Simple, Formatters.DocBook, Formatters
 @section The Dot Module
- at include formatter-dot.texi
+ at include formatters-dot.texi
 @page
- at node Formatter.HTML_Simple, Formatter.TexInfo, Formatter.Dot, Formatter
+ at node Formatters.HTML_Simple, Formatters.TexInfo, Formatters.Dot, Formatters
 @section The HTML_Simple Module
- at include formatter-html-simple.texi
+ at include formatters-html-simple.texi
 @page
- at node Formatter.TexInfo,  , Formatter.HTML_Simple, Formatter
+ at node Formatters.TexInfo,  , Formatters.HTML_Simple, Formatters
 @section The TexInfo Module
- at include formatter-texi.texi
+ at include formatters-texi.texi
 
 @unnumbered Type Index
 @printindex tp

Index: synopsis.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/docs/RefManual/synopsis.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- synopsis.py	20 Nov 2003 04:52:05 -0000	1.1
+++ synopsis.py	20 Nov 2003 21:38:21 -0000	1.2
@@ -10,13 +10,13 @@ from Synopsis.Formatters.HTML.FileLayout
 from Synopsis.Formatters.HTML.TreeFormatterJS import *
 from Synopsis.Formatters.HTML.CommentFormatter import *
 from Synopsis.Formatters.HTML.Pages import *
-from Synopsis.Formatters.HTML.Pages.FileTreeJS import FileTree
+from Synopsis.Formatters import TexInfo
 
 from distutils import sysconfig
 
 topdir = '../../'
 
-python = Composite(Python.Parser(),
+python = Composite(Python.Parser(basename = topdir),
                    JavaTags(),
                    Summarizer())
 
@@ -43,7 +43,8 @@ html = HTML.Formatter(stylesheet_file = 
                       pages = [FramesIndex(),
                                Scope(),
                                FileSource(prefix = 'links',
-                                          toc_in = ['links.toc']),
+                                          toc_in = ['links.toc'],
+                                          scope = 'Synopsis::Parser::C++::'),
                                ModuleListing(),
                                ModuleIndexer(),
                                FileListing(),
@@ -58,4 +59,6 @@ process(python = python,
         link_python = Processor(),
         link_cxx = cxx_processor,
         link = Processor(),
-        html = html)
+        strip = Stripper(),
+        html = html,
+        texi = TexInfo.Formatter())





More information about the Synopsis-changes mailing list