[PHP-CVS] cvs: php-src /win32/build Makefile mkdist.php

2009-06-22 Thread Kalle Sommer Nielsen 
kalle   Tue Jun 23 01:37:05 2009 UTC

  Modified files:  
/php-src/win32/buildMakefile mkdist.php 
  Log:
  * Fix deprecation warning when building deplister
  * Fix some mkdir warnings if "nmake build-dist" is executed twice
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.55&r2=1.56&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.55 php-src/win32/build/Makefile:1.56
--- php-src/win32/build/Makefile:1.55   Thu Jun 11 14:43:03 2009
+++ php-src/win32/build/MakefileTue Jun 23 01:37:05 2009
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong|
 #  +--+
 #
-# $Id: Makefile,v 1.55 2009/06/11 14:43:03 cellog Exp $
+# $Id: Makefile,v 1.56 2009/06/23 01:37:05 kalle Exp $
 # This is the makefile template for the win32 build
 
 CC="$(CL)"
@@ -146,7 +146,7 @@
 snap: build-snap build-dist
 
 $(BUILD_DIR)\deplister.exe:win32\build\deplister.c
-   $(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ 
/FR$(BUILD_DIR) -o$(BUILD_DIR)\deplister.exe win32\build\deplister.c 
imagehlp.lib
+   $(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ 
/FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c 
imagehlp.lib
 
 msi-installer: dist
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php 
"$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)"
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.25&r2=1.26&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.25 php-src/win32/build/mkdist.php:1.26
--- php-src/win32/build/mkdist.php:1.25 Thu Jun 11 14:43:03 2009
+++ php-src/win32/build/mkdist.php  Tue Jun 23 01:37:05 2009
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /win32/build Makefile mkdist.php

2009-06-11 Thread Greg Beaver 
cellog  Thu Jun 11 14:43:03 2009 UTC

  Modified files:  
/php-src/win32/buildMakefile mkdist.php 
  Log:
  MFB: add phar.phar generation to windows
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.54&r2=1.55&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.54 php-src/win32/build/Makefile:1.55
--- php-src/win32/build/Makefile:1.54   Wed May 27 01:46:27 2009
+++ php-src/win32/build/MakefileThu Jun 11 14:43:03 2009
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong|
 #  +--+
 #
-# $Id: Makefile,v 1.54 2009/05/27 01:46:27 kalle Exp $
+# $Id: Makefile,v 1.55 2009/06/11 14:43:03 cellog Exp $
 # This is the makefile template for the win32 build
 
 CC="$(CL)"
@@ -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 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)" "$(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 ..\..
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.24&r2=1.25&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.24 php-src/win32/build/mkdist.php:1.25
--- php-src/win32/build/mkdist.php:1.24 Wed Jun  3 01:13:37 2009
+++ php-src/win32/build/mkdist.php  Thu Jun 11 14:43:03 2009
@@ -1,4 +1,4 @@
-isDir() || $file == 'phar.php') continue;
+echo 'adding ', $file, "\n";
+$phar[(string) $file] = file_get_contents($path_to_phar.  '/phar/' . 
$file);
+  }
+  $phar->setSignatureAlgorithm(Phar::SHA1);
+  $stub = file($path_to_phar . '/phar/phar.php');
+  unset($stub[0]); // remove hashbang
+  $phar->setStub(implode('', $stub));
+
+  echo "Creating phar.phar.bat\n";
+  file_put_contents($path_to_php . '/phar.phar.bat', "%~dp0php.exe 
%~dp0pharcommand.phar %1 %2 %3 %4 %5 %6 %7 %8 %9\r\n");
+}
+
 if (!is_dir($test_dir)) {
mkdir($test_dir);
 }
@@ -491,4 +512,5 @@
echo "WARNING: you don't have a snapshot template, your dist will not 
be complete\n";
 }
 
+make_phar_dot_phar($dist_dir);
 ?>



-- 
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 mkdist.php

2009-03-30 Thread Kalle Sommer Nielsen 
kalle   Mon Mar 30 14:32:20 2009 UTC

  Modified files:  
/php-src/win32/buildMakefile mkdist.php 
  Log:
  * Bypass the date/timezone warning by forcing UTC when running mkdist.php
  * Don't run the copy list for PECL if theres no PECL extensions to copy 
(fixes a few copy() warnings)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.52&r2=1.53&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.52 php-src/win32/build/Makefile:1.53
--- php-src/win32/build/Makefile:1.52   Fri Nov 21 14:05:04 2008
+++ php-src/win32/build/MakefileMon Mar 30 14:32:20 2009
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong|
 #  +--+
 #
-# $Id: Makefile,v 1.52 2008/11/21 14:05:04 pajoye Exp $
+# $Id: Makefile,v 1.53 2009/03/30 14:32:20 kalle Exp $
 # This is the makefile template for the win32 build
 
 CC="$(CL)"
@@ -131,7 +131,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 -n 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 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 -q -r 
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
cd ..\..
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.21&r2=1.22&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.21 php-src/win32/build/mkdist.php:1.22
--- php-src/win32/build/mkdist.php:1.21 Tue Mar 24 22:16:57 2009
+++ php-src/win32/build/mkdist.php  Mon Mar 30 14:32:20 2009
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /win32/build Makefile mkdist.php

2008-10-25 Thread Pierre-Alain Joye 
pajoye  Sun Oct 26 00:15:57 2008 UTC

  Modified files:  
/php-src/win32/buildMakefile mkdist.php 
  Log:
  - MFH: add php-test-pack-[version].zip to nmake snap so we can distribute the 
tests as single zip
TODO: add run-tests.bat to the package
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.50&r2=1.51&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.50 php-src/win32/build/Makefile:1.51
--- php-src/win32/build/Makefile:1.50   Fri Sep 26 13:31:01 2008
+++ php-src/win32/build/MakefileSun Oct 26 00:15:56 2008
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong <[EMAIL PROTECTED]>   |
 #  +--+
 #
-# $Id: Makefile,v 1.50 2008/09/26 13:31:01 pajoye Exp $
+# $Id: Makefile,v 1.51 2008/10/26 00:15:56 pajoye Exp $
 # This is the makefile template for the win32 build
 
 CC="$(CL)"
@@ -131,13 +131,16 @@
-del /f /q 
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-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)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
+   -$(ZIP) -9 -q -r 
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
cd ..\..
cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-   -$(ZIP) -9 -r 
..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
+   -$(ZIP) -9 -q -r 
..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
+   cd ..\..
+   cd $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING)
+   -$(ZIP) -9 -q -r ..\php-test-pack-$(PHP_VERSION_STRING).zip .
cd ..\..
cd $(BUILD_DIR)
-   -$(ZIP) -9 
php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 *.pdb
+   -$(ZIP) -9 -q 
php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 *.pdb
cd ..\..
 
 dist: all build-dist
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.18&r2=1.19&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.18 php-src/win32/build/mkdist.php:1.19
--- php-src/win32/build/mkdist.php:1.18 Mon Sep  1 18:21:06 2008
+++ php-src/win32/build/mkdist.php  Sun Oct 26 00:15:56 2008
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /win32/build Makefile mkdist.php

2004-02-12 Thread Wez Furlong 
wez Thu Feb 12 12:58:54 2004 EDT

  Modified files:  
/php-src/win32/buildMakefile mkdist.php 
  Log:
  name the pecl bundle pecl-foo instead of php-foo-pecl.
  
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.20&r2=1.21&ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.20 php-src/win32/build/Makefile:1.21
--- php-src/win32/build/Makefile:1.20   Thu Feb 12 08:01:14 2004
+++ php-src/win32/build/MakefileThu Feb 12 12:58:52 2004
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong <[EMAIL PROTECTED]>   |
 #  +--+
 #
-# $Id: Makefile,v 1.20 2004/02/12 13:01:14 wez Exp $
+# $Id: Makefile,v 1.21 2004/02/12 17:58:52 wez Exp $
 # This is the makefile template for the win32 build
 
 CC="$(CL)"
@@ -90,14 +90,14 @@
 
 build-dist: $(BUILD_DIR)\deplister.exe
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-   -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-pecl
+   -rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip
$(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" 
"$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)" "$(SNAPSHOT_TEMPLATE)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING).zip .
cd ..\..
-   cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-pecl
-   -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-pecl.zip .
+   cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
+   -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING).zip .
cd ..\..
 
 dist: all build-dist
http://cvs.php.net/diff.php/php-src/win32/build/mkdist.php?r1=1.7&r2=1.8&ty=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.7 php-src/win32/build/mkdist.php:1.8
--- php-src/win32/build/mkdist.php:1.7  Fri Jan  9 08:17:58 2004
+++ php-src/win32/build/mkdist.php  Thu Feb 12 12:58:52 2004
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /win32/build Makefile mkdist.php

2004-01-07 Thread Wez Furlong 
wez Wed Jan  7 18:12:04 2004 EDT

  Modified files:  
/php-src/win32/buildMakefile mkdist.php 
  Log:
  tweak snap build
  
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.12 php-src/win32/build/Makefile:1.13
--- php-src/win32/build/Makefile:1.12   Tue Dec 23 10:33:13 2003
+++ php-src/win32/build/MakefileWed Jan  7 18:11:54 2004
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong <[EMAIL PROTECTED]>   |
 #  +--+
 #
-# $Id: Makefile,v 1.12 2003/12/23 15:33:13 wez Exp $
+# $Id: Makefile,v 1.13 2004/01/07 23:11:54 wez Exp $
 # This is the makefile template for the win32 build
 
 CC="$(CL)"
@@ -82,8 +82,8 @@
 
 build-snap:
@$(MAKE) "$(BUILD_DIR)\$(PHPDLL)"
-   for %T in ($(SAPI_TARGETS)) do $(MAKE) /nologo "%T"
-   for %T in ($(EXT_TARGETS)) do $(MAKE) /nologo "%T"
+   for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T"
+   for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
 
 build-dist: $(BUILD_DIR)\deplister.exe
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.5 php-src/win32/build/mkdist.php:1.6
--- php-src/win32/build/mkdist.php:1.5  Tue Dec 23 10:33:13 2003
+++ php-src/win32/build/mkdist.php  Wed Jan  7 18:11:54 2004
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php