[Bf-blender-cvs] [236fabc] master: Minor edits to sync make.bat & makefile

Campbell Barton noreply at git.blender.org
Mon Jan 4 10:49:14 CET 2016


Commit: 236fabcc41eb769112a1d61ded82f6b913d0d434
Author: Campbell Barton
Date:   Mon Jan 4 20:38:27 2016 +1100
Branches: master
https://developer.blender.org/rB236fabcc41eb769112a1d61ded82f6b913d0d434

Minor edits to sync make.bat & makefile

===================================================================

M	GNUmakefile
M	make.bat

===================================================================

diff --git a/GNUmakefile b/GNUmakefile
index c73aaa7..2732fdb 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -136,7 +136,7 @@ all: FORCE
 	$(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install
 	@echo
 	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
-	@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
+	@echo Blender successfully built, run from: "$(BUILD_DIR)/bin/blender"
 	@echo
 
 debug: all
diff --git a/make.bat b/make.bat
index c62efbd..42f49f3 100644
--- a/make.bat
+++ b/make.bat
@@ -48,7 +48,7 @@ if NOT EXIST %BLENDER_DIR%..\lib\nul (
 if NOT "%1" == "" (
 
 	REM Help Message
-	if "%1" == "--help" (
+	if "%1" == "help" (
 		echo.
 		echo Convenience targets
 		echo - debug
@@ -103,7 +103,9 @@ if NOT "%1" == "" (
 			/target:clean ^
 			/property:Configuration=%BUILD_TYPE% ^
 			/verbosity:minimal
-		echo Cleaned "%BUILD_DIR%"
+		if %ERRORLEVEL% NEQ 0 (
+			echo Cleaned "%BUILD_DIR%"
+		)
 		goto EOF
 	) else (
 		echo Command "%1" unknown, aborting!
@@ -157,7 +159,8 @@ msbuild ^
 	/verbosity:minimal
 
 echo.
-echo Your build is complete at: "%BUILD_DIR%\bin\%BUILD_TYPE%"
+echo edit build configuration with: "%BUILD_DIR%\CMakeCache.txt" run make again to rebuild.
+echo Blender successfully built, run from: "%BUILD_DIR%\bin\%BUILD_TYPE%"
 echo.
 
 :EOF




More information about the Bf-blender-cvs mailing list