From: Pierre Joye <pajoye@php.net>
Date: Sun, 26 Oct 2008 00:15:56 +0000 (+0000)
Subject: - MFH: add php-test-pack-[version].zip to nmake snap so we can distribute the tests... 
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4b0279b5351d01d03cffeaacf77924224de7243;p=php

- 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
---

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 739b347ea0..e8d8fa98c2 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -131,13 +131,16 @@ build-dist: $(BUILD_DIR)\deplister.exe
 	-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
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index 17770c9372..e66be3c396 100644
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -13,6 +13,7 @@ $is_debug = preg_match("/^debug/i", $build_dir);
 echo "Making dist for $build_dir\n";
 
 $dist_dir = $build_dir . "/php-" . phpversion();
+$test_dir = $build_dir . "/php-test-pack-" . phpversion();
 $pecl_dir = $build_dir . "/pecl-" . phpversion();
 
 @mkdir($dist_dir);
@@ -346,6 +347,58 @@ function copy_dir($source, $dest)
 	closedir($d);
 }
 
+
+
+function copy_test_dir($directory, $dest)
+{
+	if(substr($directory,-1) == '/') {
+		$directory = substr($directory,0,-1);
+	}
+
+	if ($directory == 'tests') {
+		mkdir($dest . '/tests', 0775, true);
+		copy_dir($directory, $dest . '/tests/');
+
+		return false;
+	}
+
+	if(!file_exists($directory) || !is_dir($directory)) {
+		echo "failed... $directory\n";
+		return FALSE;
+	}
+
+	$directory_list = opendir($directory);
+
+	while (FALSE !== ($file = readdir($directory_list))) {
+		$full_path = $directory . '/' . $file;
+		if($file != '.' && $file != '..' && $file != 'CVS' && is_dir($full_path)) {
+			if ($file == 'tests') {
+				mkdir($dest . '/' . $full_path , 0775, true);
+				copy_dir($full_path, $dest . '/' . $full_path . '/');
+				continue;
+			} else {
+				copy_test_dir($full_path, $dest);
+			}
+		}
+	}
+
+	closedir($directory_list); 
+}
+
+if (!is_dir($test_dir)) {
+	mkdir($test_dir);
+}
+
+$dirs = array(
+	'ext',
+	'Sapi',
+	'Zend',
+	'tests'
+);
+foreach ($dirs as $dir) {
+	copy_test_dir($dir, $test_dir);
+}
+
 /* change this next line to true to use good-old
  * hand-assembled go-pear-bundle from the snapshot template */
 $use_pear_template = true;