Re: Win32 Makefile template patch.
| From: | Richard Quadling | Date: | Thu, 08 May 2008 09:04:37 +0000 |
| Subject: | Re: Win32 Makefile template patch. | ||
| References: | 1 2 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-37537@lists.php.net to get a copy of this message | ||
2008/5/7 Hannes Magnusson <hannes.magnusson@gmail.com>:
> On Wed, May 7, 2008 at 6:42 PM, Richard Quadling
> <rquadling@googlemail.com> wrote:
> > Hi.
> [..]
>
> > The attached patch forces the use of 'rd' rather than 'rmdir'.
>
> Only plain/text attachments get through the list..
>
> -Hannes
>
Basically search&replace rmdir with rd in the win32/build/Makefile
Index: Makefile
===================================================================
RCS file: /repository/php-src/win32/build/Makefile,v
retrieving revision 1.35.2.1.2.6.2.4
diff -u -u -r1.35.2.1.2.6.2.4 Makefile
--- Makefile 3 May 2008 21:12:55 -0000 1.35.2.1.2.6.2.4
+++ Makefile 7 May 2008 16:16:31 -0000
@@ -100,15 +100,15 @@
@echo Cleaning distribution build dirs
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* > NUL
-@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
- -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
+ -rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
clean-pecl:
@echo Cleaning PECL targets only
- -rmdir /s /q $(BUILD_DIR)\pecl
+ -rd /s /q $(BUILD_DIR)\pecl
clean-all:
@echo Cleaning standard build dirs
- @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rmdir /s /q %D
+ @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D
-@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:
@@ -124,8 +124,8 @@
-for %T in ($(PECL_TARGETS)) do $(MAKE) /I /nologo "%T"
build-dist: $(BUILD_DIR)\deplister.exe
- -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
- -rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
+ -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
--
-----
Richard Quadling
Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731
"Standing on the shoulders of some very clever giants!"