Merge pull request #38 from matysek/develop

Antivirus, foreign characters in paths on Win and updated license header in bootloader code.

PyInstaller/build.py

@@ -726,7 +726,7 @@ def check_guts(self, last_build):
         return False
 
     def assemble(self):
-        logger.info("building PYZ %s", os.path.basename(self.out))
+        logger.info("building PYZ (ZlibArchive) %s", os.path.basename(self.out))
         pyz = pyi_archive.ZlibArchive(level=self.level)
         toc = self.toc - config['PYZ_dependencies']
         pyz.build(self.name, toc)
@@ -943,11 +943,13 @@ def check_guts(self, last_build):
         return False
 
     def assemble(self):
-        logger.info("building PKG %s", os.path.basename(self.name))
+        logger.info("building PKG (CArchive) %s", os.path.basename(self.name))
         trash = []
         mytoc = []
         seen = {}
         toc = addSuffixToExtensions(self.toc)
+        # 'inm'  - relative filename inside a CArchive
+        # 'fnm'  - absolute filename as it is on the file system.
         for inm, fnm, typ in toc:
             if not os.path.isfile(fnm) and check_egg(fnm):
                 # file is contained within python egg, it is added with the egg
@@ -965,6 +967,7 @@ def assemble(self):
                     if typ == 'BINARY' and fnm in seen:
                         continue
                     seen[fnm] = 1
+
                     mytoc.append((inm, fnm, self.cdict.get(typ, 0),
                                   self.xformdict.get(typ, 'b')))
             elif typ == 'OPTION':

PyInstaller/loader/pyi_archive.py

@@ -259,6 +259,8 @@ class ZlibArchive(Archive):
     """
     ZlibArchive - an archive with compressed entries. Archive is read
     from the executable created by PyInstaller.
+
+    This archive is used for bundling python modules inside the executable.
     """
     MAGIC = 'PYZ\0'
     TOCPOS = 8

PyInstaller/loader/pyi_carchive.py

@@ -97,7 +97,16 @@ def add(self, dpos, dlen, ulen, flag, typcd, nm):
         FLAG says if the data is compressed.
         TYPCD is the "type" of the entry (used by the C code)
         NM is the entry's name.
+
+        This function is used only while creating an executable.
         """
+        # Import module here since it might not be available during bootstrap
+        # and loading pyi_carchive module could fail.
+        import os.path
+        # Ensure forward slashes in paths are on Windows converted to back
+        # slashes '\\' since on Windows the bootloader works only with back
+        # slashes.
+        nm = os.path.normpath(nm)
         self.data.append((dpos, dlen, ulen, flag, typcd, nm))
 
     def get(self, ndx):
@@ -125,6 +134,10 @@ class CArchive(pyi_archive.Archive):
     """
     An Archive subclass that can hold arbitrary data.
 
+    This class encapsulates all files that are bundled within an executable.
+    It can contain ZlibArchive (Python .pyc files), dlls, Python C extensions
+    and all other data files that are bundled in --onefile mode.
+
     Easily handled from C or from Python.
     """
     # MAGIC is usefull to verify that conversion of Python data types