Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32

2011-03-02 Thread Pierre Joye 
hi,

Please merge to 5.3

On Wed, Mar 2, 2011 at 6:22 AM, Moriyoshi Koizumi moriyo...@php.net wrote:
 moriyoshi                                Wed, 02 Mar 2011 05:22:22 +

 Modified: php/php-src/trunk/win32/build/config.w32
 ===
 --- php/php-src/trunk/win32/build/config.w32    2011-03-02 03:59:38 UTC (rev 
 308838)
 +++ php/php-src/trunk/win32/build/config.w32    2011-03-02 05:22:22 UTC (rev 
 308839)
 @@ -271,7 +271,7 @@
  var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;

  ADD_FLAG(CFLAGS, '/I ' + php_usual_include_suspects + ' ');
 -ADD_FLAG(LDFLAGS, '/libpath:\\' + php_usual_lib_suspects + '\\ ');
 +ADD_FLAG(LDFLAGS, '/libpath:' + php_usual_lib_suspects + ' ');

Why this change?


Cheers,
-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

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

Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32

2011-03-02 Thread Moriyoshi Koizumi 
Hi,

On Wed, Mar 2, 2011 at 5:58 PM, Pierre Joye pierre@gmail.com wrote:
 hi,

 Please merge to 5.3

Done.


 On Wed, Mar 2, 2011 at 6:22 AM, Moriyoshi Koizumi moriyo...@php.net wrote:
 moriyoshi                                Wed, 02 Mar 2011 05:22:22 +

 Modified: php/php-src/trunk/win32/build/config.w32
 ===
 --- php/php-src/trunk/win32/build/config.w32    2011-03-02 03:59:38 UTC (rev 
 308838)
 +++ php/php-src/trunk/win32/build/config.w32    2011-03-02 05:22:22 UTC (rev 
 308839)
 @@ -271,7 +271,7 @@
  var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;

  ADD_FLAG(CFLAGS, '/I ' + php_usual_include_suspects + ' ');
 -ADD_FLAG(LDFLAGS, '/libpath:\\' + php_usual_lib_suspects + '\\ ');
 +ADD_FLAG(LDFLAGS, '/libpath:' + php_usual_lib_suspects + ' ');

 Why this change?

The library path needs to be quoted just once. It appears old compiler
frontends (VC6, 7?) used to have a bug with which arguments to the
linker containing whitespaces weren't properly dealt with.

Regards,
Moriyoshi


 Cheers,
 --
 Pierre

 @pierrejoye | http://blog.thepimp.net | http://www.libgd.org

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



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

Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32

2011-03-02 Thread Pierre Joye 
hi,

On Wed, Mar 2, 2011 at 7:35 PM, Moriyoshi Koizumi m...@mozo.jp wrote:

 Please merge to 5.3

 Done.

Thanks!

 On Wed, Mar 2, 2011 at 6:22 AM, Moriyoshi Koizumi moriyo...@php.net wrote:
 moriyoshi                                Wed, 02 Mar 2011 05:22:22 +

 Modified: php/php-src/trunk/win32/build/config.w32
 ===
 --- php/php-src/trunk/win32/build/config.w32    2011-03-02 03:59:38 UTC 
 (rev 308838)
 +++ php/php-src/trunk/win32/build/config.w32    2011-03-02 05:22:22 UTC 
 (rev 308839)
 @@ -271,7 +271,7 @@
  var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;

  ADD_FLAG(CFLAGS, '/I ' + php_usual_include_suspects + ' ');
 -ADD_FLAG(LDFLAGS, '/libpath:\\' + php_usual_lib_suspects + '\\ ');
 +ADD_FLAG(LDFLAGS, '/libpath:' + php_usual_lib_suspects + ' ');

 Why this change?

 The library path needs to be quoted just once. It appears old compiler
 frontends (VC6, 7?) used to have a bug with which arguments to the
 linker containing whitespaces weren't properly dealt with.

Did you test this specific change with VC6?


Cheers
-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

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

Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32

2011-03-02 Thread Moriyoshi Koizumi 
On Thu, Mar 3, 2011 at 3:42 AM, Pierre Joye pierre@gmail.com wrote:
 hi,

 On Wed, Mar 2, 2011 at 7:35 PM, Moriyoshi Koizumi m...@mozo.jp wrote:
 The library path needs to be quoted just once. It appears old compiler
 frontends (VC6, 7?) used to have a bug with which arguments to the
 linker containing whitespaces weren't properly dealt with.

 Did you test this specific change with VC6?

Not yet, but trunk only supports VC9 or later versions.  Is it really
necessary for 5.3 to support VC6?

Regards,
Moriyoshi


 Cheers
 --
 Pierre

 @pierrejoye | http://blog.thepimp.net | http://www.libgd.org


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

Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32

2011-03-02 Thread Johannes Schlüter 
On Thu, 2011-03-03 at 06:26 +0900, Moriyoshi Koizumi wrote:
 On Thu, Mar 3, 2011 at 3:42 AM, Pierre Joye pierre@gmail.com wrote:
  hi,
 
  On Wed, Mar 2, 2011 at 7:35 PM, Moriyoshi Koizumi m...@mozo.jp wrote:
  The library path needs to be quoted just once. It appears old compiler
  frontends (VC6, 7?) used to have a bug with which arguments to the
  linker containing whitespaces weren't properly dealt with.
 
  Did you test this specific change with VC6?
 
 Not yet, but trunk only supports VC9 or later versions.  Is it really
 necessary for 5.3 to support VC6?

PHP 5.3.6 won't support VC6 anymore.

johannes

 Regards,
 Moriyoshi
 
 
  Cheers
  --
  Pierre
 
  @pierrejoye | http://blog.thepimp.net | http://www.libgd.org
 
 



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

Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32

2011-03-02 Thread Pierre Joye 
Ah right, almost forgot I decided that, joy :)

On 2 Mar 2011 22:37, Johannes Schlüter johan...@schlueters.de wrote:
 On Thu, 2011-03-03 at 06:26 +0900, Moriyoshi Koizumi wrote:
 On Thu, Mar 3, 2011 at 3:42 AM, Pierre Joye pierre@gmail.com wrote:
  hi,
 
  On Wed, Mar 2, 2011 at 7:35 PM, Moriyoshi Koizumi m...@mozo.jp wrote:
  The library path needs to be quoted just once. It appears old compiler
  frontends (VC6, 7?) used to have a bug with which arguments to the
  linker containing whitespaces weren't properly dealt with.
 
  Did you test this specific change with VC6?

 Not yet, but trunk only supports VC9 or later versions. Is it really
 necessary for 5.3 to support VC6?

 PHP 5.3.6 won't support VC6 anymore.

 johannes

 Regards,
 Moriyoshi

 
  Cheers
  --
  Pierre
 
  @pierrejoye | http://blog.thepimp.net | http://www.libgd.org
 




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

[PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile config.w32

2011-03-01 Thread Moriyoshi Koizumi 
moriyoshiWed, 02 Mar 2011 05:22:22 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=308839

Log:
- Enable windows build system to accept paths containing spaces.

Changed paths:
U   php/php-src/trunk/win32/build/Makefile
U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile  2011-03-02 03:59:38 UTC (rev 
308838)
+++ php/php-src/trunk/win32/build/Makefile  2011-03-02 05:22:22 UTC (rev 
308839)
@@ -93,7 +93,7 @@
@cd $(BUILD_DIR)
@for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D  NUL
@if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV)  NUL
-   @cd $(PHP_SRC_DIR)
+   @cd $(PHP_SRC_DIR)


 clean-sapi:
@@ -107,7 +107,7 @@
@echo Cleaning distribution build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.*  
NUL
-   @cd $(PHP_SRC_DIR)
+   @cd $(PHP_SRC_DIR)
-@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk 
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip 
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip  NUL
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)

@@ -119,7 +119,7 @@
@echo Cleaning standard build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D
-   @cd $(PHP_SRC_DIR)
+   @cd $(PHP_SRC_DIR)
-@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk 
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc 
$(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll 
$(BUILD_DIR)\php*.exe  NUL

 test:

Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322011-03-02 03:59:38 UTC (rev 
308838)
+++ php/php-src/trunk/win32/build/config.w322011-03-02 05:22:22 UTC (rev 
308839)
@@ -271,7 +271,7 @@
 var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;

 ADD_FLAG(CFLAGS, '/I ' + php_usual_include_suspects + ' ');
-ADD_FLAG(LDFLAGS, '/libpath:\\' + php_usual_lib_suspects + '\\ ');
+ADD_FLAG(LDFLAGS, '/libpath:' + php_usual_lib_suspects + ' ');

 // Poke around for some headers
 function probe_basic_headers()

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

[PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile

2011-01-02 Thread Pierre Joye 
pajoye   Mon, 03 Jan 2011 01:07:28 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=307007

Log:
- silent copy

Changed paths:
U   php/php-src/trunk/win32/build/Makefile

Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile  2011-01-02 23:38:36 UTC (rev 
307006)
+++ php/php-src/trunk/win32/build/Makefile  2011-01-03 01:07:28 UTC (rev 
307007)
@@ -182,7 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y 
nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y nul
-   copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y nul
+   @copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y nul

 install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK

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

[PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile confutils.js

2010-12-14 Thread Pierre Joye 
pajoye   Tue, 14 Dec 2010 23:21:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306373

Log:
- sync with 5.3

Changed paths:
U   php/php-src/trunk/win32/build/Makefile
U   php/php-src/trunk/win32/build/confutils.js

Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile  2010-12-14 23:21:01 UTC (rev 
306372)
+++ php/php-src/trunk/win32/build/Makefile  2010-12-14 23:21:53 UTC (rev 
306373)
@@ -90,8 +90,11 @@
 $(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV):
@echo Recreating build dirs
@if not exist $(BUILD_DIR) mkdir $(BUILD_DIR)
+   @cd $(BUILD_DIR)
@for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D  NUL
@if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV)  NUL
+   @cd $(PHP_SRC_DIR)
+

 clean-sapi:
@echo Cleaning SAPI
@@ -102,7 +105,9 @@

 clean: clean-sapi
@echo Cleaning distribution build dirs
+   @cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.*  
NUL
+   @cd $(PHP_SRC_DIR)
-...@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk 
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip 
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip  NUL
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)

@@ -112,7 +117,9 @@

 clean-all:
@echo Cleaning standard build dirs
+   @cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D
+   @cd $(PHP_SRC_DIR)
-...@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk 
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc 
$(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll 
$(BUILD_DIR)\php*.exe  NUL

 test:
@@ -149,7 +156,7 @@
cd ..\..

 dist: all build-dist
-snap: build-devel build-lib build-snap build-dist
+snap: build-snap build-devel build-dist

 $(BUILD_DIR)\deplister.exe:win32\build\deplister.c
$(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ 
/FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c 
imagehlp.lib
@@ -187,3 +194,4 @@
@echo Registering event source with syslog (requires admin rights)
@echo It's okay for this step to fail:
-$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) 
win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL)
+

Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js  2010-12-14 23:21:01 UTC (rev 
306372)
+++ php/php-src/trunk/win32/build/confutils.js  2010-12-14 23:21:53 UTC (rev 
306373)
@@ -27,6 +27,7 @@
 var SYSTEM_DRIVE = WshShell.Environment(Process).Item(SystemDrive);
 var PROGRAM_FILES = WshShell.Environment(Process).Item(ProgramFiles);
 var DSP_FLAGS = new Array();
+var PHP_SRC_DIR=FSO.GetParentFolderName(WScript.ScriptFullName);

 /* Store the enabled extensions (summary + QA check) */
 var extensions_enabled = new Array();
@@ -1553,7 +1554,14 @@
continue;
}
last = bd;
-   ADD_FLAG(BUILD_DIRS_SUB, bd.replace(new 
RegExp('^'+dir+''), '$(BUILD_DIR)\\'));
+
+   build_dir = get_define('BUILD_DIR');
+   build_dir = build_dir.replace(new RegExp(, g), );
+   if (build_dir.substr(build_dir.Length - 2, 2) != '') {
+   build_dir += '';
+   }
+   ADD_FLAG(BUILD_DIRS_SUB, bd.replace(new RegExp(build_dir), 
''));
+
if (!FSO.FolderExists(bd)) {
FSO.CreateFolder(bd);
}
@@ -1699,7 +1707,7 @@
/* spit out variable definitions */
var keys = (new VBArray(configure_subst.Keys())).toArray();
var i;
-
+   MF.WriteLine(PHP_SRC_DIR = + PHP_SRC_DIR);
for (i in keys) {
// The trailing space is needed to prevent the trailing 
backslash
// that is part of the build dir flags (CFLAGS_BD_XXX) from 
being

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

[PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile buildconf.js config.w32 configure.tail confutils.js

2010-12-13 Thread Pierre Joye 
pajoye   Mon, 13 Dec 2010 20:55:13 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306347

Log:
- phpize support merge from 5.3

Changed paths:
U   php/php-src/trunk/win32/build/Makefile
U   php/php-src/trunk/win32/build/buildconf.js
U   php/php-src/trunk/win32/build/config.w32
U   php/php-src/trunk/win32/build/configure.tail
U   php/php-src/trunk/win32/build/confutils.js

Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile	2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/Makefile	2010-12-13 20:55:13 UTC (rev 306347)
@@ -152,12 +152,24 @@
 	$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php $(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS)

 # need to redirect, since INSTALL is a file in the root...
-install: really-install install-headers install-lib
+install: really-install install-devel install-lib

 install-lib:
 	@if not exist $(PHP_PREFIX)\lib mkdir $(PHP_PREFIX)\lib nul
 	@copy $(BUILD_DIR)\$(PHPLIB) $(PHP_PREFIX)\lib /y nul

+install-devel: install-headers
+	@if not exist $(PHP_PREFIX)\script mkdir $(PHP_PREFIX)\script nul
+	@if not exist $(PHP_PREFIX)\build mkdir $(PHP_PREFIX)\build nul
+	@copy win32\build\confutils.js $(PHP_PREFIX)\script\ /y nul
+	@copy win32\build\configure.tail $(PHP_PREFIX)\script\ /y nul
+	@copy win32\build\config.w32.phpize.in $(PHP_PREFIX)\script\ /y nul
+	@copy win32\build\Makefile.phpize $(PHP_PREFIX)\script\ /y nul
+	@copy win32\build\phpize.bat $(PHP_PREFIX)\ /y nul
+	@copy win32\build\template.rc $(PHP_PREFIX)\build\ /y nul
+	@copy $(BUILD_DIR)\devel\config.phpize.js $(PHP_PREFIX)\script\ /y nul
+	@copy $(BUILD_DIR)\devel\phpize.js $(PHP_PREFIX)\script\ /y nul
+
 really-install:
 	@if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX)
 	@echo Installing files under $(PHP_PREFIX)
@@ -166,5 +178,3 @@
 	@echo Registering event source with syslog (requires admin rights)
 	@echo It's okay for this step to fail:
 	-$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL)
-
-

Modified: php/php-src/trunk/win32/build/buildconf.js
===
--- php/php-src/trunk/win32/build/buildconf.js	2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/buildconf.js	2010-12-13 20:55:13 UTC (rev 306347)
@@ -209,6 +209,7 @@

 // Write the head of the configure script
 C.WriteLine(/* This file automatically generated from win32/build/confutils.js */);
+C.WriteLine(MODE_PHPIZE=false;);
 C.Write(file_get_contents(win32/build/confutils.js));

 // If project files were requested, pull in the code to generate them

Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w32	2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/config.w32	2010-12-13 20:55:13 UTC (rev 306347)
@@ -204,6 +204,9 @@

 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);
@@ -356,7 +359,7 @@
 ADD_SOURCES(win32, glob.c readdir.c \
 	registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c);

-PHP_INSTALL_HEADERS(, Zend/ TSRM/ main/ main/streams/);
+PHP_INSTALL_HEADERS(, Zend/ TSRM/ main/ main/streams/ win32/);

 STDOUT.WriteBlankLines(1);


Modified: php/php-src/trunk/win32/build/configure.tail
===
--- php/php-src/trunk/win32/build/configure.tail	2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/configure.tail	2010-12-13 20:55:13 UTC (rev 306347)
@@ -2,7 +2,7 @@
 // $Id$
 // tail end of configure

-if (sapi_enabled.length  1) {
+if (!MODE_PHPIZE  sapi_enabled.length  1) {
 	MESSAGE();
 	ERROR(No SAPI selected, please enable at least one SAPI.);
 }

Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js	2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/confutils.js	2010-12-13 20:55:13 UTC (rev 306347)
@@ -58,11 +58,18 @@
 	PROGRAM_FILES = C:\\Program Files;
 }

-if (!FSO.FileExists(README.SVN-RULES)) {
-	STDERR.WriteLine(Must be run from the root of the php source);
-	WScript.Quit(10);
+if (MODE_PHPIZE) {
+	if (!FSO.FileExists(config.w32)) {
+		STDERR.WriteLine(Must be run from the root of the extension source);
+		WScript.Quit(10);
+	}
+} else {
+	if (!FSO.FileExists(README.SVN-RULES)) {
+		STDERR.WriteLine(Must be run from the root of the php source);
+		WScript.Quit(10);
+	}
 }
-
+
 var CWD = WshShell.CurrentDirectory;

 if (typeof(CWD) == undefined) {
@@ -109,7 +116,9 @@
 extension_include_code = ;
 extension_module_ptrs =

[PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile

2010-12-11 Thread Pierre Joye 
pajoye   Sat, 11 Dec 2010 16:36:27 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306227

Log:
- add install-lib(s), remove header for now, will be genarated

Changed paths:
U   php/php-src/trunk/win32/build/Makefile

Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile  2010-12-11 15:59:11 UTC (rev 
306226)
+++ php/php-src/trunk/win32/build/Makefile  2010-12-11 16:36:27 UTC (rev 
306227)
@@ -152,13 +152,11 @@
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php 
$(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS)

 # need to redirect, since INSTALL is a file in the root...
-install: really-install install-headers
+install: really-install install-headers install-lib

-install-headers:
-   @if not exist $(PHP_PREFIX)\include mkdir $(PHP_PREFIX)\include nul
-   @for %D in ($(INSTALL_HEADERS_DIR)) do @if not exist 
$(PHP_PREFIX)\include\%D mkdir $(PHP_PREFIX)\include\%D nul
-   @for %D in ($(INSTALL_HEADERS_DIR)) do @copy %D*.h 
$(PHP_PREFIX)\include\%D /y nul
-   @for %D in ($(INSTALL_HEADERS)) do @copy %D $(PHP_PREFIX)\include /y 
nul
+install-lib:
+   @if not exist $(PHP_PREFIX)\lib mkdir $(PHP_PREFIX)\lib nul
+   @copy $(BUILD_DIR)\$(PHPLIB) $(PHP_PREFIX)\lib /y nul

 really-install:
@if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX)

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

[PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile

2010-12-10 Thread Pierre Joye 
pajoye   Fri, 10 Dec 2010 17:11:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306190

Log:
- install headers, missed that one

Changed paths:
U   php/php-src/trunk/win32/build/Makefile

Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile  2010-12-10 16:10:08 UTC (rev 
306189)
+++ php/php-src/trunk/win32/build/Makefile  2010-12-10 17:11:58 UTC (rev 
306190)
@@ -152,8 +152,14 @@
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php 
$(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS)

 # need to redirect, since INSTALL is a file in the root...
-install: really-install
+install: really-install install-headers

+install-headers:
+   @if not exist $(PHP_PREFIX)\include mkdir $(PHP_PREFIX)\include nul
+   @for %D in ($(INSTALL_HEADERS_DIR)) do @if not exist 
$(PHP_PREFIX)\include\%D mkdir $(PHP_PREFIX)\include\%D nul
+   @for %D in ($(INSTALL_HEADERS_DIR)) do @copy %D*.h 
$(PHP_PREFIX)\include\%D /y nul
+   @for %D in ($(INSTALL_HEADERS)) do @copy %D $(PHP_PREFIX)\include /y 
nul
+
 really-install:
@if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX)
@echo Installing files under $(PHP_PREFIX)

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

[PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile

2009-12-08 Thread Pierre Joye 
pajoye   Tue, 08 Dec 2009 20:21:17 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=291896

Log:
- add missing argument

Changed paths:
U   php/php-src/trunk/win32/build/Makefile

Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile  2009-12-08 19:51:56 UTC (rev 
291895)
+++ php/php-src/trunk/win32/build/Makefile  2009-12-08 20:21:17 UTC (rev 
291896)
@@ -128,7 +128,7 @@
-del /f /q 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q 
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q 
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-   $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0 
win32/build/mkdist.php $(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) 
$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES) $(PECL_TARGETS) 
$(PECL_EXTRA_DIST_FILES) $(SNAPSHOT_TEMPLATE)
+   $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0 
win32/build/mkdist.php $(BUILD_DIR) $(PHP_BUILD) $(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 -q -r 
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
cd ..\..

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