summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.ninja10
-rw-r--r--src/browse.cc53
-rw-r--r--src/browse.h25
-rw-r--r--src/ninja.cc34
4 files changed, 87 insertions, 35 deletions
diff --git a/build.ninja b/build.ninja
index 803229c..019568c 100644
--- a/build.ninja
+++ b/build.ninja
@@ -31,6 +31,7 @@ rule link
command = $cxx $conf_ldflags $ldflags -o $out $in
description = LINK $out
+build $builddir/browse.o: cxx src/browse.cc | src/browse.py
build $builddir/build.o: cxx src/build.cc
build $builddir/build_log.o: cxx src/build_log.cc
build $builddir/eval_env.o: cxx src/eval_env.cc
@@ -39,11 +40,12 @@ build $builddir/parsers.o: cxx src/parsers.cc
build $builddir/subprocess.o: cxx src/subprocess.cc
build $builddir/util.o: cxx src/util.cc
build $builddir/ninja_jumble.o: cxx src/ninja_jumble.cc
-build $builddir/ninja.a: ar $builddir/build.o $builddir/build_log.o \
- $builddir/eval_env.o $builddir/graph.o $builddir/parsers.o \
- $builddir/subprocess.o $builddir/util.o $builddir/ninja_jumble.o
+build $builddir/ninja.a: ar $builddir/browse.o $builddir/build.o \
+ $builddir/build_log.o $builddir/eval_env.o $builddir/graph.o \
+ $builddir/parsers.o $builddir/subprocess.o $builddir/util.o \
+ $builddir/ninja_jumble.o
-build $builddir/ninja.o: cxx src/ninja.cc | src/browse.py
+build $builddir/ninja.o: cxx src/ninja.cc
build ninja: link $builddir/ninja.o $builddir/ninja.a
build $builddir/build_test.o: cxx src/build_test.cc
diff --git a/src/browse.cc b/src/browse.cc
new file mode 100644
index 0000000..4507e0d
--- /dev/null
+++ b/src/browse.cc
@@ -0,0 +1,53 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "browse.h"
+
+#include <stdio.h>
+
+#include "ninja.h"
+
+// Import browse.py as binary data.
+asm(
+".data\n"
+"browse_data_begin:\n"
+".incbin \"src/browse.py\"\n"
+"browse_data_end:\n"
+);
+// Declare the symbols defined above.
+extern const char browse_data_begin[];
+extern const char browse_data_end[];
+
+void RunBrowsePython(State* state, const char* ninja_command) {
+ // Create a temporary file, dump the Python code into it, and
+ // delete the file, keeping our open handle to it.
+ char tmpl[] = "browsepy-XXXXXX";
+ int fd = mkstemp(tmpl);
+ unlink(tmpl);
+ const int browse_data_len = browse_data_end - browse_data_begin;
+ int len = write(fd, browse_data_begin, browse_data_len);
+ if (len < browse_data_len) {
+ perror("write");
+ return;
+ }
+
+ // exec Python, telling it to use our script file.
+ const char* command[] = {
+ "python", "/proc/self/fd/3", ninja_command, NULL
+ };
+ execvp(command[0], (char**)command);
+
+ // If we get here, the exec failed.
+ printf("ERROR: Failed to spawn python for graph browsing, aborting.\n");
+}
diff --git a/src/browse.h b/src/browse.h
new file mode 100644
index 0000000..46249a7
--- /dev/null
+++ b/src/browse.h
@@ -0,0 +1,25 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef NINJA_BROWSE_H_
+#define NINJA_BROWSE_H_
+
+class State;
+
+// Run in "browse" mode, which execs a Python webserver.
+// |command| is the command used to invoke ninja.
+// This function does not return if it runs successfully.
+void RunBrowsePython(State* state, const char* ninja_command);
+
+#endif // NINJA_BROWSE_H_
diff --git a/src/ninja.cc b/src/ninja.cc
index 27def2b..8c46833 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -28,23 +28,13 @@
#include <sys/sysinfo.h>
#endif
+#include "browse.h"
#include "build.h"
#include "build_log.h"
#include "parsers.h"
#include "graphviz.h"
-// Import browse.py as binary data.
-asm(
-".data\n"
-"browse_data_begin:\n"
-".incbin \"src/browse.py\"\n"
-"browse_data_end:\n"
-);
-// Declare the symbols defined above.
-extern const char browse_data_begin[];
-extern const char browse_data_end[];
-
option options[] = {
{ "help", no_argument, NULL, 'h' },
{ }
@@ -137,26 +127,8 @@ int CmdQuery(State* state, int argc, char* argv[]) {
}
int CmdBrowse(State* state, int argc, char* argv[]) {
- // Create a temporary file, dump the Python code into it, and
- // delete the file, keeping our open handle to it.
- char tmpl[] = "browsepy-XXXXXX";
- int fd = mkstemp(tmpl);
- unlink(tmpl);
- const int browse_data_len = browse_data_end - browse_data_begin;
- int len = write(fd, browse_data_begin, browse_data_len);
- if (len < browse_data_len) {
- perror("write");
- return 1;
- }
-
- // exec Python, telling it to use our script file.
- const char* command[] = {
- "python", "/proc/self/fd/3", argv[0], NULL
- };
- execvp(command[0], (char**)command);
-
- // If we get here, the exec failed.
- printf("ERROR: Failed to spawn python for graph browsing, aborting.\n");
+ RunBrowsePython(state, argv[0]);
+ // If we get here, the browse failed.
return 1;
}