Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
tangled
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
eriksson monteiro
tangled
Commits
13ed1c26
Commit
13ed1c26
authored
May 17, 2021
by
Eriksson Monteiro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enable macos build
parent
c458db90
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
8 deletions
+24
-8
content/browser/browser_main_loop.cc
content/browser/browser_main_loop.cc
+24
-8
No files found.
content/browser/browser_main_loop.cc
View file @
13ed1c26
...
@@ -922,18 +922,34 @@ int BrowserMainLoop::CreateThreads() {
...
@@ -922,18 +922,34 @@ int BrowserMainLoop::CreateThreads() {
int
BrowserMainLoop
::
CreateMillixNode
()
{
int
BrowserMainLoop
::
CreateMillixNode
()
{
base
::
FilePath
dir_exe
=
base
::
FilePath
();
base
::
PathService
::
Get
(
base
::
DIR_EXE
,
&
dir_exe
);
LOG
(
INFO
)
<<
"running node from "
<<
dir_exe
.
value
().
c_str
();
base
::
LaunchOptions
options
;
base
::
LaunchOptions
options
;
options
.
current_directory
=
base
::
FilePath
(
L"./millix_node"
);
#if defined(OS_WIN)
options
.
current_directory
=
base
::
FilePath
(
"./millix_node"
);
base
::
CommandLine
millix_command_line
(
base
::
CommandLine
millix_command_line
(
base
::
FilePath
(
L
"./millix_node/nodejs/node.exe"
));
base
::
FilePath
(
"./millix_node/nodejs/node.exe"
));
millix_command_line
.
AppendArg
(
millix_command_line
.
AppendArg
(
"./nodejs/node_modules/@babel/node/bin/babel-node.js"
);
"./nodejs/node_modules/@babel/node/bin/babel-node.js"
);
#else
options
.
current_directory
=
dir_exe
.
AppendASCII
(
"millix_node"
);
base
::
CommandLine
millix_command_line
(
base
::
FilePath
(
"./nodejs/bin/node"
));
millix_command_line
.
AppendArg
(
"./nodejs/lib/node_modules/@babel/node/bin/babel-node.js"
);
#endif
millix_command_line
.
AppendArg
(
"index.js"
);
millix_command_line
.
AppendArg
(
"index.js"
);
// --enable-logging --v=2
// --enable-logging --v=2
LOG
(
INFO
)
<<
"Starting millix node: "
<<
millix_command_line
.
GetCommandLineString
();
LOG
(
INFO
)
<<
"Starting millix node: "
<<
millix_command_line
.
GetCommandLineString
();
#if defined(OS_WIN)
options
.
inherit_mode
=
base
::
LaunchOptions
::
Inherit
::
kAll
;
options
.
inherit_mode
=
base
::
LaunchOptions
::
Inherit
::
kAll
;
options
.
start_hidden
=
true
;
options
.
start_hidden
=
true
;
millix_process_
=
std
::
make_unique
<
base
::
Process
>
(
base
::
LaunchProcess
(
millix_command_line
.
GetCommandLineString
(),
options
));
#endif
millix_process_
=
std
::
make_unique
<
base
::
Process
>
(
base
::
LaunchProcess
(
millix_command_line
,
options
));
if
(
!
millix_process_
->
IsValid
())
{
if
(
!
millix_process_
->
IsValid
())
{
LOG
(
ERROR
)
<<
"Unable to run millix node "
<<
millix_command_line
.
GetCommandLineString
().
c_str
();
LOG
(
ERROR
)
<<
"Unable to run millix node "
<<
millix_command_line
.
GetCommandLineString
().
c_str
();
return
-
1
;
return
-
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment