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

Commit a240421

Browse files
livecodeianlivecodeian
committed
[[ RemoveCefOSX ]] Remove CEF support for OSX from revbrowser external
1 parent f6f1d5f commit a240421

File tree

3 files changed

+42
-88
lines changed

3 files changed

+42
-88
lines changed

‎livecode.gyp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666

6767
# Externals
6868
'revbrowser/revbrowser.gyp:external-revbrowser',
69-
'revbrowser/revbrowser.gyp:revbrowser-cefprocess',
7069
'revdb/revdb.gyp:dbodbc',
7170
'revdb/revdb.gyp:dbpostgresql',
7271
'revmobile/revmobile.gyp:external-revandroid',

‎revbrowser/revbrowser.gyp‎

Lines changed: 29 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
[
1818
'../libcore/libcore.gyp:libCore',
1919
'../libexternal/libexternal.gyp:libExternal',
20-
'../prebuilt/libcef.gyp:libcef',
21-
'../thirdparty/libcef/libcef.gyp:libcef_library_wrapper',
22-
'../thirdparty/libcef/libcef.gyp:libcef_stubs',
2320
],
2421

2522
'include_dirs':
@@ -37,22 +34,18 @@
3734
'src/revbrowser.rc.h',
3835
'src/signal_restore_posix.h',
3936
'src/w32browser.h',
40-
'src/WebAuthenticationPanel.h',
4137

4238
'src/cefbrowser.cpp',
4339
'src/cefbrowser_lnx.cpp',
44-
'src/cefbrowser_osx.mm',
4540
'src/cefbrowser_w32.cpp',
4641
'src/cefshared_lnx.cpp',
47-
'src/cefshared_osx.cpp',
4842
'src/cefshared_w32.cpp',
4943
'src/lnxbrowser.cpp',
5044
'src/osxbrowser.mm',
5145
'src/revbrowser.cpp',
5246
'src/signal_restore_posix.cpp',
5347
'src/w32browser.cpp',
5448
'src/revbrowser.rc',
55-
'src/WebAuthenticationPanel.m',
5649
],
5750

5851
'conditions':
@@ -64,42 +57,50 @@
6457
'type': 'none',
6558
},
6659
],
60+
# CEF only supported on Windows & Linux
6761
[
68-
'OS == "mac"',
62+
'OS == "win" or OS == "linux"',
6963
{
7064
'dependencies':
7165
[
72-
'revbrowser-cefprocess-helpers',
66+
'../prebuilt/libcef.gyp:libcef',
67+
'../thirdparty/libcef/libcef.gyp:libcef_library_wrapper',
68+
'../thirdparty/libcef/libcef.gyp:libcef_stubs',
69+
70+
'revbrowser-cefprocess',
7371
],
74-
72+
},
73+
# else
74+
{
75+
'sources!':
76+
[
77+
'src/cefbrowser.h',
78+
'src/cefbrowser_msg.h',
79+
'src/cefshared.h',
80+
81+
'src/cefbrowser.cpp',
82+
'src/cefbrowser_lnx.cpp',
83+
'src/cefbrowser_w32.cpp',
84+
'src/cefshared_lnx.cpp',
85+
'src/cefshared_w32.cpp',
86+
],
87+
},
88+
],
89+
[
90+
'OS == "mac"',
91+
{
7592
'libraries':
7693
[
7794
'$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
7895
'$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
7996
'$(SDKROOT)/System/Library/Frameworks/WebKit.framework',
8097
],
8198

82-
# Copy the CEF processes and framework into the expected place
83-
'copies':
84-
[
85-
{
86-
'destination': '<(PRODUCT_DIR)/Frameworks',
87-
'files':
88-
[
89-
'<(PRODUCT_DIR)/revbrowser-cefprocess.app',
90-
'<(PRODUCT_DIR)/revbrowser-cefprocess EH.app',
91-
'<(PRODUCT_DIR)/revbrowser-cefprocess NP.app',
92-
'$(SOLUTION_DIR)/prebuilt/lib/mac/Chromium Embedded Framework.framework',
93-
],
94-
},
95-
],
96-
9799
'all_dependent_settings':
98100
{
99101
'variables':
100102
{
101103
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name).bundle' ],
102-
'dist_aux_files': [ '<(PRODUCT_DIR)/Frameworks' ],
103104
},
104105
},
105106
},
@@ -155,10 +156,6 @@
155156
},
156157
},
157158

158-
'mac_bundle_resources':
159-
[
160-
'src/com_runrev_livecode_WebAuthenticationPanel.nib',
161-
],
162159

163160
'xcode_settings':
164161
{
@@ -170,14 +167,13 @@
170167
{
171168
'target_name': 'revbrowser-cefprocess',
172169
'type': 'executable',
173-
'mac_bundle': 1,
174170
'product_name': 'revbrowser-cefprocess',
175171

176-
# OSX, Windows and Linux only
172+
# Windows and Linux only
177173
'conditions':
178174
[
179175
[
180-
'OS != "mac" and OS != "win" and OS != "linux"',
176+
'OS != "win" and OS != "linux"',
181177
{
182178
'type': 'none',
183179
},
@@ -209,64 +205,10 @@
209205
[
210206
'src/cefprocess.cpp',
211207
'src/cefprocess_lnx.cpp',
212-
'src/cefprocess_osx.mm',
213208
'src/cefprocess_w32.cpp',
214209
'src/cefshared_lnx.cpp',
215-
'src/cefshared_osx.cpp',
216210
'src/cefshared_w32.cpp',
217211
],
218-
219-
'xcode_settings':
220-
{
221-
'INFOPLIST_FILE': 'revbrowser-cefprocess-Info.plist',
222-
},
223212
},
224213
],
225-
226-
'conditions':
227-
[
228-
# CEF on OSX needs some helper applications
229-
[
230-
'OS == "mac"',
231-
{
232-
'targets':
233-
[
234-
{
235-
'target_name': 'revbrowser-cefprocess-helpers',
236-
'type': 'none',
237-
238-
'dependencies':
239-
[
240-
'revbrowser-cefprocess',
241-
],
242-
243-
'actions':
244-
[
245-
# Create the EH and NP variants of the CEF process
246-
{
247-
'action_name': 'create_cefprocess_variants',
248-
'inputs':
249-
[
250-
'<(PRODUCT_DIR)/revbrowser-cefprocess.app',
251-
'tools/make_more_helpers.sh',
252-
],
253-
'outputs':
254-
[
255-
'<(PRODUCT_DIR)/revbrowser-cefprocess EH.app',
256-
'<(PRODUCT_DIR)/revbrowser-cefprocess NP.app',
257-
],
258-
259-
'action':
260-
[
261-
'tools/make_more_helpers.sh',
262-
'<(PRODUCT_DIR)',
263-
'revbrowser-cefprocess',
264-
],
265-
},
266-
],
267-
},
268-
],
269-
},
270-
],
271-
],
272214
}

‎revbrowser/src/osxbrowser.mm‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,3 +1256,16 @@ extern bool MCOSXSnapshotNSView(NSView *p_view, void *&r_data, uint32_t &r_lengt
12561256
return t_browser;
12571257
}
12581258

1259+
////////////////////////////////////////////////////////////////////////////////
1260+
1261+
// IM-2016-03-10: [[ RemoveCefOSX ]] CEF browser no longer supported on OSX
1262+
CWebBrowserBase *MCCefBrowserInstantiate(int p_window_id)
1263+
{
1264+
return nil;
1265+
}
1266+
1267+
void MCCefFinalise(void)
1268+
{
1269+
}
1270+
1271+
////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)