[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: rename the env setting target and reuse it for build-snap: win32/build/Makefi
From:       Anatol Belski <ab () php ! net>
Date:       2016-10-30 14:22:45
Message-ID: php-mail-14c0c2a73fbb8fc4f48490e07bd92521381633324 () git ! php ! net
[Download RAW message or body]

Commit:    78a164bad51fc99961f35802443dc65c12bc3fb2
Author:    Anatol Belski <ab@php.net>         Sun, 30 Oct 2016 15:22:45 +0100
Parents:   36527eccbb793ef15f828ffa4261d9a862144f07
Branches:  PHP-7.0 PHP-7.1 master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=78a164bad51fc99961f35802443dc65c12bc3fb2


Log:
rename the env setting target and reuse it for build-snap

Changed paths:
  M  win32/build/Makefile
  M  win32/build/confutils.js


Diff:
diff --git a/win32/build/Makefile b/win32/build/Makefile
index 3ca135a..9f38936 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -152,15 +152,14 @@ clean-pgo: clean-all
 	-del /f /q $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING).zip
 
 !if $(PHP_TEST_INI_PATH) == ""
-test: set-test-env
+test: set-tmp-env
 	"$(BUILD_DIR)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php \
                $(TESTS) -p "$(BUILD_DIR)\php.exe"
 !else
-test: set-test-env
+test: set-tmp-env
 	"$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) -d open_basedir= -d \
output_buffering=0 -d memory_limit=-1 run-tests.php -p "$(BUILD_DIR)\php.exe" -n -c \
                $(PHP_TEST_INI_PATH) $(TESTS)
 !endif
 
-build-snap: generated_files
-	SET PATH=$(PATH);$(PHP_BUILD)\bin
+build-snap: set-tmp-env generated_files
 	@$(MAKE) "$(BUILD_DIR)\$(PHPDLL)"
 	-for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T"
 	-for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 2e46474..f7b40a7 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1755,7 +1755,7 @@ function is_on_exclude_list_for_test_ini(list, name)
 	return false;
 }
 
-function generate_test_php_ini()
+function generate_tmp_php_ini()
 {
 	if ("no" == PHP_TEST_INI) {
 		/* Test ini generation is disabled. */
@@ -1833,7 +1833,7 @@ function generate_files()
 
 	STDOUT.WriteLine("Generating files...");
 	if (!MODE_PHPIZE) {
-		generate_test_php_ini();
+		generate_tmp_php_ini();
 	}
 	generate_makefile();
 	if (!MODE_PHPIZE) {
@@ -2144,7 +2144,7 @@ function generate_makefile()
 
 	if (!MODE_PHPIZE) {
 		var val = "yes" == PHP_TEST_INI ? PHP_TEST_INI_PATH : "";
-		/* Be sure it's done after generate_test_php_ini(). */
+		/* Be sure it's done after generate_tmp_php_ini(). */
 		MF.WriteLine("PHP_TEST_INI_PATH=\"" + val + "\"");
 	}
 
@@ -2207,7 +2207,7 @@ function generate_makefile()
 			}
 		}
 	}
-	MF.WriteLine("set-test-env:");
+	MF.WriteLine("set-tmp-env:");
 	MF.WriteLine("	@set PATH=" + extra_path + ";$(PATH)");
 
 	MF.WriteBlankLines(2);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]