Skip to content

Commit 6ab5f95

Browse files
cztomczakcztomczak
committed
Minor fixes to package installer for CEF 1.
Changed python path in visual c project files. Created package installer scripts for CEF 3. Added cefpython.GetModuleDirectory() function. Fixed subprocess path in CEF 3 examples so that it works with both portable & package versions of cefpython.
1 parent 26ce615 commit 6ab5f95

26 files changed

Lines changed: 460 additions & 49 deletions

‎cefpython/cef1/client_handler/client_handler_py27.vcproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
/>
101101
<Tool
102102
Name="VCCLCompilerTool"
103-
AdditionalIncludeDirectories="../;c:\python27_32bit\include"
103+
AdditionalIncludeDirectories="../;c:\python27\include"
104104
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
105105
ExceptionHandling="1"
106106
RuntimeLibrary="2"

‎cefpython/cef1/client_handler/client_handler_py32.vcproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
/>
100100
<Tool
101101
Name="VCCLCompilerTool"
102-
AdditionalIncludeDirectories="../;c:\python32_32bit\include"
102+
AdditionalIncludeDirectories="../;c:\python32\include"
103103
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
104104
ExceptionHandling="1"
105105
RuntimeLibrary="2"

‎cefpython/cef1/v8function_handler/v8function_handler_py27.vcproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
/>
101101
<Tool
102102
Name="VCCLCompilerTool"
103-
AdditionalIncludeDirectories="../;c:\python27_32bit\include"
103+
AdditionalIncludeDirectories="../;c:\python27\include"
104104
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
105105
RuntimeLibrary="2"
106106
UsePrecompiledHeader="0"

‎cefpython/cef1/v8function_handler/v8function_handler_py32.vcproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
/>
101101
<Tool
102102
Name="VCCLCompilerTool"
103-
AdditionalIncludeDirectories="../;c:\python32_32bit\include"
103+
AdditionalIncludeDirectories="../;c:\python32\include"
104104
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
105105
RuntimeLibrary="2"
106106
UsePrecompiledHeader="0"

‎cefpython/cef1/windows/binaries/LICENSE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Copyright (c) 2012 Czarek Tomczak. Portions Copyright (c)
2-
2008-2012 Marshall A.Greenblatt, 2006-2009 Google Inc.
1+
Copyright (c) 2012-2013 Czarek Tomczak. Portions Copyright
2+
(c) 2008-2013 Marshall A.Greenblatt, 2006-2009 Google Inc.
33
All rights reserved.
44

55
Redistribution and use in source and binary forms, with

‎cefpython/cef1/windows/binaries/debug_gdb.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
setlocal
2-
set PATH=%PATH%;C:\mingw\bin;C:\python27_32bit\PCbuild
3-
C:\mingw\bin\gdb.exe --args C:\python27_32bit\PCbuild\python.exe %~dp0cefadvanced.py
2+
set PATH=%PATH%;C:\mingw\bin;C:\python27
3+
C:\mingw\bin\gdb.exe --args C:\python27\python.exe %~dp0cefadvanced.py
44
REM type "run"
55
REM if error occurs type "backtrace"
66
REM type "help" for more commands

‎cefpython/cef1/windows/installer/__init__.py.install‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import cefpython_py27 as cefpython
1+
import sys
22

3-
__version__ = "0.52"
4-
__author__ = "Czarek Tomczak <czarek.tomczak@gmail.com>"
3+
if sys.hexversion >= 0x02070000 and sys.hexversion < 0x03000000:
4+
from . import cefpython_py27 as cefpython
5+
elif sys.hexversion >= 0x03000000 and sys.hexversion < 0x04000000:
6+
from . import cefpython_py32 as cefpython
7+
else:
8+
raise Exception("Unsupported python version: " + sys.version)
9+
10+
__version__ = "v52"
11+
__author__ = "CEF Python authors"

‎cefpython/cef1/windows/installer/__init__.py.template‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import cefpython_py27 as cefpython
1+
import sys
2+
3+
if sys.hexversion >= 0x02070000 and sys.hexversion < 0x03000000:
4+
from . import cefpython_py27 as cefpython
5+
elif sys.hexversion >= 0x03000000 and sys.hexversion < 0x04000000:
6+
from . import cefpython_py32 as cefpython
7+
else:
8+
raise Exception("Unsupported python version: " + sys.version)
29

310
__version__ = "%(APP_VERSION)s"
4-
__author__ = "Czarek Tomczak <czarek.tomczak@gmail.com>"
11+
__author__ = "CEF Python authors"

‎cefpython/cef1/windows/installer/innosetup.iss‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
[Setup]
44

5-
AppName = CEF Python 1
6-
AppVersion = 0.52
7-
AppVerName = CEF Python 1 version 0.52 for Python 2.7 32bit
5+
AppName = CEF Python 1 for Python 2.7
6+
AppVersion = v52
7+
AppVerName = CEF Python 1 version v52 for Python 2.7 32bit
88

99
AppPublisher = Czarek Tomczak
1010
AppPublisherURL = http://code.google.com/cefpython/
1111
AppSupportURL = https://groups.google.com/group/cefpython?hl=en
1212
AppUpdatesURL = http://code.google.com/cefpython/
13-
AppCopyright = Copyright 2012 Czarek Tomczak
13+
AppCopyright = Copyright 2012-2013 Czarek Tomczak
1414

1515
DefaultDirName = {code:GetInstallDir|c:\Python}
1616

17-
DefaultGroupName = CEF Python 1
17+
DefaultGroupName = CEF Python 1 for Python 2.7
1818
PrivilegesRequired = none
1919
DisableStartupPrompt = yes
2020
Compression = zip
@@ -28,7 +28,7 @@ UsePreviousGroup = yes
2828

2929
SourceDir = C:\cefpython\cefpython-src\cefpython\cef1\windows\binaries
3030
OutputDir = C:\cefpython\cefpython-src\cefpython\cef1\windows\installer\Output
31-
OutputBaseFilename = cefpython1_v0.52_win32_installer
31+
OutputBaseFilename = cefpython1_v52_py27_win32_installer
3232

3333
UninstallFilesDir = {app}\cefpython1
3434
LicenseFile = C:\cefpython\cefpython-src\cefpython\cef1\windows\binaries\LICENSE.txt
@@ -51,6 +51,8 @@ Source: "C:\cefpython\cefpython-src\cefpython\cef1\windows\installer\__init__.py
5151
Source: "cefclient.exe"; DestDir: "{app}\cefpython1"; Flags: ignoreversion;
5252
Source: "cefpython_py27.py"; DestDir: "{app}\cefpython1"; Flags: ignoreversion;
5353
Source: "cefpython_py27.pyd"; DestDir: "{app}\cefpython1"; Flags: ignoreversion;
54+
Source: "cefpython_py32.py"; DestDir: "{app}\cefpython1"; Flags: ignoreversion;
55+
Source: "cefpython_py32.pyd"; DestDir: "{app}\cefpython1"; Flags: ignoreversion;
5456
Source: "LICENSE.txt"; DestDir: "{app}\cefpython1"; Flags: ignoreversion;
5557
Source: "Microsoft.VC90.CRT.manifest"; DestDir: "{app}\cefpython1"; Flags: ignoreversion;
5658
Source: "README.txt"; DestDir: "{app}\cefpython1"; Flags: ignoreversion;

‎cefpython/cef1/windows/installer/innosetup.template‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
[Setup]
44

5-
AppName = CEF Python 1
5+
AppName = CEF Python 1 for Python %(PYTHON_VERSION)s
66
AppVersion = %(APP_VERSION)s
77
AppVerName = CEF Python 1 version %(APP_VERSION)s for Python %(PYTHON_VERSION)s %(PYTHON_ARCHITECTURE)s
88

99
AppPublisher = Czarek Tomczak
1010
AppPublisherURL = http://code.google.com/cefpython/
1111
AppSupportURL = https://groups.google.com/group/cefpython?hl=en
1212
AppUpdatesURL = http://code.google.com/cefpython/
13-
AppCopyright = Copyright 2012 Czarek Tomczak
13+
AppCopyright = Copyright 2012-2013 Czarek Tomczak
1414

1515
DefaultDirName = {code:GetInstallDir|c:\Python}
1616

17-
DefaultGroupName = CEF Python 1
17+
DefaultGroupName = CEF Python 1 for Python %(PYTHON_VERSION)s
1818
PrivilegesRequired = none
1919
DisableStartupPrompt = yes
2020
Compression = zip
@@ -28,7 +28,7 @@ UsePreviousGroup = yes
2828

2929
SourceDir = %(BINARIES_DIR)s
3030
OutputDir = %(INSTALLER_DIR)s\Output
31-
OutputBaseFilename = %(PACKAGE_NAME)s_v%(APP_VERSION)s_win32_installer
31+
OutputBaseFilename = %(PACKAGE_NAME)s_%(APP_VERSION)s_py%(PYTHON_VERSION_NODOT)s_win32_installer
3232

3333
UninstallFilesDir = {app}\%(PACKAGE_NAME)s
3434
LicenseFile = %(BINARIES_DIR)s\LICENSE.txt
@@ -51,6 +51,8 @@ Source: "%(INSTALLER_DIR)s\__init__.py.install"; DestDir: "{app}\%(PACKAGE_NAME)
5151
Source: "cefclient.exe"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5252
Source: "cefpython_py27.py"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5353
Source: "cefpython_py27.pyd"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
54+
Source: "cefpython_py32.py"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
55+
Source: "cefpython_py32.pyd"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5456
Source: "LICENSE.txt"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5557
Source: "Microsoft.VC90.CRT.manifest"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5658
Source: "README.txt"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;

0 commit comments

Comments
 (0)