Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit e2d1ba5

Browse files
committed
Merge remote-tracking branch 'origin/develop-9.0' into merge-develop-9.0-18.06.2019
2 parents 170e8a9 + 7f99ef0 commit e2d1ba5

File tree

445 files changed

+16503
-11315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+16503
-11315
lines changed

README.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# LiveCode Thirdparty Libraries
2+
3+
The procedure for updating `thirdparty` on `develop-9.0` and `develop` branches is
4+
slightly different due to `thirdparty` prebuilts on develop.
5+
6+
## Update procedure for develop-9.0
7+
8+
1. Push up a PR to this repo
9+
2. If there is a related patch to another repos then push up a PR for those
10+
3. Create a test branch on `livecode` with updated submodule ptrs. Ensure the
11+
branch is pushed upstream rather than to your clone.
12+
4. If it was a CEF update then push up a branch to `livecode-private` again with
13+
updated submodule and kick off prebuilts on vulcan.
14+
5. Create a PR with the title beginning with `[[ NO MERGE ]]` and review it ok
15+
to confirm it passes on travis and vulcan
16+
6. Close PR from 5 and link to it in the other related PRs
17+
7. Once all related PRs are reviewed merge `thirdparty`, update submodules in
18+
`livecode` and merge any related PRs
19+
20+
## Update procedure for develop
21+
22+
The same procedure applies to merge-ups from `develop-9.0` because the
23+
`thirdparty` prebuilts must be rebuilt for the current head of the `develop`
24+
branch.
25+
26+
1. Push up a PR to this repo
27+
2. If there is a related patch to another repos then push up a PR for those
28+
3. Review and merge the PR for `thirdparty` but *do not* update submodule ptrs
29+
in `livecode` yet.
30+
4. Create a test branch on `livecode` with updated submodule ptrs. Ensure the
31+
branch is pushed upstream rather than to your clone.
32+
5. Push up a branch to `livecode-private` again with updated submodule and kick
33+
off prebuilts on vulcan.
34+
6. Once prebuilts are built for the `develop` head of `thirdparty` create a PR
35+
using the `livecode` branch with the title beginning with `[[ NO MERGE ]]` and
36+
review it ok to confirm it passes on travis and vulcan
37+
7. Close PR from 6 and link to it in the other related PRs
38+
8. Once all related PRs are reviewed, update submodules in `livecode` and merge
39+
any related PRs

libcef/Makefile

Lines changed: 0 additions & 8 deletions
This file was deleted.

libcef/Makefile.libcef

Lines changed: 0 additions & 22 deletions
This file was deleted.

libcef/Makefile.libcefwrapper

Lines changed: 0 additions & 223 deletions
This file was deleted.

libcef/UPDATE.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Steps for updating CEF
2+
3+
- Go to http://opensource.spotify.com/cefbuilds/index.html
4+
- Download the latest standard distribution for Windows and Linux and extract
5+
- Delete `thirdparty/libcef/include` and `thirdparty/libcef/libcef_dll`
6+
- Copy `include` and `libcef_dll` from the CEF windows build to
7+
`thirdparty/libcef`
8+
- Execute `python gen_libcef_paths.py libcef_dll > libcef.gypi`
9+
- Execute `python gen_libcef_stubs.py include > libcef.stubs`
10+
- Stderr will list unknown parameter or return types so edit `gen_libcef_stubs.py`
11+
to add them and run again
12+
- Copy `include` from the CEF linux build to `thirdparty/libcef` to merge in
13+
the extra headers required for linux. Note this is done after the stubs are
14+
generated so we don't include stubs for anything linux specific which seems to
15+
be `cef_get_xdisplay` at the moment.
16+
- CD to `thirdparty/libcef`
17+
- Copy binaries and resources from the CEF build to the prebuilt folders checking
18+
for any new file names to update in the gyp files and prebuilt builder. Note copy
19+
the binaries from the Release folder even to the debug prebuilt folders.
20+
- Reconfigure and build
21+
- Fix any API changes and make sure things work
22+
- Update `prebuilt/versions/cef` and `prebuilt/versions/cef_buildrevision`
23+
- Push up a patch to livecode and thirdparty
24+
- Kick off prebuilts

libcef/gen_libcef_paths.py

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/usr/bin/env python
2+
3+
import os
4+
import sys
5+
import posixpath
6+
7+
def log(pMsg):
8+
sys.stderr.write(pMsg + "\n")
9+
sys.stderr.flush()
10+
11+
def gen_paths_file(pPaths):
12+
tFileList = []
13+
14+
for tPath in pPaths:
15+
for tRoot, tFolders, tFiles in os.walk(tPath):
16+
if os.path.basename(tRoot) != "test":
17+
tFileNames = filter(lambda(s) : s.endswith(".h") or s.endswith(".cc"), tFiles)
18+
19+
tRoot = tRoot.replace(os.path.sep, "/")
20+
21+
for tFile in tFileNames:
22+
tFileList.append("\t\t\t'" + posixpath.join(tRoot, tFile) + "',")
23+
24+
tFileList.sort()
25+
26+
print "{\n"
27+
print "\t'variables': {\n"
28+
print "\t\t'libcef_dll_sources': [\n"
29+
30+
print "\n".join(tFileList)
31+
32+
print "\t\t]\n\t}\n}\n"
33+
34+
35+
#get include folder from the command line
36+
tPaths = ["."]
37+
if len(sys.argv) > 1:
38+
tPaths = sys.argv[1:]
39+
40+
gen_paths_file(tPaths)

0 commit comments

Comments
 (0)