From: Anatol Belski <ab@php.net>
Date: Tue, 11 Nov 2014 14:22:06 +0000 (+0100)
Subject: refactor zts related config
X-Git-Tag: PRE_NATIVE_TLS_MERGE~130^2~20^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0db5cd93d8ce040a71eb883650723107c562e43;p=php

refactor zts related config
---

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 85a96f1694..8e63fc829a 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -87,33 +87,7 @@ toolset_setup_common_libs();
 // Set some debug/release specific options
 toolset_setup_build_mode();
 
-if (PHP_ZTS == "yes") {
-	ADD_FLAG("CFLAGS", "/D ZTS=1");
-	ADD_FLAG("ZTS", "1");
-} else {
-	ADD_FLAG("ZTS", "0");
-}
-
-DEFINE("PHP_ZTS_ARCHIVE_POSTFIX", PHP_ZTS == "yes" ? '' : "-nts");
-
-// set up the build dir and DLL name
-if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
-	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS");
-	DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
-	DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
-} else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {
-	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");
-	DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
-	DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
-} else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {
-	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");
-	DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
-	DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
-} else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {
-	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");
-	DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
-	DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
-}
+setup_zts_stuff();
 
 // CFLAGS, LDFLAGS and BUILD_DIR are defined
 // Add compiler and link flags if PGO options are selected
diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index 52947c1ace..a82369a855 100644
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -77,38 +77,7 @@ toolset_setup_common_libs();
 // Set some debug/release specific options
 toolset_setup_build_mode();
 
-if (PHP_ZTS == "yes") {
-	ADD_FLAG("CFLAGS", "/D ZTS=1");
-}
-
-DEFINE("PHP_ZTS_ARCHIVE_POSTFIX", PHP_ZTS == "yes" ? '' : "-nts");
-
-// set up the build dir and DLL name
-if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
-	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS");
-	if (!MODE_PHPIZE) {
-		DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
-		DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
-	}
-} else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {
-	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");
-	if (!MODE_PHPIZE) {
-		DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
-		DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
-	}
-} else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {
-	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");
-	if (!MODE_PHPIZE) {
-		DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
-		DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
-	}
-} else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {
-	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");
-	if (!MODE_PHPIZE) {
-		DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
-		DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
-	}
-}
+setup_zts_stuff();
 
 if (MODE_PHPIZE) {
 	DEFINE("PHPDLL", PHP_DLL);
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index c7e8c119c0..da2ffc6429 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2640,3 +2640,42 @@ function object_out_dir_option_handle()
 	}
 }
 
+function setup_zts_stuff()
+{
+	if (PHP_ZTS == "yes") {
+		ADD_FLAG("CFLAGS", "/D ZTS=1");
+		ADD_FLAG("ZTS", "1");
+	} else {
+		ADD_FLAG("ZTS", "0");
+	}
+
+	DEFINE("PHP_ZTS_ARCHIVE_POSTFIX", PHP_ZTS == "yes" ? '' : "-nts");
+
+	// set up the build dir and DLL name
+	if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
+		DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS");
+		if (!MODE_PHPIZE) {
+			DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
+			DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
+		}
+	} else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {
+		DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");
+		if (!MODE_PHPIZE) {
+			DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
+			DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
+		}
+	} else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {
+		DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");
+		if (!MODE_PHPIZE) {
+			DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
+			DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
+		}
+	} else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {
+		DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");
+		if (!MODE_PHPIZE) {
+			DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
+			DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
+		}
+	}
+}
+