Merge remote-tracking branch 'origin'

Czarek · Czarek · commit f3c18431faa8 · 2013-07-19T16:58:52.000+02:00
diff --git a/cefpython/cef1/windows/installer/innosetup.template b/cefpython/cef1/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_py%(PYTHON_VERSION_NODOT)s_win32_installer
+OutputBaseFilename = %(PACKAGE_NAME)s-%(APP_VERSION)s-win32-py%(PYTHON_VERSION_NODOT)s
 
 UninstallFilesDir = {app}\%(PACKAGE_NAME)s
 LicenseFile = %(BINARIES_DIR)s\LICENSE.txt
diff --git a/cefpython/cef1/windows/installer/make_installer.py b/cefpython/cef1/windows/installer/make_installer.py
@@ -16,7 +16,7 @@ def main():
     parser.add_argument("-v", "--version", help="cefpython version",
             required=True)
     args = parser.parse_args()
-    assert re.search(r"^(v\d+)|(\d+\.\d+)$", args.version), (
+    assert re.search(r"^(\d+\.\d+)$", args.version), (
             "Invalid version string")
 
     vars = {}
