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

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

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildMakefile mkdist.php 
  Log:
  MFH:
  * 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.35.2.1.2.6.2.13&r2=1.35.2.1.2.6.2.14&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.13 
php-src/win32/build/Makefile:1.35.2.1.2.6.2.14
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.13  Thu Jun 11 14:39:37 2009
+++ php-src/win32/build/MakefileTue Jun 23 01:37:23 2009
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong|
 #  +--+
 #
-# $Id: Makefile,v 1.35.2.1.2.6.2.13 2009/06/11 14:39:37 cellog Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.14 2009/06/23 01:37:23 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.13.4.1.2.12&r2=1.13.4.1.2.13&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.12 
php-src/win32/build/mkdist.php:1.13.4.1.2.13
--- php-src/win32/build/mkdist.php:1.13.4.1.2.12Thu Jun 11 14:39:37 2009
+++ php-src/win32/build/mkdist.php  Tue Jun 23 01:37:23 2009
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



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

2009-06-11 Thread Greg Beaver
cellog  Thu Jun 11 14:39:37 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildMakefile mkdist.php 
  Log:
  add phar.phar creation on windows
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6.2.12&r2=1.35.2.1.2.6.2.13&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.12 
php-src/win32/build/Makefile:1.35.2.1.2.6.2.13
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.12  Wed May 27 01:46:48 2009
+++ php-src/win32/build/MakefileThu Jun 11 14:39:37 2009
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong|
 #  +--+
 #
-# $Id: Makefile,v 1.35.2.1.2.6.2.12 2009/05/27 01:46:48 kalle Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.13 2009/06/11 14:39:37 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.13.4.1.2.11&r2=1.13.4.1.2.12&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.11 
php-src/win32/build/mkdist.php:1.13.4.1.2.12
--- php-src/win32/build/mkdist.php:1.13.4.1.2.11Wed Jun  3 01:14:58 2009
+++ php-src/win32/build/mkdist.php  Thu Jun 11 14:39:37 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);
 }
@@ -489,4 +510,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(PHP_5_3) /win32/build Makefile mkdist.php

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

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildMakefile mkdist.php 
  Log:
  MFH:
  * 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.35.2.1.2.6.2.10&r2=1.35.2.1.2.6.2.11&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.10 
php-src/win32/build/Makefile:1.35.2.1.2.6.2.11
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.10  Fri Nov 21 14:18:27 2008
+++ php-src/win32/build/MakefileMon Mar 30 14:32:52 2009
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong|
 #  +--+
 #
-# $Id: Makefile,v 1.35.2.1.2.6.2.10 2008/11/21 14:18:27 pajoye Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.11 2009/03/30 14:32:52 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.13.4.1.2.8&r2=1.13.4.1.2.9&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.8 
php-src/win32/build/mkdist.php:1.13.4.1.2.9
--- php-src/win32/build/mkdist.php:1.13.4.1.2.8 Tue Mar 24 22:15:46 2009
+++ php-src/win32/build/mkdist.php  Mon Mar 30 14:32:52 2009
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



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

2008-10-25 Thread Pierre-Alain Joye
pajoye  Sun Oct 26 00:14:23 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildMakefile mkdist.php 
  Log:
  - 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.35.2.1.2.6.2.8&r2=1.35.2.1.2.6.2.9&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.8 
php-src/win32/build/Makefile:1.35.2.1.2.6.2.9
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.8   Fri Sep 26 13:29:11 2008
+++ php-src/win32/build/MakefileSun Oct 26 00:14:23 2008
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong <[EMAIL PROTECTED]>   |
 #  +--+
 #
-# $Id: Makefile,v 1.35.2.1.2.6.2.8 2008/09/26 13:29:11 pajoye Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.9 2008/10/26 00:14:23 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.13.4.1.2.5&r2=1.13.4.1.2.6&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.5 
php-src/win32/build/mkdist.php:1.13.4.1.2.6
--- php-src/win32/build/mkdist.php:1.13.4.1.2.5 Mon Sep  1 18:19:58 2008
+++ php-src/win32/build/mkdist.php  Sun Oct 26 00:14:23 2008
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php