[ocamldoc] Distinguish between libs and packs

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>

diff --git a/Makefile b/Makefile
index 0c0a45a2bc778ef7c33c0332ea7feacc1419b5b8..78a75a3e6abef6477e8f60809e676aefbf5c7194 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -145,9 +145,9 @@ xapi-libs: $(OUTPUT_XAPI_PKG) $(MY_SOURCES)/MANIFEST
        
 .PHONY: doc
 doc:
+       $(MAKE) -C uuid doc
        $(MAKE) -C stdext doc
        $(MAKE) -C sexpr doc
-       $(MAKE) -C uuid doc
        $(MAKE) -C log doc
        $(MAKE) -C xb doc
        $(MAKE) -C xc doc
@@ -157,7 +157,6 @@ doc:
        $(MAKE) -C http-svr doc
        $(MAKE) -C camldm doc
        $(MAKE) -C cdrom doc
-       $(MAKE) -C close-and-exec doc
        $(MAKE) -C eventchn doc
        $(MAKE) -C pciutil doc
        $(MAKE) -C rss doc

diff --git a/camldm/Makefile b/camldm/Makefile
index 808d7cc647fe8f06d6c585c589d334ee56ae7ee4..c83d1452dcb209a4aedea567bebae67724ef5ef8 100644 (file)
--- a/camldm/Makefile
+++ b/camldm/Makefile
@@ -64,7 +64,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "camldm" "library" "$(OBJS)" "." "" ""
+       python ../doc/doc.py $(DOCDIR) "camldm" "package" "$(OBJS)" "." "" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/cdrom/Makefile b/cdrom/Makefile
index ae7e8de3d7525f6cd379a3242657cadef5d87092..b84afd6e1270b744250c0201ca36edb03b84ee86 100644 (file)
--- a/cdrom/Makefile
+++ b/cdrom/Makefile
@@ -63,7 +63,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "cdrom" "library" "$(OBJS)" "." "" ""
+       python ../doc/doc.py $(DOCDIR) "cdrom" "package" "$(OBJS)" "." "" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/doc/doc.py b/doc/doc.py
index 527b825886d08abbee0e56ba9605012cc1881731..abba485a80f3d9faac8b73e86e5074aa11110b6c 100644 (file)
--- a/doc/doc.py
+++ b/doc/doc.py
@@ -21,24 +21,23 @@ xenapi_docdir = '/myrepos/xen-api.hg/ocaml/doc'
 
 docdir = sys.argv[1]
 name = sys.argv[2]
-if sys.argv[3] == "library": is_library = True
-else: is_library = False
+ctype = sys.argv[3]
 modules = set(sys.argv[4].split())
 includes = sys.argv[5].split()
-packs = sys.argv[6]
-libs = sys.argv[7]
+packs = sys.argv[6].replace(',',' ').split()
+libs = sys.argv[7].split()
+
+libs = list(set(libs)) # remove duplicates
+packs = list(set(packs))       # remove duplicates
 
 dest = docdir + '/content/' + name
 try:
        os.makedirs(dest)
 except:
        pass
-       
-packs = packs.replace(',', ' ')
-packs = packs.split()
 
 if len(packs) > 0:
-       packages = "-package " + str(','.join(packs))
+       packages = "-package " + ','.join(packs)
 else:
        packages = ""
 
@@ -61,14 +60,13 @@ for i in includes:
 
 os.system(doc_command + ' ' + string.join(includesx) + ' ' + string.join(files))
 
-# add library dependencies to index files
+# add dependencies to index files
 
 f = file(dest + '/index.json', 'a')
-libs = libs.split()
-libs.extend(packs)
-libs = map(lambda s: '"' + s.split('/')[-1] + '"', libs)
-libs = list(set(libs)) # remove duplicates
-s = 'deps_' + name.replace("-", "") + ' = [' + ', '.join(libs) + '];'
+packs_s = map(lambda s: '"' + s.split('/')[-1] + '"', packs)
+libs_s = map(lambda s: '"' + s.split('/')[-1] + '"', libs)
+s = 'deps_' + name.replace("-", "") + ' = {"packs": [' + ', '.join(packs_s) + '], '
+s += '"libs": [' + ', '.join(libs_s) + ']}'
 f.write(s)
 f.close()
 
@@ -77,25 +75,31 @@ f.close()
 def update_components(compdir):
        executables = []
        libraries = []
-
+       packages = []
+       
        try:
                f = file(compdir + '/components.js', 'r')
                exec(f.readline())
                exec(f.readline())
+               exec(f.readline())
                f.close()
        except:
                pass
 
-       if is_library:
+       if ctype == "library":
                libraries.append(name)
                libraries = list(set(libraries))
+       elif ctype == "package":
+               packages.append(name)
+               packages = list(set(packages))
        else:
                executables.append(name)
                executables = list(set(executables))
 
        f = file(compdir + '/components.js', 'w')
        f.write('executables = ' + str(executables) + '\n')
-       f.write('libraries = ' + str(libraries))
+       f.write('libraries = ' + str(libraries) + '\n')
+       f.write('packages = ' + str(packages))
        f.close()
 
 update_components(docdir)

diff --git a/eventchn/Makefile b/eventchn/Makefile
index dbe96d0eda1119af22665cdfad513030d339cd88..34359e4c7d447ec34237fd8860e4099bf764abbd 100644 (file)
--- a/eventchn/Makefile
+++ b/eventchn/Makefile
@@ -63,7 +63,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "eventchn" "library" "$(OBJS)" "." "" ""
+       python ../doc/doc.py $(DOCDIR) "eventchn" "package" "$(OBJS)" "." "" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/http-svr/Makefile b/http-svr/Makefile
index 0b2f214f6f643ea21284a4bceb39ac4819b56867..6867aab97b627fd5cbaacb8925f99936bc21929d 100644 (file)
--- a/http-svr/Makefile
+++ b/http-svr/Makefile
@@ -56,7 +56,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "http-svr" "library" "$(OBJS)" "." "log,stdext" ""
+       python ../doc/doc.py $(DOCDIR) "http-svr" "package" "$(OBJS)" "." "log,stdext" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/log/Makefile b/log/Makefile
index 22570d9f7cd95be413906f9d4e99b06f20f7ac88..48eb7c8a0a4d3b4e4d76f3a4cd698a22ef0c8281 100644 (file)
--- a/log/Makefile
+++ b/log/Makefile
@@ -70,7 +70,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "log" "library" "$(OBJS)" "." "stdext" ""
+       python ../doc/doc.py $(DOCDIR) "log" "package" "$(OBJS)" "." "stdext" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/mmap/Makefile b/mmap/Makefile
index 2bc1d7e26d9d21f942d18ff980572550b9549dd1..8701f3f191c237532997ebcc57cd47ef5dbbb4f0 100644 (file)
--- a/mmap/Makefile
+++ b/mmap/Makefile
@@ -63,7 +63,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "mmap" "library" "$(OBJS)" "." "" ""
+       python ../doc/doc.py $(DOCDIR) "mmap" "package" "$(OBJS)" "." "" ""
 
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/pciutil/Makefile b/pciutil/Makefile
index 7813e8e1455a79d5bff01b978ae769fb6ff920f5..19976251261c9dfde76a15c219ed6e840b43d20b 100644 (file)
--- a/pciutil/Makefile
+++ b/pciutil/Makefile
@@ -72,7 +72,7 @@ binuninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "pciutil" "library" "$(OBJS)" "." "stdext" ""
+       python ../doc/doc.py $(DOCDIR) "pciutil" "package" "$(OBJS)" "." "stdext" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/rpc-light/Makefile b/rpc-light/Makefile
index 5dc5e3bb7cc6f217ff757b09368cfe72393e178f..6e53f5fe3c0c0e618761ffb4e999b62a96549536 100644 (file)
--- a/rpc-light/Makefile
+++ b/rpc-light/Makefile
@@ -73,7 +73,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "rpc-light" "library" "jsonrpc pa_rpc rpc xmlrpc" "." "xmlm" ""
+       python ../doc/doc.py $(DOCDIR) "rpc-light" "package" "jsonrpc pa_rpc rpc xmlrpc" "." "xmlm" ""
        
 clean:
        rm -f *.cmo *.cmx *.cma *.cmxa *.annot *.o *.cmi *.a

diff --git a/rss/Makefile b/rss/Makefile
index d389816ae29593a152fead68a375318e0ec6a09b..5260e745c5f8a2eac9d3f430df3fcb73c2acf9c1 100644 (file)
--- a/rss/Makefile
+++ b/rss/Makefile
@@ -56,7 +56,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "rss" "library" "$(OBJS)" "." "xml-light2" ""
+       python ../doc/doc.py $(DOCDIR) "rss" "package" "$(OBJS)" "." "xml-light2" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/sexpr/Makefile b/sexpr/Makefile
index 3af4d086b93307feac5ffcfc182fa1e5f345fbd2..25362958a2055c1a9c21e874cfe5aedf589bdfe4 100644 (file)
--- a/sexpr/Makefile
+++ b/sexpr/Makefile
@@ -86,7 +86,7 @@ binuninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "sexpr" "library" "$(OBJS)" "." "stdext" ""
+       python ../doc/doc.py $(DOCDIR) "sexpr" "package" "$(OBJS)" "." "stdext" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot sExprLexer.ml{,i} sExprParser.ml{,i} $(LIBS) $(PROGRAMS)

diff --git a/stdext/Makefile b/stdext/Makefile
index 01b19d758d99ecd2f061ac061e33e7820ad983c4..ab94abf6f85b7f6e10a7a4c41ee154d92e103fd3 100644 (file)
--- a/stdext/Makefile
+++ b/stdext/Makefile
@@ -117,7 +117,7 @@ binuninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "stdext" "library" "$(STDEXT_OBJS)" "." "threads,uuid,unix" ""
+       python ../doc/doc.py $(DOCDIR) "stdext" "package" "$(STDEXT_OBJS)" "." "threads,uuid,unix" ""
 
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/stunnel/Makefile b/stunnel/Makefile
index 8e5b465ce62a2f6126318918ea78101dc2140efb..3dc049ddad08b001aef964645d6803a7b50669be 100644 (file)
--- a/stunnel/Makefile
+++ b/stunnel/Makefile
@@ -56,7 +56,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "stunnel" "library" "$(OBJS)" "." "stdext,log" ""
+       python ../doc/doc.py $(DOCDIR) "stunnel" "package" "$(OBJS)" "." "stdext,log" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/uuid/Makefile b/uuid/Makefile
index 443a5a240de8f68aa4ebd8ea82c222829191f7ab..0e273d01d90ebe894e073cbde836d127f9f5a095 100644 (file)
--- a/uuid/Makefile
+++ b/uuid/Makefile
@@ -56,7 +56,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "uuid" "library" "$(OBJS)" "." "" ""
+       python ../doc/doc.py $(DOCDIR) "uuid" "package" "$(OBJS)" "." "" ""
 
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/xb/Makefile b/xb/Makefile
index b34f6f14f543d7dfe9d4a413c792fb2d1b066ca3..3707e1b8c576a5c53de694a17be30247e661e37c 100644 (file)
--- a/xb/Makefile
+++ b/xb/Makefile
@@ -69,7 +69,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "xb" "library" "$(OBJS)" "." "mmap" ""
+       python ../doc/doc.py $(DOCDIR) "xb" "package" "$(OBJS)" "." "mmap" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/xc/Makefile b/xc/Makefile
index 4ef96d6a8b17fbd994d7c7d3d3ce9f132555a975..24eba3238704304fa72bbc5ab2239eb8e4ef75ce 100644 (file)
--- a/xc/Makefile
+++ b/xc/Makefile
@@ -63,7 +63,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "xc" "library" "$(OBJS)" "." "mmap,uuid" ""
+       python ../doc/doc.py $(DOCDIR) "xc" "package" "$(OBJS)" "." "mmap,uuid" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS) $(INTF)

diff --git a/xml-light2/Makefile b/xml-light2/Makefile
index b61638c80a3aa80e8db30cb8e3c95d6f11ed4714..d45c8ae200e1ae442e6fe4df53df62ce506a5c46 100644 (file)
--- a/xml-light2/Makefile
+++ b/xml-light2/Makefile
@@ -77,7 +77,7 @@ binuninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "xml-light2" "library" "$(OBJS)" "." "stdext,xmlm" ""
+       python ../doc/doc.py $(DOCDIR) "xml-light2" "package" "$(OBJS)" "." "stdext,xmlm" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/xs/Makefile b/xs/Makefile
index 34ba49b1f0a4582b8c6be7a0c15a3f0094daf94f..74086d0a350d3b27283763e6fa93a3935c0b3f4a 100644 (file)
--- a/xs/Makefile
+++ b/xs/Makefile
@@ -59,7 +59,7 @@ uninstall:
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "xs" "library" "$(OBJS)" "." "xb" ""
+       python ../doc/doc.py $(DOCDIR) "xs" "package" "$(OBJS)" "." "xb" ""
 
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)

diff --git a/xsrpc/Makefile b/xsrpc/Makefile
index 0437fb2623daed18f6d47db54f0ea4624bf7b2b1..0d9e9daf003656d113af485820b311d2e006f554 100644 (file)
--- a/xsrpc/Makefile
+++ b/xsrpc/Makefile
@@ -56,7 +56,7 @@ uninstall:
        
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "xsrpc" "library" "$(OBJS)" "." "xb,xs" ""
+       python ../doc/doc.py $(DOCDIR) "xsrpc" "package" "$(OBJS)" "." "xb,xs" ""
        
 clean:
        rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot META $(LIBS) $(PROGRAMS)