Changeset 1738

Timestamp:

11/07/08 15:39:03 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Added -out: command line option.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/CommandLine.cobra (modified) (2 diffs)
• Source/SharpGenerator.cobra (modified) (1 diff)
• Tests/700-command-line/650-out-option.cobra (added)
• Tests/700-command-line/652-out-option-verify.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -22 +22 @@
         # the fully general form is:
         (get|pro|set) <name> from (var|<varName>) as <type>
+
+* Added -out: command line option.
 
 * Modified commandline options so -r becomes synonym for -run rather  

cobra/trunk/Source/CommandLine.cobra

@@ -282 +282 @@
                         'type': 'bool',
                         'description': 'Enable optimizations.',
+                },
+                {
+                        'name': 'out',
+                        'type': 'string',
+                        'description': 'Specify output file name (default: base name of first file). -test overrides this with a temporary program that runs only the unit tests and is then removed afterwards.',
+                        'args': 'FILENAME',
                 },
                 {
@@ -1254 +1260 @@
                         return false
 
+        def get(key as String) as dynamic?
+                return this[key]
+
         def getDefault(key as String, default as dynamic?) as dynamic?
                 if .containsKey(key)

cobra/trunk/Source/SharpGenerator.cobra

@@ -133 +133 @@
 
                         # exe names
-                        outName = if(options.boolValue('test'), _modules[_modules.count-1].sharpFileName, _firstFileName to !)
+                        if options.boolValue('test')
+                                outName = _modules[_modules.count-1].sharpFileName
+                        else if options.containsKey('out')
+                                outName = options.get('out')
+                        else
+                                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