Changeset 1742

Timestamp:

11/07/08 20:15:41 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Fix a bug from a previous checkin that broke "cobra -bsl".

Location:

cobra/trunk/Source

Files:

• SharpGenerator.cobra (modified) (2 diffs)
• Utils.cobra (modified) (1 diff)

cobra/trunk/Source/SharpGenerator.cobra

@@ -109 +109 @@
 #                       .modules[0].fileName.endsWith('SystemInterfaces.cobra')  # no longer the first module
                 body
-                        if .verbosity >= 2
-                                print 'Compiling generated code'
+                        if .verbosity >= 2, print 'Compiling generated code'
                         options = .options
 
@@ -133 +132 @@
 
                         # exe names
+                        outName = ''
                         if options.boolValue('test')
                                 outName = _modules[_modules.count-1].sharpFileName
                         else if options.containsKey('out')
-                                outName = options.get('out')
-                        else
+                                outName = options.getDefault('out', '')
+                        if outName == ''
                                 outName = _firstFileName to !
                         if outName.endsWith('.cs') or outName.endsWith('.CS'), outName = outName[:-3]
                         if outName.endsWith('.cobra') or outName.endsWith('.COBRA'), outName = outName[:-6]
-                        target = options.getDefault('target', 'exe')
-                        if target in ['exe', 'winexe'] and (outName.endsWith('.exe') or outName.endsWith('.EXE'))
-                                outName = outName[:-4]  # csc always adds the extension itself
-                        else if target == 'lib' and (outName.endsWith('.dll') or outName.endsWith('.DLL'))
-                                outName = outName[:-4]
                         _baseExeFileName = outName
 

cobra/trunk/Source/Utils.cobra

@@ -300 +300 @@
                                 assert Utils.forceExtension('foo', '.exe') == 'foo.exe'
                                 assert Utils.forceExtension('foo', 'exe') == 'foo.exe'
+                                assert Utils.forceExtension('foo.bar.csv', '.exe') == 'foo.bar.exe'
                         body
                                 if not extension.startsWith('.')