pajoye          Fri Oct 10 23:38:14 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/win32/build        Makefile config.w32 
  Log:
  - MFH: add nts postfix to the dist filenames
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6&r2=1.35.2.1.2.7&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6 
php-src/win32/build/Makefile:1.35.2.1.2.7
--- php-src/win32/build/Makefile:1.35.2.1.2.6   Sun Mar  4 00:41:16 2007
+++ php-src/win32/build/Makefile        Fri Oct 10 23:38:14 2008
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong <[EMAIL PROTECTED]>                           |
 #  +----------------------------------------------------------------------+
 #
-# $Id: Makefile,v 1.35.2.1.2.6 2007/03/04 00:41:16 edink Exp $
+# $Id: Makefile,v 1.35.2.1.2.7 2008/10/10 23:38:14 pajoye Exp $
 # This is the makefile template for the win32 build
 
 CC="$(CL)"
@@ -112,18 +112,18 @@
 build-dist: $(BUILD_DIR)\deplister.exe
        -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
        -rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-       -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
-       -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-       -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
+       -del /f /q 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip
+       -del /f /q 
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip
+       -del /f /q 
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip
        $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" 
"$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" 
"$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
        cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-       -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip .
+       -$(ZIP) -9 -r 
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip .
        cd ..\..
        cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-       -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
+       -$(ZIP) -9 -r 
..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip .
        cd ..\..
        cd $(BUILD_DIR)
-       -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+       -$(ZIP) -9 
php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip *.pdb
        cd ..\..
 
 dist: all build-dist
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10&r2=1.40.2.8.2.11&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10 
php-src/win32/build/config.w32:1.40.2.8.2.11
--- php-src/win32/build/config.w32:1.40.2.8.2.10        Wed Apr 18 09:38:59 2007
+++ php-src/win32/build/config.w32      Fri Oct 10 23:38:14 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10 2007/04/18 09:38:59 rrichards Exp $
+// $Id: config.w32,v 1.40.2.8.2.11 2008/10/10 23:38:14 pajoye Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
@@ -45,6 +45,9 @@
        STDOUT.WriteLine("Detected 32-bit compiler");
 }
 
+AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', "Detected compiler 
architecture");
+DEFINE("PHP_ARCHITECTURE", X64 ? 'x64' : 'x86');
+
 // cygwin now ships with link.exe.  Avoid searching the cygwin path
 // for this, as we want the MS linker, not the fileutil
 PATH_PROG('link', WshShell.Environment("Process").Item("PATH"));
@@ -176,6 +179,9 @@
        ADD_FLAG("CFLAGS", "/D ZTS=1");
 }
        
+DEFINE("PHP_ZTS_ARCHIVE_POSTFIX", PHP_ZTS == "yes" ? '' : "-nts");
+
+
 // we want msvcrt in the PHP DLL
 ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:libcmt");
 



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

Reply via email to