Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

*** empty log message ***

  • Loading branch information...
commit 941163993a61153e247aae3b8b98eca054a9edc5 1 parent 23e15d4
@auroraeosrose authored
View
2  cvsclean.bat
@@ -0,0 +1,2 @@
+@echo off
+cscript /nologo win32\cvsclean.js
View
2  ext/gtk+/config.w32
@@ -1,5 +1,5 @@
-if (CHECK_HEADER("main/php.h") && CHECK_LIB(PHP_GTK_DEBUG != "no" ? "php5ts_debug.lib" : "php5ts.lib", "php-gtk") &&
+if (CHECK_HEADER("main/php.h") && CHECK_LIB(PHP_LIB) &&
CHECK_HEADER("iconv.h") && CHECK_LIB("iconv.lib", "php-gtk") &&
CHECK_HEADER("libintl.h") && CHECK_LIB("intl.lib", "php-gtk") &&
CHECK_HEADER("atk/atk.h") && CHECK_LIB("atk-1.0.lib", "php-gtk") &&
View
25 win32/config.w32.in
@@ -52,6 +52,7 @@ STDOUT.WriteBlankLines(1);
ARG_WITH('php-build', 'Path to where you extracted http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this source dir (..\\php_build) if not specified', 'no');
ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
ARG_ENABLE('gd', 'Php has static gd', 'no');
+ARG_ENABLE('zts', 'Enable thread safety', 'yes');
// stick objects somewhere outside of the source tree
ARG_ENABLE('object-out-dir', 'Alternative location for binary objects during build', '');
@@ -68,11 +69,23 @@ if (PHP_GTK_DEBUG == "yes" && PHP_GTK_DEBUG_PACK == "yes") {
ERROR("Use of both --enable-debug and --enable-debug-pack not allowed.");
}
-// Set some debug-specific options
-if (PHP_GTK_DEBUG == "yes") {
+// Compile directory
+if (PHP_GTK_DEBUG == "yes" && PHP_GTK_ZTS == "yes") {
+ DEFINE("BUILD_DIR", PHP_GTK_OBJECT_OUT_DIR + "Debug_TS");
+ DEFINE("PHP_LIB", "php5ts_debug.lib");
+ PHP_LIB = "php5ts_debug.lib";
+} else if (PHP_GTK_DEBUG == "yes") {
DEFINE("BUILD_DIR", PHP_GTK_OBJECT_OUT_DIR + "Debug");
+ DEFINE("PHP_LIB", "php5_debug.lib");
+ PHP_LIB = "php5_debug.lib";
+} else if (PHP_GTK_ZTS == "yes") {
+ DEFINE("BUILD_DIR", PHP_GTK_OBJECT_OUT_DIR + "Release_TS");
+ DEFINE("PHP_LIB", "php5ts.lib");
+ PHP_LIB = "php5ts.lib";
} else {
DEFINE("BUILD_DIR", PHP_GTK_OBJECT_OUT_DIR + "Release");
+ DEFINE("PHP_LIB", "php5.lib");
+ PHP_LIB = "php5.lib";
}
ARG_IS('all', 'Configure all available extensions', 'no');
@@ -92,11 +105,11 @@ DEFINE("PHP_GTK_LDFLAGS", "$(DLL_LDFLAGS)");
DEFINE("LIBS", "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib");
if (PHP_GTK_DEBUG == "yes") {
- DEFINE("CFLAGS", "/nologo /LDd /MDd /Gm /ZI /GZ /I . /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I ..\\ext /I ..\\php5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D ZTS=1 /D ZEND_DEBUG=1 /D PHP_WIN32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL");
+ DEFINE("CFLAGS", "/nologo /LDd /MDd /Gm /ZI /GZ /I . /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I ..\\ext /I ..\\php5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D ZEND_DEBUG=1 /D PHP_WIN32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL");
ADD_FLAG("LDFLAGS", "/debug");
} else {
- DEFINE("CFLAGS", "/nologo /MD /W3 /GX /O2 /I . /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I ..\\ext /I ..\\php5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D ZTS=1 /D ZEND_DEBUG=0 /D PHP_WIN32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL");
+ DEFINE("CFLAGS", "/nologo /MD /W3 /GX /O2 /I . /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I ..\\ext /I ..\\php5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D ZEND_DEBUG=0 /D PHP_WIN32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL");
// Generate external debug files when --enable-debug-pack is specified
if (PHP_GTK_DEBUG_PACK == "yes") {
ADD_FLAG("CFLAGS", "/Zi");
@@ -104,6 +117,10 @@ if (PHP_GTK_DEBUG == "yes") {
}
}
+if (PHP_GTK_ZTS == "yes") {
+ ADD_FLAG("CFLAGS", "/D ZTS=1");
+ }
+
if (VCVERS < 14) {
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', '/YX /c');
View
120 win32/cvsclean.js
@@ -0,0 +1,120 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2007 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | license@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Wez Furlong <wez@thebrainroom.com> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id: cvsclean.js,v 1.1 2007-05-29 12:28:14 auroraeosrose Exp $ */
+// Cleans up files that do not belong in CVS
+
+var FSO = WScript.CreateObject("Scripting.FileSystemObject");
+
+function find_cvsignore(dirname)
+{
+ if (!FSO.FolderExists(dirname))
+ return;
+
+ var f = FSO.GetFolder(dirname);
+ var fc = new Enumerator(f.SubFolders);
+
+ for (; !fc.atEnd(); fc.moveNext()) {
+ find_cvsignore(fc.item());
+ }
+
+ if (FSO.FileExists(dirname + "\\.cvsignore")) {
+ kill_from_cvsignore(dirname + "\\.cvsignore");
+ }
+}
+
+/* recursive remove using cvsignore style wildcard matching;
+ * note that FSO.DeleteFolder and FSO.DeleteFile methods both
+ * accept wildcards, but that they are dangerous to use eg:
+ * "*.php" will match "*.phpt" */
+function rm_r(filename)
+{
+ if (FSO.FolderExists(filename)) {
+ var fc = new Enumerator(FSO.GetFolder(filename).SubFolders);
+
+ for (; !fc.atEnd(); fc.moveNext()) {
+ rm_r(fc.item());
+ }
+
+ fc = new Enumerator(FSO.GetFolder(filename).Files);
+
+ for (; !fc.atEnd(); fc.moveNext()) {
+ FSO.DeleteFile(fc.item(), true);
+ }
+
+ FSO.DeleteFolder(filename, true);
+ } else if (FSO.FileExists(filename)) {
+ FSO.DeleteFile(filename, true);
+ } else {
+ /* we need to handle wildcards here */
+ var foldername = FSO.GetParentFolderName(filename);
+
+ if (foldername == "")
+ foldername = ".";
+
+ var filename = FSO.GetFileName(filename);
+
+ var retext = filename.replace(/\./g, '\\.');
+ retext = '^' + retext.replace(/\*/g, '.*') + "$";
+ var re = new RegExp(retext);
+
+ var folder = FSO.GetFolder(foldername);
+ var fc = new Enumerator(folder.SubFolders);
+ for (; !fc.atEnd(); fc.moveNext()) {
+
+ var item = FSO.GetFileName(fc.item());
+
+ if (item.match(re)) {
+ rm_r(fc.item());
+ }
+ }
+ var fc = new Enumerator(folder.Files);
+ for (; !fc.atEnd(); fc.moveNext()) {
+ item = FSO.GetFileName(fc.item());
+
+ if (item.match(re)) {
+ FSO.DeleteFile(fc.item(), true);
+ }
+ }
+ }
+}
+
+function kill_from_cvsignore(igfile)
+{
+ var dir = FSO.GetParentFolderName(igfile) + "\\";
+ var t = FSO.OpenTextFile(igfile, 1);
+ var l;
+
+ if (dir == ".\\") {
+ dir = "";
+ }
+
+ while (!t.atEndOfStream) {
+ l = t.ReadLine();
+ // don't kill their config.nice file(s)
+ if (l.match("config\.nice.*") ||
+ l.match("") ||
+ l.match("*"))
+ continue;
+ rm_r(dir + l);
+ }
+
+}
+
+find_cvsignore(".");
+
Please sign in to comment.
Something went wrong with that request. Please try again.