com php/gtk-src: win32 build fixes: .gitignore win32/buildconf.js win32/confutils.js

Commit:    71bd020452e530e88ffcc67f31f16c08260a88a0=0AAuthor:    Elizabeth =
M Smith <[email protected]>         Mon, 6 Aug 2012 21:10:20 -0400=0A=
Parents:   e30bbce3b5156adfdf1d8c74f0960b53d63e32c6=0ABranches:  master=0A=
=0ALink:       http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dcommitdiff;h=3D7=
1bd020452e530e88ffcc67f31f16c08260a88a0=0A=0ALog:=0Awin32 build fixes=0A=0A=
buildconf needs to delete the right file, alterations to confutils so=0Athe=
 right gtk version is picked up, and fix for regex cause of - in the=0Aname=
 plus some missed gitignore entries=0A=0AChanged paths:=0A  M  .gitignore=
=0A  M  win32/buildconf.js=0A  M  win32/confutils.js=0A=0A=0ADiff:=0Adiff -=
-git a/.gitignore b/.gitignore=0Aindex f069f26..5507f81 100644=0A--- a/.git=
ignore=0A+++ b/.gitignore=0A@@ -25,6 +25,12 @@ Makefile*=0A # Output direct=
ories=0A Release/=0A =0A+# Generator junk=0A+win32/logs/=0A+win32/temp.bat=
=0A+sources.temp=0A+source_complete.txt=0A+=0A # autotools=0A config.*=0A c=
onfigure=0A@@ -55,4 +61,5 @@ run-tests.php=0A *.defs.cache=0A gen_*=0A buil=
d2/generated_lists=0A-main/php_gtk_ext.c=0A\ No newline at end of file=0A+m=
ain/php_gtk_ext.c=0A+main/php_gtk_version.h=0A\ No newline at end of file=
=0Adiff --git a/win32/buildconf.js b/win32/buildconf.js=0Aindex 7cdab3e..37=
e2b2b 100644=0A--- a/win32/buildconf.js=0A+++ b/win32/buildconf.js=0A@@ -29=
,8 +29,8 @@ if (FSO.FileExists('configure.js')) {=0A if (FSO.FileExists('so=
urces.temp')) {=0A =09FSO.DeleteFile('sources.temp');=0A }=0A-if (FSO.FileE=
xists('sources_complete.txt')) {=0A-=09FSO.DeleteFile('sources_complete.txt=
');=0A+if (FSO.FileExists('source_complete.txt')) {=0A+=09FSO.DeleteFile('s=
ource_complete.txt');=0A }=0A =0A var C =3D FSO.CreateTextFile("configure.j=
s", true);=0Adiff --git a/win32/confutils.js b/win32/confutils.js=0Aindex a=
d27b0b..a19cf7f 100644=0A--- a/win32/confutils.js=0A+++ b/win32/confutils.j=
s=0A@@ -732,7 +732,7 @@ function ADD_SOURCES(dir, file_list, target, obj_di=
r) {=0A =09file_list =3D file_list.split(new RegExp("\\s+"));=0A =09file_li=
st.sort();=0A =0A-=09var re =3D new RegExp("\.[a-z0-9A-Z]+$");=0A+=09var re=
 =3D new RegExp("\.[a-z0-9A-Z\-]+$");=0A =0A =09dir =3D dir.replace(new Reg=
Exp("/", "g"), "\\");=0A =09var objs_line =3D "";=0A@@ -865,6 +865,8 @@ fun=
ction search_paths(thing_to_find, explicit_path, env_name) {=0A =0A =09if (=
found && place =3D=3D true) {=0A =09=09STDOUT.WriteLine("=09<in default pat=
h>");=0A+=09=09place =3D file[0];=0A+=09=09place =3D place.substr(0, place.=
length - thing_to_find.length - 1);=0A =09} else if (found) {=0A =09=09STDO=
UT.WriteLine("=09" + place);=0A =09} else {=0A