com gtk/php-gtk: ws fixes: win32/buildconf.js win32/confutils.js

Commit:    ec62c6963d7bc66592f8490fd7c60f0299e2e218=0AAuthor:    Steph Fox =
<[email protected]>         Sat, 24 Sep 2005 14:39:51 +0000=0AParents:   8158020=
8a7b1c0da8327e7cc7be0d1d0fdf19d5e=0ABranches:  master=0A=0ALink:       http=
://git.php.net/?p=3Dgtk/php-gtk.git;a=3Dcommitdiff;h=3Dec62c6963d7bc66592f8=
490fd7c60f0299e2e218=0A=0ALog:=0Aws fixes=0A=0AChanged paths:=0A  M  win32/=
buildconf.js=0A  M  win32/confutils.js=0A=0A=0ADiff:=0Aec62c6963d7bc66592f8=
490fd7c60f0299e2e218=0Adiff --git a/win32/buildconf.js b/win32/buildconf.js=
=0Aindex 4fb18da..be07a9c 100644=0A--- a/win32/buildconf.js=0A+++ b/win32/b=
uildconf.js=0A@@ -16,7 +16,7 @@=0A   +-------------------------------------=
---------------------------------+=0A */=0A =0A-/* $Id: buildconf.js,v 1.4 =
2005-09-24 14:14:45 sfox Exp $ */=0A+/* $Id: buildconf.js,v 1.5 2005-09-24 =
14:39:51 sfox Exp $ */=0A // This generates a configure script for win32 bu=
ild=0A =0A var FSO =3D WScript.CreateObject("Scripting.FileSystemObject");=
=0A@@ -96,7 +96,7 @@ function find_config_w32(dirname) {=0A =09}=0A =0A =09=
var f =3D FSO.GetFolder(dirname);=0A-=09var=09fc =3D new Enumerator(f.SubFo=
lders);=0A+=09var fc =3D new Enumerator(f.SubFolders);=0A =09var c, i, ok, =
n;=0A =09var item =3D null;=0A =0A@@ -105,17 +105,16 @@ function find_confi=
g_w32(dirname) {=0A =09=09/* check if we already picked up a module with th=
e same dirname;=0A =09=09 * if we have, don't include it here */=0A =09=09n=
 =3D FSO.GetFileName(fc.item());=0A-=09=09=0A+=0A =09=09if (n =3D=3D 'CVS' =
|| n =3D=3D 'tests')=0A =09=09=09continue;=0A-=09=09=09=0A+=0A =09=09WScrip=
t.StdOut.Write("Checking " + dirname + "/" + n);=0A =09=09if (MODULES.Exist=
s(n)) {=0A =09=09=09WScript.StdOut.WriteLine("Skipping " + dirname + "/" + =
n + " -- already have a module with that name");=0A =09=09=09continue;=0A =
=09=09}=0A =0A-=09=09=09=0A =09=09c =3D FSO.BuildPath(fc.item(), "config.w3=
2");=0A =0A =09=09if (!FSO.FileExists(c)) {=0A@@ -127,7 +126,7 @@ function =
find_config_w32(dirname) {=0A =09=09=09WScript.StdOut.WriteLine("=09=09Avai=
lable");=0A =0A =09=09=09var dir_line =3D "configure_module_dirname =3D con=
dense_path(FSO.GetParentFolderName('"=0A-=09=09=09=09=09=09=09   =09+ c.rep=
lace(new RegExp('(["\\\\])', "g"), '\\$1') + "'));\r\n";=0A+=09=09=09=09=09=
=09=09   + c.replace(new RegExp('(["\\\\])', "g"), '\\$1') + "'));\r\n";=0A=
 =09=09=09var contents =3D file_get_contents(c);=0A =0A =09=09=09item =3D n=
ew Module_Item(n, c, dir_line, contents);=0Adiff --git a/win32/confutils.js=
 b/win32/confutils.js=0Aindex be90620..4402619 100644=0A--- a/win32/confuti=
ls.js=0A+++ b/win32/confutils.js=0A@@ -17,7 +17,7 @@=0A   +----------------=
------------------------------------------------------+=0A */=0A =0A-// $Id=
: confutils.js,v 1.12 2005-09-24 14:14:45 sfox Exp $=0A+// $Id: confutils.j=
s,v 1.13 2005-09-24 14:39:51 sfox Exp $=0A =0A /* set vars */=0A var STDOUT=
 =3D WScript.StdOut;=0A@@ -168,7 +168,7 @@ function condense_path(path) {=
=0A function ConfigureArg(type, optname, helptext, defval) {=0A =0A =09var =
opptype =3D "";=0A-=09=0A+=0A =09if (type) {=0A =0A =09=09opptype =3D type =
=3D=3D "enable" ? "disable" : "without";=0A@@ -259,7 +259,7 @@ function con=
f_process_args() {=0A =09=09=09=09=09=09argval =3D arg.defval =3D=3D "no" ?=
 "yes" : "no";=0A =09=09=09=09=09}=0A =09=09=09=09}=0A-=09=09=09=09=0A+=0A =
=09=09=09=09arg.argval =3D argval;=0A =09=09=09=09eval("PHP_GTK_" + arg.sym=
val + " =3D argval;");=0A =09=09=09=09break;=0A@@ -463,7 +463,7 @@ function=
 CHECK_LIB(libnames, target, path_to_check, common_name) {=0A =09var i, j, =
k, libname;=0A =09var location =3D false;=0A =09var path =3D path_to_check.=
split(';');=0A-=09=0A+=0A =09for (i =3D 0; i < libnames.length; i++) {=0A =
=09=09libname =3D libnames[i];=0A =0A@@ -580,7 +580,7 @@ function CHECK_HEA=
DER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env=0A =09} else=
 {=0A =09=09path_to_check +=3D ";" + php_usual_include_suspects;=0A =09}=0A=
-=09=0A+=0A =09var p =3D search_paths(header_name, path_to_check, use_env ?=
 "INCLUDE" : null);=0A =09var have =3D 0;=0A =09var sym;=0A@@ -718,7 +718,7=
 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) {=0A =09=09var ma=
ngle_dir =3D build_dir.replace(new RegExp("[\\\\/.+-]", "g"), "_");=0A =09=
=09var bd_flags_name =3D "CFLAGS_BD_" + mangle_dir.toUpperCase();=0A =09}=
=0A-=09=0A+=0A =09var dirs =3D build_dir.split("\\");=0A =09var i, d =3D ""=
;=0A =09for (i =3D 0; i < dirs.length; i++) {=0A@@ -754,7 +754,7 @@ functio=
n ADD_FLAG(name, flags, target) {=0A =09=09if (curr_flags.indexOf(flags) >=
=3D 0) {=0A =09=09=09return;=0A =09=09}=0A-=09=09=0A+=0A =09=09flags =3D cu=
rr_flags + " " + flags;=0A =09=09configure_subst.Remove(name);=0A =09}=0A@@=
 -857,7 +857,7 @@ function word_wrap_and_indent(indent, text, line_suffix, =
indent_char) {=0A =09for (i =3D 0; i < indent; i++) {=0A =09=09space +=3D i=
ndent_char;=0A =09}=0A-=09=0A+=0A =09for (i =3D 0; i < words.length; i++) {=
=0A =09=09if (this_line.length) {=0A =09=09=09t =3D this_line + " " + words=
[i];=0A@@ -917,7 +917,7 @@ function generate_files() {=0A =09if (!FSO.Folde=
rExists(dir)) {=0A =09=09FSO.CreateFolder(dir);=0A =09}=0A-=09=0A+=0A =09fo=
r (i =3D 0; i < build_dirs.length; i++) {=0A =09=09bd =3D FSO.BuildPath(dir=
, build_dirs[i]);=0A =09=09if (bd =3D=3D last) {=0A@@ -1013,14 +1013,14 @@ =
function glob(path_pattern) {=0A =09if (FSO.FileExists(path_pattern)) {=0A =
=09=09return new Array(path_pattern);=0A =09}=0A-=09=0A+=0A =09// first, bu=
ild as much as possible that doesn't have a pattern=0A =09for (p =3D 0; p <=
 path_parts.length; p++) {=0A =09=09if (path_parts[p].match(is_pat_re))=0A =
=09=09=09break;=0A =09=09if (p)=0A =09=09=09base +=3D "\\";=0A-=09=09base +=
=3D path_parts[p];=09=0A+=09=09base +=3D path_parts[p];=0A =09}=0A =0A =09r=
eturn _inner_glob(base, p, path_parts);=0A@@ -1139,11 +1139,11 @@ function =
generate_version_info_resource(makefiletarget, creditspath) {=0A =09if (mak=
efiletarget.match(new RegExp("\\.exe$"))) {=0A =09=09logo =3D " /D WANT_LOG=
O";=0A =09}=0A-=09=0A+=0A =09MFO.WriteLine("$(PHPGTKDLL_RES): win32\\templa=
te.rc");=0A =09MFO.WriteLine("\t$(RC) /fo $(PHPGTKDLL_RES)" + logo + ' /D F=
ILE_DESCRIPTION=3D"\\"' + res_desc + '\\"" /D FILE_NAME=3D"\\"$(PHPGTKDLL)\=
\"" /D PRODUCT_NAME=3D"\\"' + res_prod_name + '\\"" /D THANKS_GUYS=3D"\\"' =
+ thanks + '\\"" win32\\template.rc');=0A =09MFO.WriteBlankLines(1);=0A-=09=
=0A+=0A =09return resname;=0A }=0A