Skip to content
This repository has been archived by the owner on Sep 2, 2021. It is now read-only.

[PoC] Update to last version of cefclient #587

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
edf7a26
Port autogen_client_side import to appshell_paths.gypi
ficristo Jun 25, 2016
3b552e3
Start from scratch with cefclient
Sep 19, 2016
a70ad21
Merge branch 'translator' into scratch
ficristo Sep 19, 2016
643685f
Merge branch 'translator' into scratch
ficristo Sep 19, 2016
9740894
Add missing Windows files
ficristo Sep 19, 2016
f69ef8b
Merge branch 'scratch' of https://www.github.com/ficristo/brackets-sh…
ficristo Sep 19, 2016
8a4400b
Add missing Linux files. Do not use GL on Linux
ficristo Sep 19, 2016
9b4f522
Ignore only toplevel folders. Add missing resources
ficristo Sep 19, 2016
5a8cc29
Add out folder to ignored files
ficristo Sep 19, 2016
e08098b
Add Brackets cef browser settings
Sep 20, 2016
eff858d
Merge branch 'scratch' of https://www.github.com/ficristo/brackets-sh…
Sep 20, 2016
bdc3906
Add missing Mac resources
Sep 20, 2016
6ae6b01
Add extension resource
Sep 21, 2016
ebf7863
Merge branch 'scratch' of https://www.github.com/ficristo/brackets-sh…
ficristo Sep 21, 2016
2f5b466
Add appshell_helpers gtk
ficristo Sep 21, 2016
0c67d19
Add config.h back
Sep 21, 2016
b94f42d
Complete appshell_helpers
Sep 21, 2016
974c39b
Complete client_switches
ficristo Sep 21, 2016
8f2f6c2
Complete appshell_helpers_gtk
ficristo Sep 21, 2016
18b5994
Complete appshell_helpers_win
ficristo Sep 21, 2016
3b604e2
Fix appshell_helpers_mac
Sep 22, 2016
b34b3d6
Add back appshell_extensions*
Sep 22, 2016
7a23e83
Add back GoogleChrome, command_collback and native_menu
Sep 22, 2016
070a64f
Add things in gypi
Sep 22, 2016
72084b4
Uncomments things in appshell_process_message
Sep 22, 2016
22ecf89
Add elapsedTime and currentLanguage
Sep 22, 2016
6c13e3f
Add back node_process in gypi and OnProcessMessage
Sep 22, 2016
a09e226
Fix DevTools
Sep 22, 2016
fc055c2
Update Mac English and Info
Sep 22, 2016
28e30a1
Add back mac French and Japanese
Sep 22, 2016
d2382b9
Add back mac brackets.sh
Sep 22, 2016
016c2ae
Add back mac xib files
Sep 22, 2016
f10d011
Add back mac png images
Sep 22, 2016
bead78a
Make windows run
ficristo Sep 22, 2016
1ac3ee0
for now do not verify the websocket
ficristo Sep 24, 2016
3978fb3
Restore node
ficristo Sep 25, 2016
c8da59d
Restore windows resources
ficristo Sep 25, 2016
d86d050
Fix compatibility path
ficristo Sep 25, 2016
31d557b
Make Linux run
ficristo Sep 25, 2016
e778eec
Add back node to linux
ficristo Sep 25, 2016
f3ab5e6
Add back node to mac
Sep 26, 2016
2fc7b59
Use AppInitInitialUrl and AppGetInitialUrl on Linux
ficristo Oct 6, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 7 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ xcodebuild/*
*.log
*.dmg

Debug
Release
Resources
deps
include
/Debug
/Release
/Resources
/deps
/include
ipch
libcef_dll
/libcef_dll
/out
tools

/installer/mac/staging/
Expand Down
14 changes: 8 additions & 6 deletions appshell.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
# TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
# that automatically sets the correct INFOPLIST_FILE setting and adds
# the file to a source group.
'appshell/mac/Info.plist',
'appshell/resources/mac/Info.plist',
],
'xcode_settings': {
'INFOPLIST_FILE': 'appshell/mac/Info.plist',
'INFOPLIST_FILE': 'appshell/resources/mac/Info.plist',
# Necessary to avoid an "install_name_tool: changing install names or
# rpaths can't be redone" error.
'OTHER_LDFLAGS': ['-Wl,-headerpad_max_install_names'],
Expand All @@ -89,7 +89,7 @@
},
},
'variables': {
'win_exe_compatibility_manifest': 'compatibility.manifest',
'win_exe_compatibility_manifest': 'appshell/resources/win/compatibility.manifest',
'xparams': "/efy",
},
'actions': [
Expand All @@ -114,7 +114,7 @@
},
'VCManifestTool': {
'AdditionalManifestFiles': [
'appshell.exe.manifest',
'appshell/resources/win/appshell.exe.manifest',
],
},
},
Expand Down Expand Up @@ -267,6 +267,7 @@
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
'$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
'$(SDKROOT)/System/Library/Frameworks/ScriptingBridge.framework',
'$(SDKROOT)/System/Library/Frameworks/Security.framework',
'$(CONFIGURATION)/<(framework_name).framework/<(framework_name)',
Expand Down Expand Up @@ -462,6 +463,7 @@
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
'$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
'$(SDKROOT)/System/Library/Frameworks/ScriptingBridge.framework',
'$(SDKROOT)/System/Library/Frameworks/Security.framework',
'$(CONFIGURATION)/<(framework_name).framework/<(framework_name)',
Expand All @@ -474,7 +476,7 @@
# be necessary to list helper-Info.plist once, not the three times it
# is listed here.
'mac_bundle_resources!': [
'appshell/mac/helper-Info.plist',
'appshell/resources/mac/helper-Info.plist',
],
# TODO(mark): For now, don't put any resources into this app. Its
# resources directory will be a symbolic link to the browser app's
Expand All @@ -483,7 +485,7 @@
['exclude', '.*'],
],
'xcode_settings': {
'INFOPLIST_FILE': 'appshell/mac/helper-Info.plist',
'INFOPLIST_FILE': 'appshell/resources/mac/helper-Info.plist',
# Necessary to avoid an "install_name_tool: changing install names or
# rpaths can't be redone" error.
'OTHER_LDFLAGS': ['-Wl,-headerpad_max_install_names'],
Expand Down
33 changes: 0 additions & 33 deletions appshell/CustomTitlebarView.h

This file was deleted.

121 changes: 0 additions & 121 deletions appshell/CustomTitlebarView.m

This file was deleted.

37 changes: 0 additions & 37 deletions appshell/FullScreenButton.h

This file was deleted.

Loading