Fixes to pathnames in Inno Setup installer

cztomczak · cztomczak · commit 85dd5359de8b · 2014-01-13T12:37:11.000+01:00
and Distutils Setup on Windows.
diff --git a/cefpython/cef3/windows/installer/innosetup.template b/cefpython/cef3/windows/installer/innosetup.template
@@ -28,7 +28,7 @@ UsePreviousGroup = yes
 
 SourceDir = %(BINARIES_DIR)s
 OutputDir = %(INSTALLER_DIR)s\Output
-OutputBaseFilename = %(PACKAGE_NAME)s-%(APP_VERSION)s-win32-py%(PYTHON_VERSION_NODOT)s
+OutputBaseFilename = %(PACKAGE_NAME)s-%(APP_VERSION)s.win32-py%(PYTHON_VERSION)s-innosetup
 
 UninstallFilesDir = {app}\%(PACKAGE_NAME)s
 LicenseFile = %(BINARIES_DIR)s\LICENSE.txt
diff --git a/cefpython/cef3/windows/installer/make-setup.py b/cefpython/cef3/windows/installer/make-setup.py
@@ -73,9 +73,9 @@ def main():
 
     installer_dir = os.path.dirname(os.path.abspath(__file__))
 
-    pyVersion = str(sys.version_info.major) + str(sys.version_info.minor)
+    pyVersion = str(sys.version_info.major) +"."+ str(sys.version_info.minor)
     setup_dir = installer_dir+"/"+PACKAGE_NAME+"-"+vars["APP_VERSION"]\
-            +"-win"+BITS_NUMBER+"-py"+pyVersion+"-setup"
+            +".win"+BITS_NUMBER+"-py"+pyVersion+"-setup"
     print("Creating setup dir: "+setup_dir)
     os.mkdir(setup_dir)
 
