[NaCl SDK] Cleanup makefile output on windows.

The echo command on win32 will echo double quotes that
surround that string.  Removing them seem to work on
both windows and unix.

Also, remove the output generated when chrome could not
be found.

TEST=trybots
NOTRY=true
BUG=177802

Review URL: https://chromiumcodereview.appspot.com/12334071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184717 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 30 insertions, 16 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index eb009cc..f45cc79 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -756,11 +756,11 @@ def BuildStepMakeAll(pepperdir, platform, directory, step_name,
     extra_args += ['IGNORE_DEPS=1']
 
   buildbot_common.Run([make, '-j8', 'all_versions'] + extra_args,
-                      cwd=os.path.abspath(make_dir), env=env)
+                      cwd=make_dir, env=env)
   if clean:
     # Clean to remove temporary files but keep the built libraries.
     buildbot_common.Run([make, '-j8', 'clean'] + extra_args,
-                        cwd=os.path.abspath(make_dir), env=env)
+                        cwd=make_dir, env=env)
 
 
 def BuildStepBuildLibraries(pepperdir, platform, directory, clean=True):
diff --git a/native_client_sdk/src/examples/Makefile b/native_client_sdk/src/examples/Makefile
index 43808fb..9eb356d 100644
--- a/native_client_sdk/src/examples/Makefile
+++ b/native_client_sdk/src/examples/Makefile
@@ -43,15 +43,15 @@ endef
 $(foreach proj,$(PROJECTS),$(eval $(call TARGET,$(proj))))
 
 all: $(TARGET_LIST)
-	echo "Done building targets."
+	@echo Done building targets.
 
 all_versions: $(VERSIONS_LIST)
-	echo "Done building all versions."
+	@echo Done building all versions.
 
 clean: $(CLEAN_LIST)
-	echo "Done cleaning targets."
+	@echo Done cleaning targets.
 
 .PHONY: RUN
 RUN: all
-	echo "Starting up python webserver."
+	@echo Starting up python webserver.
 	python ../tools/httpd.py
diff --git a/native_client_sdk/src/tools/common.mk b/native_client_sdk/src/tools/common.mk
index 460f11e..f27e97b 100644
--- a/native_client_sdk/src/tools/common.mk
+++ b/native_client_sdk/src/tools/common.mk
@@ -194,7 +194,7 @@ clean:
 #
 %dir.stamp :
 	$(MKDIR) -p $(dir $@)
-	@echo "Directory Stamp" > $@
+	@echo Directory Stamp > $@
 
 
 #
@@ -222,7 +222,7 @@ else
 
 .PHONY : $(STAMPDIR)/$(1).stamp
 $(STAMPDIR)/$(1).stamp :
-	@echo "Ignore $(1)"
+	@echo Ignore $(1)
 endif
 endef
 
@@ -275,10 +275,16 @@ define LOG
 $(3)
 endef
 else
+ifeq ($(OSNAME),win)
+define LOG
+@echo   $(1) $(2) && $(3)
+endef
+else
 define LOG
 @echo "  $(1) $(2)" && $(3)
 endef
 endif
+endif
 
 
 #
@@ -302,12 +308,20 @@ ifneq (,$(findstring $(TOOLCHAIN),pnacl))
 include $(NACL_SDK_ROOT)/tools/nacl_llvm.mk
 endif
 
+#
+# File to redirect to to in order to hide output.
+#
+ifeq ($(OSNAME),win)
+DEV_NULL=nul
+else
+DEV_NULL=/dev/null
+endif
 
 #
-# Assign a sensible default to CHROME_PATH
+# Assign a sensible default to CHROME_PATH.
 #
 ifndef CHROME_PATH
-CHROME_PATH:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py --chrome)
+CHROME_PATH:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py --chrome 2> $(DEV_NULL))
 endif
 
 #
diff --git a/native_client_sdk/src/tools/nacl_gcc.mk b/native_client_sdk/src/tools/nacl_gcc.mk
index 3cdbf6b..ddff452 100644
--- a/native_client_sdk/src/tools/nacl_gcc.mk
+++ b/native_client_sdk/src/tools/nacl_gcc.mk
@@ -27,17 +27,17 @@ LD_ARM:=-L$(NACL_SDK_ROOT)/lib/$(TOOLCHAIN)_arm/$(CONFIG)
 X86_32_CC?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/i686-nacl-gcc
 X86_32_CXX?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/i686-nacl-g++
 X86_32_LINK?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/i686-nacl-g++
-X86_32_LIB?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/i686-nacl-ar r
+X86_32_LIB?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/i686-nacl-ar
 
 X86_64_CC?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/x86_64-nacl-gcc
 X86_64_CXX?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/x86_64-nacl-g++
 X86_64_LINK?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/x86_64-nacl-g++
-X86_64_LIB?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/x86_64-nacl-ar r
+X86_64_LIB?=$(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/x86_64-nacl-ar
 
 ARM_CC?=$(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-gcc
 ARM_CXX?=$(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-g++
 ARM_LINK?=$(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-g++
-ARM_LIB?=$(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-ar r
+ARM_LIB?=$(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-ar
 
 
 #
@@ -138,19 +138,19 @@ $(STAMPDIR)/$(1).stamp :
 all: $(NACL_SDK_ROOT)/lib/$(TOOLCHAIN)_x86_32/$(CONFIG)/lib$(1).a
 $(NACL_SDK_ROOT)/lib/$(TOOLCHAIN)_x86_32/$(CONFIG)/lib$(1).a : $(foreach src,$(2),$(OUTDIR)/$(basename $(src))_x86_32.o)
 	$(MKDIR) -p $$(dir $$@)
-	$(call LOG,LIB,$$@,$(X86_32_LIB) $$@ $$^)
+	$(call LOG,LIB,$$@,$(X86_32_LIB) -r $$@ $$^)
 
 all: $(NACL_SDK_ROOT)/lib/$(TOOLCHAIN)_x86_64/$(CONFIG)/lib$(1).a
 $(NACL_SDK_ROOT)/lib/$(TOOLCHAIN)_x86_64/$(CONFIG)/lib$(1).a : $(foreach src,$(2),$(OUTDIR)/$(basename $(src))_x86_64.o)
 	$(MKDIR) -p $$(dir $$@)
-	$(call LOG,LIB,$$@,$(X86_64_LIB) $$@ $$^)
+	$(call LOG,LIB,$$@,$(X86_64_LIB) -r $$@ $$^)
 
 ifneq ('glibc','$(TOOLCHAIN)')
 all: $(NACL_SDK_ROOT)/lib/$(TOOLCHAIN)_arm/$(CONFIG)/lib$(1).a
 endif
 $(NACL_SDK_ROOT)/lib/$(TOOLCHAIN)_arm/$(CONFIG)/lib$(1).a : $(foreach src,$(2),$(OUTDIR)/$(basename $(src))_arm.o)
 	$(MKDIR) -p $$(dir $$@)
-	$(call LOG,LIB,$$@,$(ARM_LIB) $$@ $$^)
+	$(call LOG,LIB,$$@,$(ARM_LIB) -r $$@ $$^)
 endef
 
 #