Changeset 8114

Timestamp:

07/31/08 13:20:38 (5 years ago)

Author:

Snyder.Jason

Message:

merging jsnyder branch of wavedev back into truck

Location:

ossiedev/trunk/tools/WaveDev/wavedev

Files:

• XML_gen/application_gen.py (modified) (11 diffs)
• XML_gen/component_gen.py (modified) (8 diffs)
• XML_gen/xmlBeautify.py (modified) (2 diffs)
• cfg.py (copied) (copied from ossiedev/branches/jsnyder/ComponentProject/WaveDev/wavedev/cfg.py)
• uuidgen.py (copied) (copied from ossiedev/branches/jsnyder/ComponentProject/WaveDev/wavedev/uuidgen.py)

ossiedev/trunk/tools/WaveDev/wavedev/XML_gen/application_gen.py

@@ -22 +22 @@
 import shutil
 import component_gen
-from component_gen import ensureDocType
 import xml.dom.minidom
 from xml.dom.minidom import Node
@@ -30 +29 @@
 
 
-commentLine = u'<!--Created with OSSIE WaveDev ' \
-    + u'-->\n<!--Powered by Python-->\n'
+
+
+commentLine = u'<!-- Created with OSSIE WaveDev-->\n<!--Powered by Python-->\n'
+
 xmlpath = u'/xml/'
 #######################################################################
@@ -273 +274 @@
             assemblycontrollerNode.getElementsByTagName("componentinstantiationref")[0].setAttribute("refid", assemblycontroller_id)
 
-    # Define <!DOCTYPE> here (overriding template if necessary)
-    ensureDocType(doc_sad, u'softwareassembly', u'../../xml/dtd/softwareassembly.dtd')
-
     # Create and beautify the SAD file as a temporary file
     data = doc_sad.toxml('UTF-8')
@@ -281 +279 @@
 
     # Post Processing - add some of the header lines
+
 
     preProcessed_sad = open(waveformDir + '.' + outputFilename_sad + '.tmp', 'r')
@@ -289 +288 @@
     remaining = preProcessed_sad.readlines()
     postProcessed_sad.writelines(line0)
-    #postProcessed_sad.writelines(u'<!DOCTYPE softwareassembly SYSTEM \"../../xml/dtd/softwareassembly.dtd\">\n')
+    postProcessed_sad.writelines(u'<!DOCTYPE softwareassembly SYSTEM \"../../xml/dtd/softwareassembly.dtd\">\n')
     postProcessed_sad.writelines(commentLine)
     postProcessed_sad.writelines(remaining)
@@ -296 +295 @@
     # Remove temporary files
     os.remove(waveformDir + '.' + outputFilename_sad + '.tmp')
+
 
     #######################
@@ -343 +343 @@
         deviceassignmentsequenceNode.appendChild(deviceassignmenttypeNode)
 
-    # Define <!DOCTYPE> here (overriding template if necessary)
-    # ensureDocType(das, u'deploymentenforcement', u'../../xml/dtd/deploymentenforcement.dtd')
     data = das.toxml('UTF-8')
     xmlBeautify.beautify(data,path+'.'+waveName+'_DAS.xml.tmp')
+
+
 
     # Post Processing - add some of the header lines
@@ -365 +365 @@
     os.remove(path+'.'+waveName+'_DAS.xml.tmp')
 
+
 ################################################################################
 # Generate the DeviceManager XML files
@@ -391 +392 @@
     localfileNode.setAttribute("name", unicode(dmName) + u'.scd.xml')
 
-    # Define <!DOCTYPE> here (overriding template if necessary)
-    ensureDocType(doc_spd, u'softpkg', u'../../xml/dtd/softpkg.dtd')
+    data = doc_spd.toxml('UTF-8')
+    xmlBeautify.beautify(data,path + '.' + outputFilename_spd + '.tmp')
     data = doc_spd.toxml('UTF-8')
     xmlBeautify.beautify(data,path + '.' + outputFilename_spd + '.tmp')
@@ -414 +415 @@
     os.remove(path + '.' + outputFilename_spd + '.tmp')
 
+
     #tempDM = CC.Component(dmName,generate=False)
     #component_gen.gen_scd(tempDM,waveformDir,node.name)
+
+
+    # Post Processing - add some of the header lines
+
+    preProcessed_spd = open(path + '.' + outputFilename_spd + '.tmp', 'r')
+    postProcessed_spd = open(path + outputFilename_spd, 'w')
+
+    # Specify external DTD
+    line0 = preProcessed_spd.readline()
+    remaining = preProcessed_spd.readlines()
+    postProcessed_spd.writelines(line0)
+    postProcessed_spd.writelines(u'<!DOCTYPE softpkg SYSTEM \"../../xml/dtd/softpkg.dtd\">\n')
+    postProcessed_spd.writelines(commentLine)
+    postProcessed_spd.writelines(remaining)
+    postProcessed_spd.close()
+
+    # Remove temporary files
+    os.remove(path + '.' + outputFilename_spd + '.tmp')
+
+    #tempDM = CC.Component(dmName,generate=False)
+    #component_gen.gen_scd(tempDM,waveformDir,node.name)
+
 
     # Copy the scd and prf files to directory - these aren't changed yet
@@ -482 +506 @@
         partitioningNode.appendChild(componentplacementNode)
 
-    # Define <!DOCTYPE> here (overriding template if necessary)
-    ensureDocType(doc_dcd, u'deviceconfiguration', u'../../xml/dtd/deviceconfiguration.dtd')
+    # Create and beautify the dcd file as a temporary file
+    data = doc_dcd.toxml('UTF-8')
+    xmlBeautify.beautify(data,path + '.' + outputFilename_dcd + '.tmp')
     # Create and beautify the dcd file as a temporary file
     data = doc_dcd.toxml('UTF-8')

ossiedev/trunk/tools/WaveDev/wavedev/XML_gen/component_gen.py

@@ -24 +24 @@
 import xml.dom.minidom
 from xml.dom.minidom import Node
+
 import xmlBeautify
 import uuidgen 
 
 
+
 xmlpath = u'xml/'
 binpath = u'bin/'
 
-commentLine = u'<!--Created with OSSIE WaveDev ' + u'-->\n<!--Powered by Python-->\n' 
+
+commentLine = u'<!--Created with OSSIE WaveDev-->\n<!--Powered by Python-->\n'
 
 def gen_scd(comp, waveformDir, wavedevPath):
@@ -99 +102 @@
     outputFileName_scd = comp.name + '.scd.xml'
 
-    # Define <!DOCTYPE> here (overriding template if necessary)
-    ensureDocType(doc_scd, u'softwarecomponent', u'../dtd/softwarecomponent.dtd')
+    data = doc_scd.toxml('UTF-8')
+    xmlBeautify.beautify(data,compDir + '.' + outputFileName_scd + '.tmp')
+
+    preProcessed_scd = open(compDir + '.' + outputFileName_scd + '.tmp', 'r')
+    postProcessed_scd = open(compDir + outputFileName_scd, 'w')
+
+    # Specify external DTD
+    line0 = preProcessed_scd.readline()
+    remaining = preProcessed_scd.readlines()
+    postProcessed_scd.writelines(line0)
+    postProcessed_scd.writelines(u'<!DOCTYPE softwarecomponent SYSTEM \"../dtd/softwarecomponent.dtd\">\n')
+    postProcessed_scd.writelines(commentLine)
+    postProcessed_scd.writelines(remaining)
+    postProcessed_scd.close()
+
+    # Remove temporary files
+    os.remove(compDir + '.' + outputFileName_scd + '.tmp')
     data = doc_scd.toxml('UTF-8')
     xmlBeautify.beautify(data,compDir + '.' + outputFileName_scd + '.tmp')
@@ -116 +134 @@
     postProcessed_scd.close()
 
+
     # Remove temporary files
     os.remove(compDir + '.' + outputFileName_scd + '.tmp')
+
 
 
@@ -158 +178 @@
     #outputFileName_spd = comp.name + 'Resource' + '.spd.xml'
 
-    # Define <!DOCTYPE> here (overriding template if necessary)
-    ensureDocType(doc_spd, u'softpkg', u'../dtd/softpkg.dtd')
     data = doc_spd.toxml('UTF-8')
     xmlBeautify.beautify(data,compDir + '.' + outputFileName_spd + '.tmp')
+    data = doc_spd.toxml('UTF-8')
+    xmlBeautify.beautify(data,compDir + '.' + outputFileName_spd + '.tmp')
+
 
     preProcessed_spd = open(compDir + '.' + outputFileName_spd + '.tmp', 'r')
@@ -170 +191 @@
     remaining = preProcessed_spd.readlines()
     postProcessed_spd.writelines(line0)
-    #postProcessed_spd.writelines(u'<!DOCTYPE softpkg SYSTEM \"../dtd/softpkg.dtd\">\n')
+    postProcessed_spd.writelines(u'<!DOCTYPE softpkg SYSTEM \"../dtd/softpkg.dtd\">\n')
     postProcessed_spd.writelines(commentLine)
     postProcessed_spd.writelines(remaining)
@@ -177 +198 @@
     # Remove temporary files
     os.remove(compDir + '.' + outputFileName_spd + '.tmp')
+
 
 def gen_prf(comp, waveformDir, wavedevPath):
@@ -270 +292 @@
     #outputFileName_prf = comp.name + 'Resource' + '.prf.xml'
 
-    # Define <!DOCTYPE> here (overriding template if necessary)
-    ensureDocType(doc_prf, u'properties', u'../dtd/properties.dtd')
     data = doc_prf.toxml('UTF-8')
     xmlBeautify.beautify(data,compDir + '.' + outputFileName_prf + '.tmp')
+    data = doc_prf.toxml('UTF-8')
+    xmlBeautify.beautify(data,compDir + '.' + outputFileName_prf + '.tmp')
 
     preProcessed_prf = open(compDir + '.' + outputFileName_prf + '.tmp', 'r')
     postProcessed_prf = open(compDir + outputFileName_prf, 'w')
+
 
     # Specify external DTD
@@ -282 +305 @@
     remaining = preProcessed_prf.readlines()
     postProcessed_prf.writelines(line0)
-    #postProcessed_prf.writelines(u'<!DOCTYPE properties SYSTEM \"../dtd/properties.dtd\">\n')
+    postProcessed_prf.writelines(u'<!DOCTYPE properties SYSTEM \"../dtd/properties.dtd\">\n')
     postProcessed_prf.writelines(commentLine)
     postProcessed_prf.writelines(remaining)
     postProcessed_prf.close()
 
+
     # Remove temporary files
     os.remove(compDir + '.' + outputFileName_prf + '.tmp')
-
-def ensureDocType(xmldoc, name, systemId):
-    # Define <!DOCTYPE> here (overriding template if necessary)
-    if xmldoc.doctype == None:
-        xmldoc.doctype = xml.dom.minidom.DocumentType(name)
-        xmldoc.insertBefore(xmldoc.doctype, xmldoc.firstChild)
-    xmldoc.doctype.name = name
-    xmldoc.doctype.systemId = systemId

ossiedev/trunk/tools/WaveDev/wavedev/XML_gen/xmlBeautify.py

@@ -26 +26 @@
     if len(output) > 0:
         sys.stdout = open(output,'w')
-        
-    myprint = sys.stdout.write 
-        
+
+    myprint = sys.stdout.write
+
     fields = re.split('(<.*?>)',data)
     #remove any lone instances of '\n' or '\t' or pure whitespace strings
@@ -61 +61 @@
 
     if len(output) > 0:
+        print ''
         sys.stdout = store_stdout