FCL/sftools/depl/doctools: comparison mpdot/mpdot.py

equal deleted inserted replaced

-:d8fccb2cd802
+:468f4c8d3d5b
 import shutil
 import unittest
 #import xml
 from cStringIO import StringIO
-__version__ = '0.1.3'
+__version__ = '0.1.4'
 """
 Nokia XHTML conversion:
 $> ant ... -Dtranstype=xhtml.nokia -Dargs.input=INPUT_DITAMAP
 Nokia Eclipse Help conversion:
 CMD_PREFIX_OUTPUT   = "-Doutput.dir="
 CMD_PREFIX_TEMP     = "-Ddita.temp.dir="
 CMD_PREFIX_NERVOUS  = "echo"
 #CMD_PREFIX_XSL      = "/xsl:plugins/cxxapiref/xsl/dita2xhtml.nokia.xsl "
-DIR_DOT_COMPONENT   = 'dot_comp'
+BUILD_DIR           = 'build'
-DIR_DOT_SOURCE      = 'dot_src'
+DIR_DOT_COMPONENT   = os.path.join(BUILD_DIR, 'dot_comp')
-DIR_TOC_TMP         = 'dot_toc_tmp'
+DIR_TOC_TMP         = os.path.join(BUILD_DIR, 'dot_toc_tmp')
-DIR_DOT_TOC         = 'dot_toc'
+DIR_DOT_TOC         = os.path.join(BUILD_DIR, 'dot_toc')
 def invokeDot(theDitaMapPath, theDirOut, argList, isNervous):
 myCmdList = []
 if isNervous:
 else:
 logging.error('Not copying. Results code %d directory: %s' % (c, d))
 def execute(inToc, outDir, argList, numJobs=0, nervous=False):
 inDir = os.path.dirname(inToc)
-outDirCmpDot = os.path.join(outDir, DIR_DOT_COMPONENT)
+outDirCmpDot = os.path.join(os.path.dirname(outDir), DIR_DOT_COMPONENT)
 if not os.path.exists(outDirCmpDot):
 os.makedirs(outDirCmpDot)
 if numJobs >= 1:
 myPool = multiprocessing.Pool(processes=numJobs)
 else:
 nervous,
 )
 for t in genCompMapNames(inToc)
 ]
 myResults = [r.get() for r in [myPool.apply_async(invokeDot, t) for t in myTaskS]]
-copyDirs(myResults, os.path.join(outDir, DIR_DOT_SOURCE))
+copyDirs(myResults, outDir)
 return myResults
 class DitamapLinkConverterError(Exception):
 """ Raised if an invalid toc is input """
 logging.debug('Writing file \"%s\"' % filepath)
 if root is not None:
 with open(filepath, 'w') as f:
 f.write("""<?xml version="1.0" encoding="UTF-8"?>"""+'\n')
-f.write("""<!DOCTYPE cxxAPIMap PUBLIC "-//NOKIA//DTD DITA C++ API Map Reference Type v0.5.0//EN" "dtd/cxxAPIMap.dtd" >"""+'\n')
+f.write("""<!DOCTYPE cxxAPIMap PUBLIC "-//NOKIA//DTD DITA C++ API Map Reference Type v0.6.0//EN" "dtd/cxxAPIMap.dtd" >"""+'\n')
 f.write(etree.tostring(root))
 f.close()
 def _get_component_map_paths(self, tree):
 all_hrefs = []
 self._handle_map(component_map)
 shutil.copyfile(self.toc_path, self.out_dir+os.sep+os.path.basename(self.toc_path))
 def publish_toc(toc_path, out_dir, argList, nervous):
 toc_name = os.path.basename(toc_path)
-tmp_out =  os.path.join(out_dir, DIR_TOC_TMP)
+tmp_out =  os.path.join(os.path.dirname(out_dir), DIR_TOC_TMP)
 dlc = DitamapLinkConverter(toc_path, tmp_out)
 dlc.convert()
 toc_to_publish = os.path.join(tmp_out, toc_name)
-out = os.path.join(out_dir, DIR_DOT_TOC)
+out = os.path.join(os.path.dirname(out_dir), DIR_DOT_TOC)
 invokeDot(toc_to_publish, out, argList, nervous)
-final_destination = os.path.join(out_dir, DIR_DOT_SOURCE)
+final_destination = out_dir
 if not os.path.exists(final_destination):
 os.makedirs(final_destination)
-try:
+for item in os.listdir(out):
-shutil.copy(os.path.join(out, 'index.html'), final_destination)
+item_path = os.path.join(out, item)
-except IOError, err:
+try:
-logging.error('publish_toc(): %s' % str(err))
+if os.path.isdir(item_path):
+if os.path.exists(os.path.join(final_destination, item)):           # The published toc's META-INF files etc.
+shutil.rmtree(os.path.join(final_destination, item))            # will be the final ones in the publication,
+shutil.copytree(item_path, os.path.join(final_destination, item)) # any existing ones will be overwritten
+else:
+shutil.copy(item_path, final_destination)
+logging.info("Copied %s to %s" % (item_path, final_destination))
+except IOError, err:
+logging.error("Couldn't copy %s to %s, error was '%s'" % (item_path, final_destination, str(err)))
+def clean(out_dir):
+if os.path.exists(out_dir):
+shutil.rmtree(out_dir)
+if os.path.exists(os.path.join(os.path.dirname(out_dir), BUILD_DIR)):
+shutil.rmtree(os.path.join(os.path.dirname(out_dir), BUILD_DIR))
 def main():
 usage = "usage: %prog [options] <DITA map> <output directory> -Doptions without the -D"
 parser = OptionParser(usage, version='%prog ' + __version__)
 parser.add_option(
 parser.error("I need an output path.")
 return 1
 # Dump out timestamp
 print 'Start time: %s' % time.ctime()
 execTime = time.clock()
+clean(args[1])
 myResults = execute(args[0], args[1], args[2:], options.jobs, options.nervous)
 publish_toc(args[0], args[1], args[2:], options.nervous)
 print 'Number of DITA maps processed: %d' % len(myResults)
 print 'End time: %s' % time.ctime()
 print 'Elapsed time: %8.3f (s)' % (time.clock()-execTime)
 self._write_string_to_file(invalid_toc, invalid_toc_path)
 dlc = DitamapLinkConverter(invalid_toc_path, self.out_dir)
 self.assertRaises(DitamapLinkConverterError, dlc.convert)
 cmap = """<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE cxxAPIMap PUBLIC "-//NOKIA//DTD DITA C++ API Map Reference Type v0.5.0//EN" "dtd/cxxAPIMap.dtd" >
+<!DOCTYPE cxxAPIMap PUBLIC "-//NOKIA//DTD DITA C++ API Map Reference Type v0.6.0//EN" "dtd/cxxAPIMap.dtd" >
 <cxxAPIMap id="GUID-0D9E5D45-5A07-302C-BEB3-2D0252214F2E" title="wlmplatform">
 <cxxStructRef href="GUID-AE25CF37-B862-306B-B7B3-4A1226B83DA2.xml" navtitle="_SChannels" />
 <cxxFileRef href="GUID-E1984316-685F-394E-B71A-9816E1495C1F.xml" navtitle="wlanerrorcodes.h" />
 <cxxClassRef href="GUID-F795E994-BCB6-3040-872A-90F8ADFC75E7.xml" navtitle="MWlanMgmtNotifications" />
 </cxxAPIMap>
 """
 #
 converted_cmap = """<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE cxxAPIMap PUBLIC "-//NOKIA//DTD DITA C++ API Map Reference Type v0.5.0//EN" "dtd/cxxAPIMap.dtd" >
+<!DOCTYPE cxxAPIMap PUBLIC "-//NOKIA//DTD DITA C++ API Map Reference Type v0.6.0//EN" "dtd/cxxAPIMap.dtd" >
 <cxxAPIMap id="GUID-0D9E5D45-5A07-302C-BEB3-2D0252214F2E" title="wlmplatform">
 <cxxStructRef format="html" href="GUID-AE25CF37-B862-306B-B7B3-4A1226B83DA2.html" navtitle="_SChannels" scope="peer" />
 <cxxFileRef format="html" href="GUID-E1984316-685F-394E-B71A-9816E1495C1F.html" navtitle="wlanerrorcodes.h" scope="peer" />
 <cxxClassRef format="html" href="GUID-F795E994-BCB6-3040-872A-90F8ADFC75E7.html" navtitle="MWlanMgmtNotifications" scope="peer" />
 </cxxAPIMap>"""

changeset 4	468f4c8d3d5b
parent 2	932c358ece3e