Shipment bug fix for units facility

transcrypt/development/manual_tests/units/animals/__javascript__/animals.js

@@ -1,5 +1,5 @@
 "use strict";
-// Transcrypt'ed from Python, 2018-02-20 18:19:53
+// Transcrypt'ed from Python, 2018-02-20 19:59:17
 function animals () {
     var __symbols__ = ['__runit__', '__py3.6__', '__esv5__'];
     var __all__ = {};
@@ -141,7 +141,7 @@ function animals () {
 						get __init__ () {return __get__ (this, function (self) {
 							self.interpreter_name = 'python';
 							self.transpiler_name = 'transcrypt';
-							self.transpiler_version = '3.6.95';
+							self.transpiler_version = '3.6.97';
 							self.target_subdir = '__javascript__';
 						});}
 					});
@@ -2236,6 +2236,7 @@ function animals () {
 		__pragma__ ('</all>')
 		__pragma__ ('<components>')
 	}) ();
+
     return __all__;
 }
 window ['animals'] = animals ();

transcrypt/development/manual_tests/units/animals/__javascript__/cats.js

@@ -7,3 +7,4 @@
 		__pragma__ ('<all>')
 			__all__.Cat = Cat;
 		__pragma__ ('</all>')
+

transcrypt/development/manual_tests/units/animals/__javascript__/dogs.js

@@ -7,3 +7,4 @@
 		__pragma__ ('<all>')
 			__all__.Dog = Dog;
 		__pragma__ ('</all>')
+

transcrypt/modules/org/transcrypt/__base__.py

@@ -6,7 +6,7 @@ class __Envir__:
     def __init__ (self):
         self.interpreter_name = 'python'
         self.transpiler_name = 'transcrypt'
-        self.transpiler_version = '3.6.97'
+        self.transpiler_version = '3.6.98'
         self.target_subdir = '__javascript__'
 
 __envir__ = __Envir__ ()

transcrypt/modules/org/transcrypt/compiler.py

@@ -283,18 +283,18 @@ def getJoinedModules (modules):
 
         # Join and save source maps
 
-        self.allModules = (
-            [
-                self.moduleDict [self.coreModuleName],
-                self.moduleDict [self.baseModuleName],
-                self.moduleDict [self.standardModuleName],
-                self.moduleDict [self.builtinModuleName]
-            ] +
-            importedModules +
-            [self.moduleDict [self.mainModuleName]]
-        )        
-
         if utils.commandArgs.map:
+            self.allModules = (
+                [
+                    self.moduleDict [self.coreModuleName],
+                    self.moduleDict [self.baseModuleName],
+                    self.moduleDict [self.standardModuleName],
+                    self.moduleDict [self.builtinModuleName]
+                ] +
+                importedModules +
+                [self.moduleDict [self.mainModuleName]]
+            )        
+
             utils.log (False, 'Saving single-level sourcemap in: {}\n', self.prettyMap.mapPath)
             self.prettyMap.concatenate ([module.modMap for module in self.allModules], self.moduleCaptionSkip)
             self.prettyMap.save ()

transcrypt/modules/org/transcrypt/utils.py

@@ -57,7 +57,7 @@ def parse (self):
         self.argParser.add_argument ('-s', '--symbols', nargs='?', help = "names, joined by $, separately passed to main module in __symbols__ variable")
         self.argParser.add_argument ('-sf', '--sform', help = "enable support for string formatting mini language", action = 'store_true')
         self.argParser.add_argument ('-t', '--tconv', help = "enable automatic conversion to truth value by default. Disadvised, since it will result in a conversion for each boolean. Preferably use __pragma__ ('tconv') and __pragma__ (\'notconv\') to enable automatic conversion locally", action = 'store_true')
-        self.argParser.add_argument ('-u', '--unit', nargs='?', help = "compile to units rather than to monolithic application. Use -u .run to generate the loader and the runtime module. Use -u without parameters to generate a component module.")
+        self.argParser.add_argument ('-u', '--unit', nargs='?', help = "compile to units rather than to monolithic application. Use -u .run to generate the loader and the runtime unit. Use -u without parameters to generate a component unit.")
         self.argParser.add_argument ('-v', '--verbose', help = "show all messages", action = 'store_true')
         self.argParser.add_argument ('-x', '--x', help = "reserved for extended options")
         self.argParser.add_argument ('-xc', '--xconfimp', help = "confine imported names to directly importing module", action = 'store_true')