Updated gyp #546

ficristo · 2016-01-31T12:57:24Z

This is necessary to support newer compiler (in my case VS2015).
I simply copied the upstream source to the gyp folder but I've excluded the gyp/test folder from the commit.

The gyp/test folder was excluded from the commit.

This is the same fix of Glenn Ruehle of 18/06/2013 on top of the update of gyp (SHA-1: a276d55)

ficristo · 2016-04-06T09:16:18Z

@nethip @jasonsanjose
I know this will be PITA to review but would be awesome if someone could take a look.
If you think that updating gyp is better done by someone of the Brackets team let me know.
Thank you.

ingorichter · 2016-05-12T17:19:07Z

Builds fine on OSX for me. @ficristo are you on Windows? Anybody here to build and smoke test the Linux build? I can do it in the evening, if nobody is available.

ficristo · 2016-05-12T17:31:12Z

@ingorichter I've tested on Windows 7.

ficristo · 2016-05-25T08:03:49Z

Finally I was able to set a VM with Linux.
@nethip @ingorichter Which branch should I test for Linux?

nethip · 2016-05-25T08:40:33Z

Currently Linux builds are getting spawned from linux-1547

ficristo · 2016-05-25T10:11:41Z

I tested on that branch with an updated gyp and seems to works.
I needed only to remove python2 from this command gypCommand = "bash -c 'python2 gyp/gyp --depth=.'"; in tasks/setup.js.

ficristo · 2016-05-31T17:56:23Z

With the last commit I can create the project on linux too.

ficristo · 2016-06-12T07:52:52Z

@nethip @ingorichter
Now that version 1.7 has been released, is there any chance that you can review my PRs?

nethip · 2016-06-21T15:46:53Z

LGTM. I would build this branch on VS2010 as well before merging in.

Good job @ficristo . Quite a no of changes actually!

nethip · 2016-06-22T14:13:45Z

@ficristo I am getting following errors when I am building using VS2013.

2>appshell\appshell_extensions_win.cpp(429): error C2220: warning treated as error - no 'object' file generated
2>appshell\appshell_extensions_win.cpp(429): warning C4996: 'GetVersionExW': was declared deprecated
2>          C:\Program Files (x86)\Windows Kits\8.1\Include\um\sysinfoapi.h(442) : see declaration of 'GetVersionExW'
2>  resource_util_win.cpp
2>  cef_dark_aero_window.cpp
2>  cef_dark_window.cpp
2>  cef_host_window.cpp
2>appshell\cef_dark_aero_window.cpp(60): error C2220: warning treated as error - no 'object' file generated
2>appshell\cef_dark_aero_window.cpp(60): warning C4996: 'GetVersionExW': was declared deprecated
2>          C:\Program Files (x86)\Windows Kits\8.1\Include\um\sysinfoapi.h(442) : see declaration of 'GetVersionExW'

ficristo · 2016-06-22T14:32:22Z

The GetVersionExW warnings should be fixed by: #549

nethip · 2016-06-22T14:35:17Z

Thanks @ficristo

nethip · 2016-06-22T14:40:10Z

@ficristo After merging your PRs I am getting following linker errors, upon building master.

2>appshell_extensions_win.obj : error LNK2019: unresolved external symbol __imp__IsTextUnicode@12 referenced in function "bool __cdecl GetBufferAsUTF8(struct UTFValidationState &)" (?GetBufferAsUTF8@@YA_NAAUUTFValidationState@@@Z)
2>appshell_extensions_win.obj : error LNK2019: unresolved external symbol __imp__RegCloseKey@4 referenced in function "class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > __cdecl GetPathToLiveBrowser(void)" (?GetPathToLiveBrowser@@YA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@XZ)
2>cef_registry.obj : error LNK2001: unresolved external symbol __imp__RegCloseKey@4
2>appshell_extensions_win.obj : error LNK2019: unresolved external symbol __imp__RegOpenKeyExW@20 referenced in function "class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > __cdecl GetPathToLiveBrowser(void)" (?GetPathToLiveBrowser@@YA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@XZ)
2>cef_registry.obj : error LNK2001: unresolved external symbol __imp__RegOpenKeyExW@20
2>appshell_extensions_win.obj : error LNK2019: unresolved external symbol __imp__RegQueryValueExW@24 referenced in function "class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > __cdecl GetPathToLiveBrowser(void)" (?GetPathToLiveBrowser@@YA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@XZ)
2>cef_registry.obj : error LNK2001: unresolved external symbol __imp__RegQueryValueExW@24
2>cef_registry.obj : error LNK2019: unresolved external symbol __imp__RegCreateKeyExW@36 referenced in function "bool __cdecl WriteRegistryInt(wchar_t const *,wchar_t const *,int)" (?WriteRegistryInt@@YA_NPB_W0H@Z)
2>cef_registry.obj : error LNK2019: unresolved external symbol __imp__RegSetValueExW@24 referenced in function "bool __cdecl WriteRegistryInt(wchar_t const *,wchar_t const *,int)" (?WriteRegistryInt@@YA_NPB_W0H@Z)
2>Release\Brackets.exe : fatal error LNK1120: 6 unresolved externals

nethip · 2016-06-22T14:40:38Z

I am on VS 2013.

ingorichter · 2016-06-22T15:47:16Z

@nethip what VS version does the build machine use? Do we have a followup issue that addresses the build failure?

nethip · 2016-06-22T15:49:39Z

@ingorichter Build machine is configured with VS2010. I think we need to build this on VS 2010 and see if works. I can ask RE to fire a build to check if it is building fine.

VS 2015 build is going fine actually. It is just VS2013 that is failing.

ingorichter · 2016-06-22T16:36:33Z

@nethip perhaps we should update the build machines to use VS2015. Which Xcode version do we use on the build machines? 7.3?

nethip · 2016-06-22T16:47:11Z

@ingorichter Sure! We need to inform then RE about it. Mac build machine is configured with 10.9 and XCode 5.0. I think upgrading to VS 2015 is a lot easier. For Mac, the entire system needs to be upgraded. I will ping RE about it.

Regarding the build failure. Really weird! If I manually add advapi32.lib to linker settings in VS 2013, it builds fine.

nethip · 2016-06-22T16:59:31Z

@ingorichter @ficristo I have raised a PR for this at #560 let me know if it looks good.

ficristo added 2 commits April 2, 2016 16:29

Updated gyp to 697933c2e3b3ffdd6949df3c2fa3613489e01175

c54a675

The gyp/test folder was excluded from the commit.

Reapply "Fix directory copy for gyp on Windows"

a28fe08

This is the same fix of Glenn Ruehle of 18/06/2013 on top of the update of gyp (SHA-1: a276d55)

ficristo force-pushed the update-gyp branch from 9a25b29 to a28fe08 Compare April 2, 2016 16:35

This was referenced May 3, 2016

[CEF 2623] Upgrade to latest CEF #544

Merged

VS2015: add link libraries #552

Merged

Remove 'python2' from gypCommand

58a11d2

nethip merged commit 3046a38 into adobe:master Jun 22, 2016

ficristo deleted the update-gyp branch June 22, 2016 18:03

This was referenced Aug 17, 2021

[CLOSED] Updated gyp brackets-archive/brackets-shell#361

Open

[CLOSED] VS2015: add link libraries brackets-archive/brackets-shell#367

Open

Updated gyp #546

Updated gyp #546

Uh oh!

Conversation

ficristo commented Jan 31, 2016

Uh oh!

ficristo commented Apr 6, 2016

Uh oh!

ingorichter commented May 12, 2016

Uh oh!

ficristo commented May 12, 2016

Uh oh!

ficristo commented May 25, 2016

Uh oh!

nethip commented May 25, 2016

Uh oh!

ficristo commented May 25, 2016

Uh oh!

ficristo commented May 31, 2016

Uh oh!

ficristo commented Jun 12, 2016

Uh oh!

nethip commented Jun 21, 2016

Uh oh!

nethip commented Jun 22, 2016

Uh oh!

ficristo commented Jun 22, 2016

Uh oh!

nethip commented Jun 22, 2016

Uh oh!

nethip commented Jun 22, 2016

Uh oh!

nethip commented Jun 22, 2016

Uh oh!

ingorichter commented Jun 22, 2016

Uh oh!

nethip commented Jun 22, 2016

Uh oh!

ingorichter commented Jun 22, 2016

Uh oh!

nethip commented Jun 22, 2016

Uh oh!

nethip commented Jun 22, 2016

Uh oh!

Uh oh!