Changeset 3532

Timestamp:

04/30/07 15:38:18 (6 years ago)

Author:

bhilburn

Message:

Apparently the OS module doesn't handle regex very well. Made the os.remove lines more specific.

Location:

WaveDev/trunk/WaveDev/wavedev

Files:

• XML_gen/application_gen.py (modified) (5 diffs)
• XML_gen/component_gen.py (modified) (3 diffs)
• generate/genNode.py (modified) (1 diff)

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

@@ -231 +231 @@
   
    # Remove temporary files
-   #os.system('rm -f ' + waveformDir + '.*.tmp')
-   os.remove(waveformDir + '.*.tmp')
+   os.remove(outputFilename_sad + '.tmp')
    
    #######################
@@ -282 +281 @@
     
     # Remove temporary files
-    #os.system('rm -f ' + path + '.*.tmp')
-    os.remove(path + '.*.tmp')
+    os.remove(path+'.'+waveName+'_DAS.xml.tmp')
 
 ################################################################################
@@ -329 +327 @@
   
     # Remove temporary files
-    #os.system('rm -f ' + path + '.*.tmp')
-    os.remove(path + '.*.tmp')
+    os.remove(path + '.' + outputFilename_spd + '.tmp')
     
     #tempDM = CC.Component(dmName,generate=False)
@@ -337 +334 @@
     # Copy the scd and prf files to directory - these aren't changed yet
     print "Performing a copy to: " + path + outputFilename_scd
-    #os.system('cp XML_gen/DevMan/_scd.xml.tpl ' + path + outputFilename_scd)
-    #os.system('cp XML_gen/DevMan/_prf.xml.tpl ' + path + outputFilename_prf)
     shutil.copyfile('XML_gen/DevMain/_scd.xml.tpl', path + outputFilename_scd)
     shutil.copyfile('XML_gen/DevMain/_prf.xml.tpl', path + outputFilename_prf)
@@ -410 +405 @@
   
     # Remove temporary files
-    #os.system('rm -f ' + path + '.*.tmp')
-    os.remove(path + '.*.tmp')
+    os.remove(path + '.' + outputFilename_dcd + '.tmp')

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

@@ -103 +103 @@
    
     # Remove temporary files
-    #os.system('rm -f ' + compDir + '.*.tmp')
-    os.remove(compDir + '.*.tmp')
+    os.remove(compDir + '.' + outputFileName_scd + '.tmp')
    
    
@@ -147 +146 @@
    
     # Remove temporary files
-    #os.system('rm -f ' + compDir + '.*.tmp')
-    os.remove(compDir + '.*.tmp')
+    os.remove(compDir + '.' + outputFileName_spd + '.tmp')
     
 def gen_prf(comp, waveformDir):
@@ -228 +226 @@
    
     # Remove temporary files
-    #os.system('rm -f ' + compDir + '.*.tmp')
-    os.remove(compDir + '.*.tmp')
+    os.remove(compDir + '.' + outputFileName_prf + '.tmp')

WaveDev/trunk/WaveDev/wavedev/generate/genNode.py

@@ -1034 +1034 @@
       for c in self.active_wave.components:
         if c.AssemblyController == True and c.generate:
-            #os.system('mv ' + self.path + c.name + ' ' + self.path + self.active_wave.name)
             shutil.move(self.path + c.name, self.path + self.active_wav.name)
-
-