[PHP-CVS] cvs: php-src /win32/build Makefile config.w32 confutils.js
pajoye Thu Sep 25 14:59:10 2008 UTC
Modified files:
/php-src/win32/buildMakefile config.w32 confutils.js
Log:
- add VC version and architecture to the created zip(s) names
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.48&r2=1.49&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.48 php-src/win32/build/Makefile:1.49
--- php-src/win32/build/Makefile:1.48 Mon Jul 21 09:56:37 2008
+++ php-src/win32/build/MakefileThu Sep 25 14:59:10 2008
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +--+
#
-# $Id: Makefile,v 1.48 2008/07/21 09:56:37 sfox Exp $
+# $Id: Makefile,v 1.49 2008/09/25 14:59:10 pajoye Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -126,18 +126,18 @@
build-dist: $(BUILD_DIR)\deplister.exe
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rd /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)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
+ -del /f /q
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
+ -del /f /q
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).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)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).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)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
.
cd ..\..
cd $(BUILD_DIR)
- -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+ -$(ZIP) -9
php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
*.pdb
cd ..\..
dist: all build-dist
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.85&r2=1.86&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.85 php-src/win32/build/config.w32:1.86
--- php-src/win32/build/config.w32:1.85 Sat Aug 23 19:50:36 2008
+++ php-src/win32/build/config.w32 Thu Sep 25 14:59:10 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.85 2008/08/23 19:50:36 pajoye Exp $
+// $Id: config.w32,v 1.86 2008/09/25 14:59:10 pajoye Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -19,6 +19,7 @@
VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]);
AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], "Detected compiler version");
+DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]);
// do we use x64 or 80x86 version of compiler?
X64 = probe_binary(CL, 64);
@@ -28,6 +29,7 @@
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
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.79&r2=1.80&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.79
php-src/win32/build/confutils.js:1.80
--- php-src/win32/build/confutils.js:1.79 Fri Jul 25 12:40:13 2008
+++ php-src/win32/build/confutils.jsThu Sep 25 14:59:10 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.79 2008/07/25 12:40:13 pajoye Exp $
+// $Id: confutils.js,v 1.80 2008/09/25 14:59:10 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -42,6 +42,13 @@
VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
+var VC_VERSIONS_SHORT = new Array();
+VC_VERSIONS_SHORT[1200] = 'VC6';
+VC_VERSIONS_SHORT[1300] = 'VC7';
+VC_VERSIONS_SHORT[1310] = 'VC7.1';
+VC_VERSIONS_SHORT[1400] = 'VC8';
+VC_VERSIONS_SHORT[1500] = 'VC9';
+
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build Makefile config.w32 confutils.js mkdist.php
edink Tue Dec 19 10:26:44 2006 UTC
Modified files:
/php-src/win32/buildMakefile config.w32 confutils.js mkdist.php
Log:
MFB: Enable full build with newer Microsoft compilers
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.39&r2=1.40&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.39 php-src/win32/build/Makefile:1.40
--- php-src/win32/build/Makefile:1.39 Fri Nov 10 10:30:56 2006
+++ php-src/win32/build/MakefileTue Dec 19 10:26:44 2006
@@ -14,12 +14,13 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +--+
#
-# $Id: Makefile,v 1.39 2006/11/10 10:30:56 dmitry Exp $
+# $Id: Makefile,v 1.40 2006/12/19 10:26:44 edink Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
LD="$(LINK)"
MC="$(MC)"
+MT="$(MT)"
MCFILE=$(BUILD_DIR)\wsyslog.rc
@@ -54,6 +55,9 @@
# $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc
+_VC_MANIFEST_EMBED_EXE= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;2
+
$(PHPDLL_RES): win32\build\template.rc
$(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION="\"PHP Script
Interpreter\"" \
/d FILE_NAME="\"$(PHPDLL)\"" /d PRODUCT_NAME="\"PHP Script
Interpreter\"" \
@@ -62,6 +66,7 @@
$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS)
$(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
@$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
$(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS)
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.60&r2=1.61&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.60 php-src/win32/build/config.w32:1.61
--- php-src/win32/build/config.w32:1.60 Tue Dec 5 08:08:33 2006
+++ php-src/win32/build/config.w32 Tue Dec 19 10:26:44 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.60 2006/12/05 08:08:33 dmitry Exp $
+// $Id: config.w32,v 1.61 2006/12/19 10:26:44 edink Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -48,6 +48,9 @@
// avoid picking up midnight commander from cygwin
PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"));
+// Try locating manifest tool
+PATH_PROG('mt', WshShell.Environment("Process").Item("PATH"));
+
// stick objects somewhere outside of the source tree
ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during
build', '');
if (PHP_OBJECT_OUT_DIR.length) {
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.64&r2=1.65&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.64
php-src/win32/build/confutils.js:1.65
--- php-src/win32/build/confutils.js:1.64 Fri Nov 10 10:38:23 2006
+++ php-src/win32/build/confutils.jsTue Dec 19 10:26:44 2006
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.64 2006/11/10 10:38:23 dmitry Exp $
+// $Id: confutils.js,v 1.65 2006/12/19 10:26:44 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -877,6 +877,7 @@
var ldflags;
var resname;
var ld;
+ var manifest;
if (typeof(obj_dir) == "undefined") {
sapiname_for_printing = configure_module_dirname;
@@ -908,11 +909,13 @@
if (makefiletarget.match(new RegExp("\\.dll$"))) {
ldflags = "/dll $(LDFLAGS)";
+ manifest = "[EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)";
} else if (makefiletarget.match(new RegExp("\\.lib$"))) {
ldflags = "$(LDFLAGS)";
ld = "$(MAKE_LIB)";
} else {
ldflags = "$(LDFLAGS)";
+ manifest = "[EMAIL PROTECTED](_VC_MANIFEST_EMBED_EXE)";
}
if (ld) {
@@ -922,6 +925,10 @@
MFO.WriteLine("\t" + ld + " /nologo " + " $(" + SAPI +
"_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" +
resname + " /link /out:$(BUILD_DIR)\\" + makefiletarget + " " + ldflags + "
$(LDFLAGS_" + SAPI + ")");
}
+ if (manifest) {
+ MFO.WriteLine("\t" + manifest);
+ }
+
DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')');
if (configure_module_dirname.match("pecl")) {
@@ -998,7 +1005,7 @@
var objs = null;
var EXT = extname.toUpperCase();
var extname_for_printing;
-
+
if (shared == null) {
eval("shared = PHP_" + EXT + "_SHARED;");
}
@@ -1040,6 +1047,7 @@
MFO.WriteLine("$(B
[PHP-CVS] cvs: php-src /win32/build Makefile config.w32 confutils.js
wez Mon Dec 22 08:13:39 2003 EDT Modified files: /php-src/win32/buildMakefile config.w32 confutils.js Log: Add --enable-snapshot-build configure option for win32 build. Using it will attempt to switch on any configure options that were left to their default value of "no". Add a "snap" target to the makefile which will run a sub-process to make each SAPI and EXT independently, so that the whole process does not bail out if a particular extension is broken. Add a way to specify dependencies between extensions in the config.w32 files so that the makefile will include appropriate rules and linkage. Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.9 php-src/win32/build/Makefile:1.10 --- php-src/win32/build/Makefile:1.9Fri Dec 19 07:50:11 2003 +++ php-src/win32/build/MakefileMon Dec 22 08:13:39 2003 @@ -14,7 +14,7 @@ # | Author: Wez Furlong <[EMAIL PROTECTED]> | # +--+ # -# $Id: Makefile,v 1.9 2003/12/19 12:50:11 wez Exp $ +# $Id: Makefile,v 1.10 2003/12/22 13:13:39 wez Exp $ # This is the makefile template for the win32 build CC="$(CL)" @@ -80,7 +80,12 @@ $(BUILD_DIR)\php.exe -d open_basedir= -d safe_mode=0 -d output_buffering=0 run-tests.php $(TESTS)
[PHP-CVS] cvs: php-src /win32/build Makefile config.w32 confutils.js
wez Wed Dec 3 13:31:05 2003 EDT Modified files: /php-src/win32/buildMakefile config.w32 confutils.js Log: VC stores lib path in LIB not LIBS. Add --with-extra-includes and --with-extra-libs to be able to specify general additions to those paths from the environment. Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.4 php-src/win32/build/Makefile:1.5 --- php-src/win32/build/Makefile:1.4Wed Dec 3 11:51:23 2003 +++ php-src/win32/build/MakefileWed Dec 3 13:31:04 2003 @@ -14,7 +14,7 @@ # | Author: Wez Furlong <[EMAIL PROTECTED]> | # +--+ # -# $Id: Makefile,v 1.4 2003/12/03 16:51:23 wez Exp $ +# $Id: Makefile,v 1.5 2003/12/03 18:31:04 wez Exp $ # This is the makefile template for the win32 build CC="$(CL)" @@ -60,7 +60,7 @@ del /F /Q $(BUILD_DIR)\*.* test: - %COMSPEC% /c
