Skip to content

Commit 1837d34

Browse files
cztomczakcztomczak
committed
Update to v56 on Windows (cztomczak#276)...
Minor fixes to tools, examples and build instructions.
1 parent 0e83395 commit 1837d34

File tree

7 files changed

+32
-28
lines changed

7 files changed

+32
-28
lines changed

‎docs/Build-instructions.md‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ cd build/
7575

7676
7) Install python dependencies:
7777
```
78-
pip install -r ../tools/requirements.txt
78+
pip install --upgrade -r ../tools/requirements.txt
7979
```
8080

8181
8) Download Windows binaries and libraries from
@@ -119,7 +119,7 @@ cd build/
119119

120120
5) Install python dependencies:
121121
```
122-
sudo pip install -r ../tools/requirements.txt
122+
sudo pip install --upgrade -r ../tools/requirements.txt
123123
```
124124

125125
6) Download Linux binaries and libraries from
@@ -199,15 +199,14 @@ requirements common for all platforms.
199199

200200
* MacOS 10.9+, Xcode5+ and Xcode command line tools. Only 64-bit builds
201201
are supported.
202-
* Upgrade setuptools package to latest version otherwise there will be
203-
problems with Cython: `sudo pip install --upgrade setuptools`
204202

205203

206204
### All platforms
207205

208-
* Install dependencies for the automate.py tool by executing:
209-
`cd tools/ && pip install -r requirements.txt` (on Linux use `sudo`).
210-
This will install some PyPI packages including Cython.
206+
* Install/update dependencies for the tools by executing:
207+
`cd cefpython/tools/ && pip install --upgrade -r requirements.txt`.
208+
On Linux use `sudo`. You should run it each time you update to newer
209+
cefpython version to avoid issues.
211210

212211

213212
## Build using prebuilt CEF binaries and libraries

‎examples/qt4.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ def focusInEvent(self, event):
143143
# stealing all focus due to Issue #284.
144144
if self.browser:
145145
if WINDOWS:
146-
WindowUtils.OnSetFocus(self.cef_widget.getHandle(),
147-
0, 0, 0)
146+
WindowUtils.OnSetFocus(self.getHandle(), 0, 0, 0)
148147
self.browser.SetFocus(True)
149148

150149
def focusOutEvent(self, event):

‎src/compile_time_constants.pxi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# This file was generated by setup.py
2-
DEF UNAME_SYSNAME = "Darwin"
2+
DEF UNAME_SYSNAME = "Windows"
33
DEF PY_MAJOR_VERSION = 2

‎src/version/cef_version_win.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
#ifndef CEF_INCLUDE_CEF_VERSION_H_
3636
#define CEF_INCLUDE_CEF_VERSION_H_
3737

38-
#define CEF_VERSION "3.2883.1553.g80bd606"
38+
#define CEF_VERSION "3.2924.1575.g97389a9"
3939
#define CEF_VERSION_MAJOR 3
40-
#define CEF_COMMIT_NUMBER 1553
41-
#define CEF_COMMIT_HASH "80bd6062d7ac4c5fd1d7bc7ee78e8e59d4a040aa"
40+
#define CEF_COMMIT_NUMBER 1575
41+
#define CEF_COMMIT_HASH "97389a92ee2309ded830338d6afd61ba109d31d8"
4242
#define COPYRIGHT_YEAR 2017
4343

44-
#define CHROME_VERSION_MAJOR 55
44+
#define CHROME_VERSION_MAJOR 56
4545
#define CHROME_VERSION_MINOR 0
46-
#define CHROME_VERSION_BUILD 2883
47-
#define CHROME_VERSION_PATCH 87
46+
#define CHROME_VERSION_BUILD 2924
47+
#define CHROME_VERSION_PATCH 76
4848

4949
#define DO_MAKE_STRING(p) #p
5050
#define MAKE_STRING(p) DO_MAKE_STRING(p)
@@ -63,13 +63,13 @@ extern "C" {
6363
// universal hash value will change if any platform is affected whereas the
6464
// platform hash values will change only if that particular platform is
6565
// affected.
66-
#define CEF_API_HASH_UNIVERSAL "87b7eefcb86c87b28f86bfd7919f7d7a6cffc0d8"
66+
#define CEF_API_HASH_UNIVERSAL "66de193ba22e1d92a99bb29d60f3107709aeefda"
6767
#if defined(OS_WIN)
68-
#define CEF_API_HASH_PLATFORM "00823905486d7b7222da5654fe35d2d15f65543a"
68+
#define CEF_API_HASH_PLATFORM "8055740cd08db66cefe838a826dc90806fadfb33"
6969
#elif defined(OS_MACOSX)
70-
#define CEF_API_HASH_PLATFORM "f0180f006643782254250f34e858b98110a40e6e"
70+
#define CEF_API_HASH_PLATFORM "12d8ab423df369b68d37c3667123a1812bc0d345"
7171
#elif defined(OS_LINUX)
72-
#define CEF_API_HASH_PLATFORM "14b19454a4231fa10a77b8955954dc95f073af6b"
72+
#define CEF_API_HASH_PLATFORM "86ab23c0d7dafbdff7f66764cf8dac5ec1712af4"
7373
#endif
7474

7575
// Returns CEF version information for the libcef library. The |entry|

‎tools/automate.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,20 +221,22 @@ def prebuilt_cef():
221221
# Find cef_binary directory in the build directory
222222
if Options.cef_version:
223223
cef_binary = os.path.join(Options.build_dir,
224-
"cef_binary_{cef_version}_*{sep}"
224+
"cef_binary_{cef_version}_{os}{sep}"
225225
.format(cef_version=Options.cef_version,
226+
os=CEF_POSTFIX2,
226227
sep=os.sep))
227228
else:
228229
cef_binary = os.path.join(Options.build_dir,
229-
"cef_binary_3.{cef_branch}.*{sep}"
230+
"cef_binary_3.{cef_branch}.*_{os}{sep}"
230231
.format(cef_branch=Options.cef_branch,
232+
os=CEF_POSTFIX2,
231233
sep=os.sep))
232234
dirs = glob.glob(cef_binary)
233235
if len(dirs) == 1:
234236
Options.cef_binary = dirs[0]
235237
else:
236-
print("ERROR: Could not find prebuilt binaries in the build dir.")
237-
print(" Eg. cef_binary_3.2883.1553.g80bd606_windows32/")
238+
print("ERROR: Could not find prebuilt binaries in the build dir:")
239+
print(" {cef_binary}".format(cef_binary=cef_binary))
238240
sys.exit(1)
239241

240242
build_cef_projects()

‎tools/build.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -664,10 +664,7 @@ def build_cefpython_module():
664664
# Move the cefpython module
665665
module_pattern = MODULE_NAME_TEMPLATE.format(pyversion=PYVERSION+"*",
666666
ext=MODULE_EXT)
667-
if MAC:
668-
module_pattern = "./build/lib*/"+module_pattern
669-
else:
670-
module_pattern = "./"+module_pattern
667+
module_pattern = "./build/lib*/" + module_pattern
671668
move_file_by_pattern(module_pattern, os.path.join(CEFPYTHON_BINARY,
672669
MODULE_NAME))
673670

‎tools/common.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,23 @@
1010
# Architecture and OS postfixes
1111
ARCH32 = (8 * struct.calcsize('P') == 32)
1212
ARCH64 = (8 * struct.calcsize('P') == 64)
13+
# OS_POSTFIX is for directories/files names in cefpython sources
14+
# OS_POSTFIX2 is for platform name in cefpython binaries
15+
# CEF_POSTFIX2 is for platform name in upstream CEF binaries
1316
OS_POSTFIX = ("win" if platform.system() == "Windows" else
1417
"linux" if platform.system() == "Linux" else
1518
"mac" if platform.system() == "Darwin" else "unknown")
1619
OS_POSTFIX2 = "unknown"
20+
CEF_POSTFIX2 = "unknown" # Upstream CEF binaries postfix
1721
if OS_POSTFIX == "win":
1822
OS_POSTFIX2 = "win32" if ARCH32 else "win64"
23+
CEF_POSTFIX2 = "windows32" if ARCH32 else "windows64"
1924
elif OS_POSTFIX == "mac":
2025
OS_POSTFIX2 = "mac32" if ARCH32 else "mac64"
26+
CEF_POSTFIX2 = "macosx32" if ARCH32 else "macosx64"
2127
elif OS_POSTFIX == "linux":
2228
OS_POSTFIX2 = "linux32" if ARCH32 else "linux64"
29+
CEF_POSTFIX2 = "linux32" if ARCH32 else "linux64"
2330

2431
# Platforms
2532
WINDOWS = (platform.system() == "Windows")

0 commit comments

Comments
 (0)