This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/inline.sh b/src/inline.sh | |
| index 5ea082d..5acc17b 100755 | |
| --- a/src/inline.sh | |
| +++ b/src/inline.sh | |
| @@ -20,6 +20,6 @@ | |
| varname="$1" | |
| echo "const char $varname[] =" | |
| -od -t x1 -A n -v | sed -e 's| |\\x|g; s|^|"|; s|$|"|' | |
| +od -t x1 -A n -v | sed -e 's| ||g; s|..|\\x&|g; s|^|"|; s|$|"|' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| cl.exe /nologo /EHsc /I. /Isrc /DWIN32 /Feninja-bootstrap.exe src\build.cc src\build_log.cc src\eval_env.cc src\graph.cc src\graphviz.cc src\parsers.cc src\subprocess.win32.cpp src\util.cc src\ninja_jumble.cc src\ninja.cc src\getopt.c shlwapi.lib && .\ninja-bootstrap.exe -f build-win32.ninja ninja.exe && del .\ninja-bootstrap.exe |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| builddir = build-win32 | |
| o = obj | |
| x = .exe | |
| cxx = cl.exe -nologo | |
| cflags = -EHsc -I. -Isrc -DWIN32 | |
| ldflags = | |
| rule cxx | |
| command = $cxx $cflags -Fo$out /c $in | |
| description = CC $out |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /* cl pfop_sample.c shlwapi.lib */ | |
| #include <stdio.h> | |
| #include <shlwapi.h> | |
| int main() | |
| { | |
| BOOL bOk; | |
| char buf[MAX_PATH] = {0}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/lib/fileutils.rb b/lib/fileutils.rb | |
| index f2a6197..94af69a 100644 | |
| --- a/lib/fileutils.rb | |
| +++ b/lib/fileutils.rb | |
| @@ -1036,7 +1036,7 @@ module FileUtils | |
| created = nocreate = options[:nocreate] | |
| t = options[:mtime] | |
| if options[:verbose] | |
| - fu_output_message "touch #{nocreate ? ' -c' : ''}#{t ? t.strftime(' -t %Y%m%d%H%M.%S') : ''}#{list.join ' '}" | |
| + fu_output_message "touch #{nocreate ? '-c ' : ''}#{t ? t.strftime(' -t %Y%m%d%H%M.%S') : ''}#{list.join ' '}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| srcdir = . | |
| builddir = . | |
| cc = gcc | |
| cflags = -Wall -Wextra -O2 -g | |
| cppflags = | |
| rule cc | |
| depfile = $out.d | |
| command = $cc -MMD -MF $out.d $cflags $cppflags-c $in -o $out |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/graph.cc b/src/graph.cc | |
| index a4317ba..bbfb8df 100644 | |
| --- a/src/graph.cc | |
| +++ b/src/graph.cc | |
| @@ -148,8 +148,11 @@ bool Edge::LoadDepFile(State* state, DiskInterface* disk_interface, | |
| *err = "expected only one output"; | |
| return false; | |
| } | |
| - if (outputs_[0]->file_->path_ != makefile.out_) { | |
| - *err = "expected makefile to mention '" + outputs_[0]->file_->path_ + "', " |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/graph_test.cc b/src/graph_test.cc | |
| index ba41440..56e8ab5 100644 | |
| --- a/src/graph_test.cc | |
| +++ b/src/graph_test.cc | |
| @@ -79,3 +79,21 @@ TEST_F(GraphTest, ExplicitImplicit) { | |
| // the output to be dirty). | |
| EXPECT_TRUE(GetNode("out.o")->dirty_); | |
| } | |
| + | |
| +TEST_F(GraphTest, PathWithCurrentDirectory) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/graph_test.cc b/src/graph_test.cc | |
| index ba41440..ef9fee2 100644 | |
| --- a/src/graph_test.cc | |
| +++ b/src/graph_test.cc | |
| @@ -79,3 +79,28 @@ TEST_F(GraphTest, ExplicitImplicit) { | |
| // the output to be dirty). | |
| EXPECT_TRUE(GetNode("out.o")->dirty_); | |
| } | |
| + | |
| +TEST_F(GraphTest, PathWithCurrentDirectory) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <!DOCTYPE html> | |
| <html> | |
| <head> | |
| <style> | |
| html { | |
| margin: 0; | |
| padding: 0; | |
| } | |
| body { | |
| margin: 0; |