com gtk/php-gtk: More extension support changes. No need for dependency support here...: win32/confutils.js

Commit:    078c37315989890a67be9f7c93ee218f3ea5d7c7=0AAuthor:    Steph Fox =
<[email protected]>         Thu, 22 Sep 2005 03:30:33 +0000=0AParents:   133e914=
ce2d7737dfa12954642aa796e0c20ea7b=0ABranches:  master=0A=0ALink:       http=
://git.php.net/?p=3Dgtk/php-gtk.git;a=3Dcommitdiff;h=3D078c37315989890a67be=
9f7c93ee218f3ea5d7c7=0A=0ALog:=0AMore extension support changes.=0ANo need =
for dependency support here...=0A=0AChanged paths:=0A  M  win32/confutils.j=
s=0A=0A=0ADiff:=0A078c37315989890a67be9f7c93ee218f3ea5d7c7=0Adiff --git a/w=
in32/confutils.js b/win32/confutils.js=0Aindex b25d192..b9ce321 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.9 2005-09-21 09:39:41 sfox Exp $=0A+// =
$Id: confutils.js,v 1.10 2005-09-22 03:30:33 sfox Exp $=0A =0A /* set vars =
*/=0A var STDOUT =3D WScript.StdOut;=0A@@ -614,39 +614,10 @@ function CHECK=
_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env=0A =09re=
turn p;=0A }=0A =0A-/* Add a dependency, so that PHP-GTK is built before an=
y of its extensions */=0A-function ADD_EXTENSION_DEP(extname, dependson, op=
tional) {=0A-=0A-=09var EXT =3D extname.toUpperCase();=0A-=09var DEP =3D de=
pendson.toUpperCase();=0A-=09var dep_present =3D false;=0A-=09var dep_share=
d =3D false;=0A-=0A-=09try {=0A-=09=09dep_present =3D eval("PHP_GTK_" + DEP=
);=0A-=09=09dep_shared =3D eval("PHP_GTK_" + DEP + "_SHARED");=0A-=09} catc=
h (e) {=0A-=09=09dep_present =3D "no";=0A-=09=09dep_shared =3D false;=0A-=
=09}=0A-=09=0A-=09if (optional) {=0A-=09=09if (dep_present =3D=3D "no")=0A-=
=09=09=09return;=0A-=09}=0A-=0A-=09var ext_shared =3D eval("PHP_GTK_" + EXT=
 + "_SHARED");=0A-=0A-=09if (dep_shared) {=0A-=09=09ADD_FLAG("LDFLAGS_" + E=
XT, "/libpath:$(BUILD_DIR)");=0A-=09=09ADD_FLAG("LIBS_" + EXT, "php_" + dep=
endson + ".lib");=0A-=09=09ADD_FLAG("DEPS_" + EXT, "$(BUILD_DIR)\\php_" + d=
ependson + ".lib");=0A-=09}=0A-}=0A-=0A function EXTENSION(extname, file_li=
st, shared, cflags, dllname, obj_dir) {=0A =0A-=09var objs =3D null;=0A+=09=
var dllflags =3D "";=0A+=09var dep_libs =3D "";=0A =09var EXT =3D extname.t=
oUpperCase().replace(new RegExp("-", "g"), "_");=0A =09var extname_for_prin=
ting;=0A =0A@@ -664,6 +635,7 @@ function EXTENSION(extname, file_list, shar=
ed, cflags, dllname, obj_dir) {=0A =09}=0A =0A =09STDOUT.WriteLine("Enablin=
g extension " + extname_for_printing + " [shared]");=0A+=0A =09cflags =3D "=
/D COMPILE_DL_" + EXT + "2 /D " + EXT + "_EXPORTS=3D1" + cflags;=0A =0A =09=
MFO.WriteBlankLines(1);=0A@@ -682,6 +654,8 @@ function EXTENSION(extname, f=
ile_list, shared, cflags, dllname, obj_dir) {=0A =09=09=09resname =3D gener=
ate_version_info_resource(dllname, configure_module_dirname);=0A =09=09} el=
se {=0A =09=09=09dllname =3D "php_gtk_" + extname + ".dll";=0A+=09=09=09dll=
flags =3D " $(DLL_LDFLAGS)";=0A+=09=09=09dep_libs =3D " $(BUILD_DIR)\\$(PHP=
GTKLIB) $(LIBS_PHP_GTK)";=0A =09=09}=0A =09}=0A =09var libname =3D dllname.=
substring(0, dllname.length-4) + ".lib";=0A@@ -690,9 +664,9 @@ function EXT=
ENSION(extname, file_list, shared, cflags, dllname, obj_dir) {=0A =09ADD_FL=
AG("EXT_TARGETS", "$(BUILD_DIR)\\"+dllname);=0A =0A =09MFO.WriteLine("$(BUI=
LD_DIR)\\" + dllname + ": $(" + EXT + "_GLOBAL_OBJS) $(PHPGTKDLL_RES)");=0A=
-=09MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\" + dllname + " $(" + EX=
T + "_LDFLAGS) $(LDFLAGS) $(" + EXT + "_GLOBAL_OBJS) $(LIBS_" + EXT + ") $(=
LIBS) $(PHPGTKDLL_RES)");=0A-=09MFO.WriteBlankLines(1);=0A+=09MFO.WriteLine=
("\t" + ld + " /out:$(BUILD_DIR)\\" + dllname + " $(" + EXT + "_LDFLAGS)" +=
 dllflags + " $(LDFLAGS) $(" + EXT + "_GLOBAL_OBJS) $(LIBS_" + EXT + ")" + =
dep_libs + " $(LIBS) $(PHPGTKDLL_RES)");=0A =0A+=09MFO.WriteBlankLines(1);=
=0A =09MFO.WriteLine(dllname + ": $(BUILD_DIR)\\" + dllname);=0A =09MFO.Wri=
teLine("\t@echo EXT " + extname + " build complete");=0A =09MFO.WriteBlankL=
ines(1);=0A@@ -705,10 +679,7 @@ function ADD_SOURCES(dir, file_list, target=
, obj_dir) {=0A =09var i;=0A =09var tv;=0A =09var src, obj, sym, flags;=0A-=
=0A-=09if (target =3D=3D null) {=0A-=09=09target =3D "php";=0A-=09}=0A+=09v=
ar core_cflags =3D "";=0A =0A =09sym =3D target.toUpperCase().replace(new R=
egExp("-", "g"), "_") + "_GLOBAL_OBJS";=0A =09flags =3D "CFLAGS_" + target.=
toUpperCase().replace(new RegExp("-", "g"), "_");=0A@@ -719,6 +690,10 @@ fu=
nction ADD_SOURCES(dir, file_list, target, obj_dir) {=0A =09=09tv =3D "";=
=0A =09}=0A =0A+=09if (target !=3D "php-gtk") {=0A+=09=09core_cflags =3D "$=
(CFLAGS_PHP_GTK) ";=0A+=09}=0A+=0A =09file_list =3D file_list.split(new Reg=
Exp("\\s+"));=0A =09file_list.sort();=0A =0A@@ -764,7 +739,7 @@ function AD=
D_SOURCES(dir, file_list, target, obj_dir) {=0A =09=09tv +=3D " " + sub_bui=
ld + obj;=0A =0A =09=09MFO.WriteLine(sub_build + obj + ": " + dir + "\\" + =
src);=0A-=09=09MFO.WriteLine("\t@$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_=
flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + obj);=0A+=09=
=09MFO.WriteLine("\t@$(CC) $(" + flags + ") " + core_cflags + "$(CFLAGS) $(=
" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + obj);=
=0A =09}=0A =0A =09DEFINE(sym, tv);=0A