Commit Graph

134 Commits

Author SHA1 Message Date
Cheng Zhao
1725b9bf54 Use require('electron') 2015-12-11 09:30:58 +08:00
Wliu
d2a86e2466 Add 'home' argument to app.getPath() 2015-11-18 18:46:38 -05:00
Wliu
6cd480b37e Fix Electron deprecations 2015-11-17 21:16:09 -05:00
Kevin Sawicki
afbb716a7a Mention .atom is a folder 2015-11-03 17:01:26 -08:00
Kevin Sawicki
a6c1ab0990 Remove : from error message 2015-11-03 17:01:26 -08:00
Kevin Sawicki
9ca94affc0 Mention conditional copying of .atom 2015-11-03 17:01:25 -08:00
Kevin Sawicki
97c19199c3 --set-portable -> --portable 2015-11-03 17:01:25 -08:00
Kevin Sawicki
0e9562de5d Log copy error message and stack separately 2015-11-03 17:01:25 -08:00
Kevin Sawicki
85a1471138 Improve copy portable error message 2015-11-03 17:01:25 -08:00
Kevin Sawicki
5d8edcd8ef Catch error copying portable folder 2015-11-03 17:01:25 -08:00
Kevin Sawicki
02f508720b Only use long option for set portable 2015-11-03 17:01:25 -08:00
Kevin Sawicki
d162eec601 🎨 2015-11-03 17:01:24 -08:00
Dave Rael
a95e582907 Restore passing of args lost in merge
to get command line parameter for setting portable mode into the atom home
interrogation
2015-11-03 17:01:24 -08:00
Dave Rael
e3da370d82 Add command line parameter to set portable
If parameter included, home directory will be copied to the portable
2015-11-03 17:01:24 -08:00
Kevin Sawicki
02fe2cf618 🎨 2015-10-27 11:45:35 -06:00
Dave Rael
b1d10ef4dc Revert moving parse of command line
to the first line of start function because the move is not necessary
without having the code for using a command line parameter to set Atom to
portable mode.  This belongs on that branch and in that pull request.
2015-10-22 09:01:56 -06:00
Dave Rael
810f0e4583 Fix merge problem and missing function call
Merge resulted in a missing require and change to remove unused function
parameters resulted in not calling function
2015-10-21 09:47:33 -06:00
Dave Rael
e93b013059 Remove unused function parameter
for setupAtomHome function no longer needing args
2015-10-21 04:40:05 -06:00
Dave Rael
e0697ecc7f Merge branch 'master' into portable-mode
Conflicts:
	src/atom-environment.coffee
2015-10-20 20:58:14 -06:00
Dave Rael
6d4105ac97 Escape characters is portable path not writable
warning to resolve missing backslash and other potential problems
resulting from the markdown-parsed nature of the display of notifications.
2015-10-20 07:09:58 -06:00
Nathan Sobo
abee4c1db4 Default devMode to true ASAP if running Atom in test mode
Previously, we ran the window in devMode, but didn’t set devMode to true
early enough to compute the correct resource path. This caused errors
when attempting to load the bundled keymaps when running atom —test
without the —dev flag.
2015-10-17 10:39:26 -06:00
Dave Rael
03faddd7ae Undo add command line parameter to set portable
undo 4312f76ed7 to include this in a pull
request of its own
2015-10-16 07:02:53 -06:00
Max Brunsfeld
27526f492c Fix fall-back to dev resource path in main 2015-10-15 18:01:20 -07:00
Dave Rael
28a1bbf9a2 Fix function names - consistent with convention 2015-10-15 14:35:04 -06:00
Dave Rael
4312f76ed7 Added command line parameter to set portable
If parameter included, home directory will be copied to the portable
location to make this a portable install
2015-10-13 05:43:01 -06:00
Dave Rael
b8a153781e Implement Portable Mode
According to these specifications:
Portable mode only applies to Windows (for now)
Portable mode only applies if ATOM_HOME is not set
If there is a .atom directory as sibling to directory with running process
	use that as ATOM_HOME
2015-10-09 11:20:41 -06:00
Antonio Scandurra
9ac4034135 🔥 Drop --spec-directory 2015-10-08 14:04:23 +02:00
Antonio Scandurra
1d280e8d92 Introduce timeout option
The idea with this commit is to implement a timeout functionality that does not
rely on a system utility (such as unix `timeout`). Tests could hang because of a
CPU-bound task and, as a result, we need to handle timeouts in a separate
process.

An ideal implementation would first spawn the timeout, which in turn would spawn
the tests, acting as a supervisor and making sure they do not exceed the
supplied time. However, setting up such an environment would have been trickier,
thus the test process spawns the timeout cop before running any test. This, in
turn, invokes a `setTimeout` function and kills the parent process as soon as
the timeout gets triggered, logging to console the reason why the parent process
was killed (and exiting the parent process with code 130).

I haven't used `Task` because, in order to log stuff to the console, we need to
fork the ChildProcess from `remote`, as otherwise nothing gets written out.
2015-10-08 11:38:48 +02:00
Dave Rael
f067fdb7cd Merge branch 'master' into portable-mode
Conflicts:
	src/browser/main.coffee
2015-10-06 14:28:10 -06:00
Paul Betts
47f973db38 Fix incorrect indentation on setAppUserModelId
Fixes #7374
2015-09-21 15:08:02 -06:00
Max Brunsfeld
f56dde9c91 Setup browser-process exception handler before requiring anything
Signed-off-by: Nathan Sobo <nathan@github.com>
2015-09-09 11:57:54 -07:00
Paul Betts
477559581e Correctly handle devMode 2015-09-07 12:13:34 -07:00
Paul Betts
4a53619780 Patch the browser process too 2015-09-07 11:56:46 -07:00
Paul Betts
b483fc6805 Set App User Model ID on Win32 2015-09-06 10:27:25 +02:00
Max Brunsfeld
e5da009cdc Strip colon-number suffixes from args before parsing them as URLs 2015-09-03 11:31:01 -07:00
Max Brunsfeld
0a8ff35c3a 🎨 Pass devResourcePath as an argument to AtomApplication 2015-09-03 10:30:08 -07:00
Max Brunsfeld
ed62685c78 🎨 main.coffee 2015-09-03 10:28:37 -07:00
Max Brunsfeld
61f7de736f Normalize resource path drive letters in main 2015-09-01 12:20:05 -07:00
Max Brunsfeld
f531684acf Use compile-cache in browser process (for dev mode) 2015-08-20 17:59:29 -07:00
Kevin Sawicki
34d3dadd51 📝 Mention --include-deprecated-apis is not currently supported 2015-07-07 10:42:22 -07:00
Kevin Sawicki
85a4ae7fea Remove --include-deprecated-apis command line option 2015-06-24 16:51:48 -04:00
Kevin Sawicki
281e0b420d 🎨 Move one flag near deprecated flag 2015-06-03 15:00:33 -07:00
Kevin Sawicki
205059cd2f The -> This 2015-06-03 12:00:48 -07:00
Kevin Sawicki
6a5bf633e9 Show deprecation text via usage message 2015-06-03 11:53:59 -07:00
Kevin Sawicki
75f2ce148a Use consistent default format 2015-06-03 11:43:58 -07:00
Kevin Sawicki
6ebbb58a80 Log message about --one being removed 2015-06-03 11:43:58 -07:00
Kevin Sawicki
bf37a66831 Rename --one to --include-deprecated-apis 2015-06-02 16:36:20 -07:00
Mostafa Eweda
4c9e6c5a27 Revert "Merge pull request #6977 from atom/revert-6813-local-initial-paths"
This reverts commit 0c66802278, reversing
changes made to bdce576ab9.
2015-05-27 11:18:15 -07:00
Max Brunsfeld
0dcdfa1e89 Revert "Initial paths shouldn't be normalized on save and restore (could contain uris)" 2015-05-27 10:26:59 -07:00
Mostafa Eweda
d42a660f9b enforced code nit 2 2015-05-19 22:01:26 -07:00