[Synopsis-changes] Synopsis/Synopsis/demo/C++/Boost Makefile,1.6,1.7 synopsis.py,1.2,1.3

[Stefan Seefeld]

Update of /cvs/synopsis/Synopsis/demo/C++/Boost
In directory frida:/tmp/cvs-serv14376

Modified Files:
	Makefile synopsis.py 
Log Message:
get the boost demo in sync with the rest

Index: Makefile
===================================================================
RCS file: /cvs/synopsis/Synopsis/demo/C++/Boost/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- Makefile	2 Nov 2002 06:37:39 -0000	1.6
+++ Makefile	18 Nov 2003 17:05:17 -0000	1.7
@@ -1,21 +1,23 @@
-synopsis	:= ../../bin/synopsis -P boost.synopsis
+synopsis := python synopsis.py
 
 all:
 		@echo "The boost demo is not run by default. If you have the boost sources,"
 		@echo "you must create a symlink to the boost root directory as 'boost' here"
-		@echo "eg: ln -s ~/boost"
-		@echo "Then you can run 'make boostdemo' for the frames version"
-		@echo "  or you can run 'make boostdemo2' for the no-frames version"
+		@echo "eg: ln -s ~/boost boost"
+		@echo "Then you can run 'make bpl'"
 
-boostdemo:	
-		$(synopsis)
+bpl: bpl.syn bpl.xref
+	$(synopsis) format --output=$@ $<
 
-boostdemo2:	
-		$(synopsis) "-Wc,formatter=HTML Formatter - No Frames"
+bpl.syn xref/boost/python.hpp links/boost/python.hpp: boost/boost/python.hpp
+	$(synopsis) parse --output=$@ $?
+
+bpl.xref: bpl.syn xref/boost/python.hpp
+	$(synopsis) xref --output=$@ $<
 
 
 clean:
-		rm -rf *~ *.html *.ps *.syn core *.aux *.fn *.cp *.tp *.vr *.log *.ky *.pg \
-		       *.fns *.tps *.vrs *.pdf BoostPython BoostFiles BoostLinks BoostXRef
+	rm -rf *~ xref links bpl.syn bpl.xref
 
 distclean:	clean
+	rm -rf bpl

Index: synopsis.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/demo/C++/Boost/synopsis.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- synopsis.py	17 Nov 2003 01:26:18 -0000	1.2
+++ synopsis.py	18 Nov 2003 17:05:17 -0000	1.3
@@ -17,13 +17,16 @@ parser = Cxx.Parser(cppflags = ['-DPYTHO
                                 '-I/usr/include/python2.2'],
                     base_path = 'boost/',
                     main_file_only = True,
-                    syntax_prefix = 'BoostLinks/',
-                    xref_prefix = 'BoostXRef/',
+                    syntax_prefix = 'links/',
+                    xref_prefix = 'xref/',
                     extract_tails = True,
                     emulate_compiler = 'g++',
                     # 'extra_files' will go away shortly
                     extra_files = extra_input)
 
+xref = XRefCompiler(prefix='xref/')    # compile xref dictionary
+
+
 linker = Composite(Unduplicator(),     # remove duplicate and forward declarations
                    Stripper(),         # strip prefix (see Linker.Stripper.Stripper docs)
                    NameMapper(),       # apply name mapping if any (prefix adding, etc.)
@@ -33,18 +36,11 @@ linker = Composite(Unduplicator(),     #
                    Previous(),         # attach '//<-' comments
                    Dummies(),          # drop 'dummy' declarations
                    EmptyNS(),          # skip empty namespaces
-                   XRefCompiler(xref_prefix='BoostXRef/',
-                                output='all.xref'),     # compile xref dictionary
                    AccessRestrictor()) # filter out unwanted ('private', say) declarations
 
-dump = Dump.Formatter(show_declarations = True,
-                      show_types = True,
-                      show_files = True)
-
-formatter = HTML.Formatter()
+formatter = HTML.Formatter(stylesheet_file = '../../html.css')
 
-process(parse=parser,
-        link=linker,
-        format=formatter,
-        dump=dump,
-        all=Composite(parser, linker, formatter))
+process(parse = Composite(parser, linker),
+        xref = xref,
+        link = linker,
+        format = formatter)