com gtk/php-gtk: Bit of a tidy-up.: win32/confutils.js

Commit:    03c1c7cafdb0a395039aedd33fbf497cf2bbb447=0AAuthor:    Steph Fox =
<[email protected]>         Sat, 1 Oct 2005 16:24:42 +0000=0AParents:   33db910d=
5e0b9da1bd8a0d1c0a3f96fdd56bf3ce=0ABranches:  master=0A=0ALink:       http:=
//git.php.net/?p=3Dgtk/php-gtk.git;a=3Dcommitdiff;h=3D03c1c7cafdb0a395039ae=
dd33fbf497cf2bbb447=0A=0ALog:=0ABit of a tidy-up.=0A=0AChanged paths:=0A  M=
  win32/confutils.js=0A=0A=0ADiff:=0A03c1c7cafdb0a395039aedd33fbf497cf2bbb4=
47=0Adiff --git a/win32/confutils.js b/win32/confutils.js=0Aindex cd0374c..=
6645b75 100644=0A--- a/win32/confutils.js=0A+++ b/win32/confutils.js=0A@@ -=
17,7 +17,7 @@=0A   +-------------------------------------------------------=
---------------+=0A */=0A =0A-// $Id: confutils.js,v 1.15 2005-09-24 18:37:=
11 sfox Exp $=0A+// $Id: confutils.js,v 1.16 2005-10-01 16:24:42 sfox Exp $=
=0A =0A /* set vars */=0A var STDOUT =3D WScript.StdOut;=0A@@ -655,7 +655,7=
 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir=
) {=0A =09=09=09dep_libs =3D " $(BUILD_DIR)\\$(PHPGTKLIB) $(LIBS_PHP_GTK)";=
=0A =09=09}=0A =09}=0A-=09var libname =3D dllname.substring(0, dllname.leng=
th-4) + ".lib";=0A+=09var libname =3D dllname.substring(0, dllname.length -=
 4) + ".lib";=0A =09var ld =3D "@$(LD)";=0A =0A =09ADD_FLAG("EXT_TARGETS", =
"$(BUILD_DIR)\\" + dllname);=0A@@ -710,15 +710,19 @@ function ADD_SOURCES(d=
ir, file_list, target, obj_dir) {=0A =09 * This probably breaks for non-sib=
ling dirs */=0A =09if (obj_dir =3D=3D null) {=0A =09=09var build_dir =3D di=
r.replace(new RegExp("^..\\\\"), "");=0A-=09=09var mangle_dir =3D build_dir=
.replace(new RegExp("[\\\\/.+-]", "g"), "_");=0A-=09=09var bd_flags_name =
=3D "CFLAGS_BD_" + mangle_dir.toUpperCase();=0A-=09}=0A-=09else {=0A+=09} e=
lse {=0A =09=09var build_dir =3D obj_dir.replace(new RegExp("^..\\\\"), "")=
;=0A-=09=09var mangle_dir =3D build_dir.replace(new RegExp("[\\\\/.+-]", "g=
"), "_");=0A-=09=09var bd_flags_name =3D "CFLAGS_BD_" + mangle_dir.toUpperC=
ase();=0A =09}=0A =0A+=09var mangle_dir =3D build_dir.replace(new RegExp("[=
\\\\/.+-]", "g"), "_");=0A+=0A+=09/* kill trailing underscores */=0A+=09if =
(mangle_dir.substring(mangle_dir.length - 1) =3D=3D "_") {=0A+=09=09mangle_=
dir =3D mangle_dir.substring(0, mangle_dir.length - 1);=0A+=09}=0A+=0A+=09v=
ar bd_flags_name =3D "CFLAGS_BD_" + mangle_dir.toUpperCase();=0A+=0A =09var=
 dirs =3D build_dir.split("\\");=0A =09var i, d =3D "";=0A =09for (i =3D 0;=
 i < dirs.length; i++) {=0A@@ -728,7 +732,6 @@ function ADD_SOURCES(dir, fi=
le_list, target, obj_dir) {=0A =09}=0A =09sub_build +=3D d;=0A =0A-=0A =09D=
EFINE(bd_flags_name, " /Fd" + sub_build + " /Fp" + sub_build + " /FR" + sub=
_build);=0A =0A =09for (i in file_list) {=0A@@ -986,7 +989,6 @@ function ge=
nerate_makefile() {=0A =09MF.Close();=0A =0A =09FSO.DeleteFile("Makefile.ob=
jects");=0A-=09//FSO.DeleteFile("win32\\temp.bat");=0A }=0A =0A function co=
py_and_subst(srcname, destname, subst_array) {=0A