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

Update Linux to CEF 3.1453.1255 #264

Merged
merged 31 commits into from
Jun 22, 2013
Merged

Update Linux to CEF 3.1453.1255 #264

merged 31 commits into from
Jun 22, 2013

Conversation

jasonsanjose
Copy link
Member

This merges @pritambaral's work from his fork of brackets-shell into our mainline. There's plenty of unfinished work (some already stubbed out, some not), but the current state of the shell is stable enough to be usable day-to-day. Even with some features (e.g. node and native menus) not implemented yet, the majority of Brackets is functional.

See https://github.com/adobe/brackets/wiki/Linux-Development-for-Contributors for setup instructions to install completely from scratch, i.e. download git repositories.

If you already have the git repositories locally, follow these instructions

cd /path/to/brackets-shell

# build it
./scripts/setup_linux_build.sh
make

# checkout the linux branch in the brackets repo (this will be obsolete once the linux branch lands in the brackets repo master)
cd /path/to/brackets
git checkout linux
git submodule update --init --recursive

# package files
cd /path/to/brackets-shell
./installer/linux/stage_for_packaging.sh

# symlink to repo
ln -s /path/to/brackets /path/to/brackets-shell/installer/linux/staging/dev

# run brackets
./installer/linux/staging/Brackets

pritambaral and others added 25 commits October 28, 2012 04:10
@pritambaral
Got it to show a window! HAHA!
d3477af
@pritambaral
Brackets runs! HAHAHAHA Still need to implement platform code though
f6edb99
@pritambaral
Some native functions. Got the hang of it. Prepare for public release
07ac9fe
@pritambaral
Cleans up appshell.gyp. Launching live browser works
272fb80
@pritambaral
JS resource compilation, platform independent.
f5bf46f
@pritambaral
Adding udev. Temp commit. Will be removed.
3e73b3a
@pritambaral
Window icon. Removes menu. Relative index.html path.
c18b322
@pritambaral
Save file on close. Uses patched CEF build. See http://code.google.co…
f759e16 
…m/p/chromiumembedded/issues/detail?id=780
@pritambaral
Very simple CloseLiveBrowser implementation. In hopes for issue #1317
488040d
@pritambaral
minor appicon related fix
9e28fe7
@radorodopski
Fixed a bug where Brackets would not save user settings in the proper…
a25ef54 
… location. Added the .pak files to the list of files to be copied to output directory during build. Implemented ClientApp::GetCurrentLanguage(), this may not be the final version, input from the Brackets team is required on this.
@pritambaral
Fix file:// url shim. Implement GetCurrentLanguage(), thanks Rado
3870093
@radorodopski
Merge remote-tracking branch 'linux/linux' into linux
29930a2 
Conflicts:
	appshell/client_app_gtk.cpp
@radorodopski
Fix some runtime errors with this signature: @browser_main_loop. Hope…
923c4b6 
… this fixes all of them.
@pritambaral
Merge pull request #1 from radorodopski/linux
c883bde
@pritambaral
Workaround for focus-at-start bug
74e4a77
@pritambaral
Update pakfiles to CEF3 branch 1271
67a33e7
@jasonsanjose
merge pritambaral/linux with glenn/update-cef
c77e7dc
@jasonsanjose
Squashed commit of the following:
b964d1e 
commit a78791f
Merge: 6cc887d e11ca95
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Tue Jun 11 14:05:29 2013 -0700

    Merge branch 'jasonsanjose/linux' of https://github.com/adobe/brackets-shell into jasonsanjose/linux

commit 6cc887d
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Tue Jun 11 14:05:14 2013 -0700

    fix location of CEF resources

commit e11ca95
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Tue Jun 11 13:12:58 2013 -0700

    Missing quotes for CEF download URL

commit aa58615
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Tue Jun 11 12:58:48 2013 -0600

    Use 7zip

commit 9c67d38
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Tue Jun 11 11:48:38 2013 -0600

    Fix cef folder name

commit 78fe05a
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Tue Jun 11 11:43:02 2013 -0600

    Mirror CEF 3.1453.1255 linux 32-bit binary to Google drive

commit ce72f71
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Wed May 8 13:14:49 2013 -0700

    remove appshell.gyp

commit bf7f60d
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Wed May 8 13:14:35 2013 -0700

    not so successful attempt at finding the menubar

commit 08b4fec
Merge: 36f1616 e146c39
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Tue May 7 11:11:48 2013 -0700

    merge with sprint 24 master, fix build errors, and cross fingers

commit 36f1616
Author: jasonsj <jasonsj@ubuntu.(none)>
Date:   Mon May 6 13:37:38 2013 -0700

    fix symlink script

commit dfbcee6
Author: jasonsj <jasonsj@ubuntu.(none)>
Date:   Fri May 3 18:52:48 2013 -0700

    silent gyp install

commit 2b36b35
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Fri May 3 16:05:55 2013 -0700

    fix symlinks

commit 420bea0
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Fri May 3 15:53:59 2013 -0700

    fix setup bugs

commit 76edb1e
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Fri May 3 14:13:15 2013 -0700

    update setup script for libudev0

commit c7f11bc
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Fri May 3 12:47:38 2013 -0700

    remove make step from setup

commit 57fb18b
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Fri May 3 12:08:20 2013 -0700

    rename staging script

commit c1aefaf
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Thu May 2 16:43:59 2013 -0700

    check for /dev at executable location

commit 96738d6
Author: Jason San Jose <jasonsj@adobe.com>
Date:   Thu May 2 15:23:03 2013 -0700

    basic linux staging

commit 67a33e7
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Thu Dec 13 06:59:41 2012 +0530

    Update pakfiles to CEF3 branch 1271

commit 74e4a77
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Wed Dec 5 06:18:48 2012 +0530

    Workaround for focus-at-start bug

commit c883bde
Merge: 3870093 923c4b6
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Mon Nov 12 00:07:06 2012 -0800

    Merge pull request #1 from radorodopski/linux

commit 923c4b6
Author: Rado Rodopski <radoslav.sm.bg@gmail.com>
Date:   Mon Nov 12 01:33:22 2012 +0200

    Fix some runtime errors with this signature: @browser_main_loop. Hope this fixes all of them.

commit 29930a2
Merge: a25ef54 3870093
Author: Rado Rodopski <radoslav.sm.bg@gmail.com>
Date:   Sun Nov 11 14:43:01 2012 +0200

    Merge remote-tracking branch 'linux/linux' into linux

    Conflicts:
    	appshell/client_app_gtk.cpp

commit 3870093
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Sun Nov 11 08:40:51 2012 +0530

    Fix file:// url shim. Implement GetCurrentLanguage(), thanks Rado

commit a25ef54
Author: Rado Rodopski <radoslav.sm.bg@gmail.com>
Date:   Sun Nov 11 01:54:29 2012 +0200

    Fixed a bug where Brackets would not save user settings in the proper location. Added the .pak files to the list of files to be copied to output directory during build. Implemented ClientApp::GetCurrentLanguage(), this may not be the final version, input from the Brackets team is required on this.

commit 9e28fe7
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Sat Nov 10 17:47:51 2012 +0530

    minor appicon related fix

commit 488040d
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Sat Nov 10 17:36:31 2012 +0530

    Very simple CloseLiveBrowser implementation. In hopes for issue #1317

commit f759e16
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Fri Nov 9 11:59:40 2012 +0530

    Save file on close. Uses patched CEF build. See http://code.google.com/p/chromiumembedded/issues/detail?id=780

commit c18b322
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Thu Nov 8 08:33:02 2012 +0530

    Window icon. Removes menu. Relative index.html path.

commit 3e73b3a
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Sat Nov 3 06:45:37 2012 +0530

    Adding udev. Temp commit. Will be removed.

commit f5bf46f
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Thu Nov 1 07:45:29 2012 +0530

    JS resource compilation, platform independent.

commit 272fb80
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Tue Oct 30 12:14:53 2012 +0530

    Cleans up appshell.gyp. Launching live browser works

commit 07ac9fe
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Mon Oct 29 15:37:35 2012 +0530

    Some native functions. Got the hang of it. Prepare for public release

commit f6edb99
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Sun Oct 28 23:09:03 2012 +0530

    Brackets runs! HAHAHAHA Still need to implement platform code though

commit d3477af
Author: Chhatoi Pritam Baral <pritam@pritambaral.com>
Date:   Sun Oct 28 04:10:16 2012 +0530

    Got it to show a window! HAHA!
@jasonsanjose
Merge branch 'jasonsanjose/linux-squash' into linux
cbb9106 
Conflicts:
	appshell.gyp.txt
	appshell/appshell_extensions_gtk.cpp
	appshell/cefclient_gtk.cpp
	appshell/client_handler_gtk.cpp
	appshell_paths.gypi
@jasonsanjose
copy gyp file
904341b
@jasonsanjose
clean up linux setup script
2ebfe92
@jasonsanjose
disable appshell menus
a207553
Merge branch 'master' into linux
e1ffe3c
@jasonsanjose
restore brackets.app.addMenu
19c6556
@ghost ghost assigned jeffkenton and JeffryBooher Jun 21, 2013
@JeffryBooher
Copy link
Contributor

Windows Builds without errors and passes unit tests.

@JeffryBooher
Copy link
Contributor

@jasonsanjose can you merge master into this branch and make sure that nothing is broken? I think we may also need to implement unlink for folders or the low-level-file-i/o tests will fail on linux

Or is this something we don't really care about just to get into master so that work can continue on. I'm not sure what the goal is with all of the unfinished work.

@jasonsanjose
Copy link
Member Author

We don't care too much about the unit tests failing. There's plenty more where that came from. I'll update to master in a bit. Thanks for the review.

@jasonsanjose
Copy link
Member Author

@JeffryBooher ready to review

JeffryBooher
JeffryBooher reviewed Jun 21, 2013
View reviewed changes
appshell/cefclient_gtk.cpp

char szWorkingDir[512]; // The current working directory
std:: string szInitialUrl;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should clean this up so it's easier to find std::string if someone searches on it

@JeffryBooher
Copy link
Contributor

Initial review complete. Just the two nits and I think this is good to go.
Mac and Windows look good. Both platforms build and unit tests pass.

@jasonsanjose
Copy link
Member Author

Thanks, @JeffryBooher. Fixes pushed.

@JeffryBooher
Copy link
Contributor

Looks good. Merging.

JeffryBooher added a commit that referenced this pull request Jun 22, 2013
@JeffryBooher
Merge pull request #264 from adobe/linux
aec2d05 
Update Linux to CEF 3.1453.1255
@JeffryBooher JeffryBooher merged commit aec2d05 into master Jun 22, 2013
JeffryBooher added a commit that referenced this pull request Dec 8, 2015
@JeffryBooher
Merge pull request #264 from adobe/linux
b9c2f38 
Update Linux to CEF 3.1453.1255
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@JeffryBooher JeffryBooher

Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@jasonsanjose @JeffryBooher @jeffkenton @pritambaral @radorodopski