Commit graph

17576 commits

Author SHA1 Message Date
Cheng Zhao
7c2a4882a6 Make sure the fake config.gypi can be parsed by node.js. 2013-07-02 22:32:14 +08:00
Cheng Zhao
9c9d62c3a9 Should write a meaningful config.gypi for node.
Node is parsing it for 'process.config', empty file would cause
exception.
2013-07-02 22:23:13 +08:00
Adam Roben
b17e63d13c Update libchromiumcontent to be based on Chrome 28
* vendor/libchromiumcontent f4f8a7e...929f9c9 (3):
  > Merge pull request #19 from brightray/chrome-28
  > Merge pull request #18 from brightray/encryptor
  > Merge pull request #17 from brightray/cygwin
2013-07-02 10:11:28 -04:00
Adam Roben
6b68847a0d Merge pull request #23 from brightray/ninja
Fix building with ninja
2013-07-02 07:03:26 -07:00
Cheng Zhao
40e06db3a8 Use the platform_util_win implementation from Chromium. 2013-07-02 18:47:51 +08:00
Cheng Zhao
304f9cc01a Update node: fix link error in uv. 2013-07-02 18:30:39 +08:00
Cheng Zhao
236b29ee8c Fix main function on Windows. 2013-07-02 18:02:55 +08:00
Cheng Zhao
7a27537c89 Update brightray: fix building with ninja. 2013-07-02 17:33:43 +08:00
Cheng Zhao
5e807cffc8 Use abusolute path when linking to external libraries. Fixes #22.
The ninja generator of gyp behaves strangely on the 'libraries' field of link
settings, for example, specifying path to an external library works well on
both xcodebuild and msvc generators, but the ninja generator would link to
the wrong path (it can neither translate relative path correctly, nor convert
the command line parameter to the '-lxxx' form).

The only way to make all generators work on all platforms is to use abusolute
paths for external libraries.
2013-07-02 15:24:24 +08:00
Cheng Zhao
892f1aa7ce Rename source_root to atom_source_root to avoid conflicts. 2013-07-02 12:10:14 +08:00
Cheng Zhao
e87a7c286c Don't throw exception when gyp fails.
This makes output cleaner when we got a gyp error.
2013-07-02 09:33:11 +08:00
Cheng Zhao
dc1655979e Only create config.gypi if it doesn't exist.
Otherwise every call of bootstrap would trigger recompilation of some
files.
2013-07-02 09:31:43 +08:00
Cheng Zhao
84b8442ef8 Update node: removed a few more unused patches. 2013-07-02 09:28:48 +08:00
Cheng Zhao
a749a6dc2d Include node's config.gypi in atom-shell.
Removed 3 commits of our node fork.
2013-07-02 09:16:56 +08:00
Cheng Zhao
f61a7ee5eb Define 'python' variable in atom-shell.
Removed a patch in node.
2013-07-02 08:52:06 +08:00
Cheng Zhao
90ab2dcc7e Fix update-frameworks. 2013-07-01 22:27:14 +08:00
Cheng Zhao
59ba3f1025 Implement main function on Windows. 2013-07-01 22:21:31 +08:00
Cheng Zhao
1b93ec1032 Fix compilation errors and warnings on native_window.cc. 2013-07-01 22:01:17 +08:00
Cheng Zhao
6bdf7c51b4 Don't rely on "iosfwd" for forward including std::string.
It seems that VS fails on this.
2013-07-01 21:56:46 +08:00
Cheng Zhao
3176e03866 Ranged for is not supported by VS 2010. 2013-07-01 21:54:18 +08:00
Cheng Zhao
230173da1a snprintf is not supported by VS. 2013-07-01 21:47:21 +08:00
Cheng Zhao
398c0a7c6a Implement converting string vector to char pointer array on Windows. 2013-07-01 21:44:25 +08:00
Cheng Zhao
ca389edc38 Implement process.crash() on Windows. 2013-07-01 21:35:00 +08:00
Cheng Zhao
fecaa7b75a Should enable C++ exceptions for all targets on Windows.
It's a requirement for using standard library of VS.
2013-07-01 20:52:48 +08:00
Cheng Zhao
14f7a64a91 Fix warnings in http_parser. 2013-07-01 18:45:46 +08:00
Cheng Zhao
8145d5ba26 Fix two warnings in openssl. 2013-07-01 18:36:58 +08:00
Cheng Zhao
49a5f6e38c Compile atom_lib with C++ exception enabled. 2013-07-01 18:31:23 +08:00
Cheng Zhao
ec5fc10bd9 Fix calling compile-coffee under cygwin. 2013-07-01 18:04:15 +08:00
Cheng Zhao
384e83972f Make node static library build. 2013-07-01 17:58:01 +08:00
Cheng Zhao
5ccff31f52 Add switch to skip operations require networking.
I'm on a slow network :-(
2013-07-01 16:12:31 +08:00
Cheng Zhao
74fe79ce62 We don't need to force updating to latest npm. 2013-07-01 16:06:37 +08:00
Cheng Zhao
f510f77b98 Use win32 python to call gyp when running under cygwin. 2013-07-01 15:49:52 +08:00
Cheng Zhao
09a4ea718d Ignore vendor/python_26 in git. 2013-07-01 15:37:22 +08:00
Cheng Zhao
1edf3bd12f Pull in precompiled python under cygwin. 2013-07-01 15:21:57 +08:00
Cheng Zhao
bafd6a5c49 Ship gyp. 2013-07-01 15:21:56 +08:00
Cheng Zhao
b56009c1d2 Do not ignore vendor/. 2013-07-01 15:21:56 +08:00
Cheng Zhao
97a38fe55d Only download frameworks on OS X. 2013-07-01 15:21:55 +08:00
Cheng Zhao
8034afdcdf Update npm after node is downloaded.
So we can execute npm even without system node.
2013-07-01 15:21:55 +08:00
Cheng Zhao
1dff44340a Also ship version and LICENSE file with dist. 2013-06-29 11:52:58 +08:00
Cheng Zhao
0af724205c Make sure dist is created for the HEAD before uploading. 2013-06-29 11:36:02 +08:00
Cheng Zhao
02ba7d27b9 Make Objective-C's categories work.
See more on:
http://stackoverflow.com/questions/2567498/objective-c-categories-in-static-library
2013-06-29 09:23:27 +08:00
Cheng Zhao
5b80e14f38 typeof null can also be 'object'. 2013-06-27 19:33:53 +08:00
Cheng Zhao
0c6997b160 Fix passing null as window in dialog.showMessageBox. 2013-06-27 19:33:38 +08:00
Cheng Zhao
b9c7013469 Update to latest brightray. 2013-06-27 18:27:51 +08:00
Cheng Zhao
411e1a3685 Emit WindowCloseCancelled message when close is cancelled by user code. 2013-06-26 17:50:50 +08:00
Cheng Zhao
adacc2bcf9 Use applicationShouldTerminate to control whether application should quit. 2013-06-26 17:48:59 +08:00
Cheng Zhao
6362e60a7b Make video and audio tag work, fixes #31.
See more about this on:
fdf20531bd
2013-06-26 10:31:32 +08:00
Cheng Zhao
c651e96708 Clean unused bash script. 2013-06-25 09:20:55 +08:00
Cheng Zhao
3a609e9133 Merge pull request #29 from atom/python
Rewrite scripts in python
2013-06-24 18:18:32 -07:00
Cheng Zhao
40ed17d8fd Modify upload script to obey chromium's style. 2013-06-24 17:56:51 +08:00