lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-29 15:41:13 +03:00
Code Activity

fixed a bug in merging public info from C modules. patch from Mark Vakoc

Browse Source 
* doc/apibuild.py: fixed a bug in merging public info from
  C modules.
* win32/Makefile.msvc win32/configure.js: patch from Mark Vakoc
  the iconv option to configure.js didn't work, and
  added zlib option needed when linking xsltproc statically
Daniel
This commit is contained in:
Daniel Veillard
2002-12-12 00:19:02 +00:00
parent cee0667970
commit 03fd8d0fcc
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Thu Dec 12 01:17:09 CET 2002 Daniel Veillard <daniel@veillard.com>
* doc/apibuild.py: fixed a bug in merging public info from
C modules.
* win32/Makefile.msvc win32/configure.js: patch from Mark Vakoc
the iconv option to configure.js didn't work, and
added zlib option needed when linking xsltproc statically
Wed Dec 11 19:18:45 CET 2002 Daniel Veillard <daniel@veillard.com> Wed Dec 11 19:18:45 CET 2002 Daniel Veillard <daniel@veillard.com>
* doc/Makefile.am doc/apibuild.py doc/libexslt-api.xml: added * doc/Makefile.am doc/apibuild.py doc/libexslt-api.xml: added

3
doc/apibuild.py
View File

@ -182,9 +182,6 @@ class index:
if self.functions.has_key(id): if self.functions.has_key(id):
up = idx.functions[id] up = idx.functions[id]
self.functions[id].update(None, up.type, up.info, up.extra) self.functions[id].update(None, up.type, up.info, up.extra)
else:
if idx.functions[id].static == 0:
self.functions[id] = idx.functions[id]
def analyze_dict(self, type, dict): def analyze_dict(self, type, dict):
count = 0 count = 0

3
win32/Makefile.msvc
View File

@ -304,6 +304,9 @@ APPLIBS = $(LIBS) libxml2_a.lib
!if "$(WITH_ICONV)" == "1" !if "$(WITH_ICONV)" == "1"
APPLIBS = $(APPLIBS) iconv.lib APPLIBS = $(APPLIBS) iconv.lib
!endif !endif
!if "$(WITH_ZLIB)" == "1"
APPLIBS = $(APPLIBS) zlib.lib
!endif
{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe: {$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe:
$(CC) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \ $(CC) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \
$(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $< $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $<

8
win32/configure.js
View File

@ -44,6 +44,7 @@ var withXsltDebug = true;
var withMemDebug = false; var withMemDebug = false;
var withDebugger = true; var withDebugger = true;
var withIconv = true; var withIconv = true;
var withZlib = false;
/* Win32 build options. */ /* Win32 build options. */
var compiler = "msvc"; var compiler = "msvc";
var buildDebug = 0; var buildDebug = 0;
@ -97,6 +98,7 @@ function usage()
txt += " mem_debug: Enable memory debugger (" + (withMemDebug? "yes" : "no") + ")\n"; txt += " mem_debug: Enable memory debugger (" + (withMemDebug? "yes" : "no") + ")\n";
txt += " debugger: Enable external debugger support (" + (withDebugger? "yes" : "no") + ")\n"; txt += " debugger: Enable external debugger support (" + (withDebugger? "yes" : "no") + ")\n";
txt += " iconv: Use iconv library (" + (withIconv? "yes" : "no") + ")\n"; txt += " iconv: Use iconv library (" + (withIconv? "yes" : "no") + ")\n";
txt += " zlib: Use zlib library (" + (withZlib? "yes" : "no") + ")\n";
txt += "\nWin32 build options, default value given in parentheses:\n\n"; txt += "\nWin32 build options, default value given in parentheses:\n\n";
txt += " compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n"; txt += " compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n";
txt += " debug: Build unoptimised debug executables (" + (buildDebug? "yes" : "no") + ")\n"; txt += " debug: Build unoptimised debug executables (" + (buildDebug? "yes" : "no") + ")\n";
@ -167,6 +169,7 @@ function discoverVersion()
vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0")); vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0"));
vf.WriteLine("WITH_DEBUGGER=" + (withDebugger? "1" : "0")); vf.WriteLine("WITH_DEBUGGER=" + (withDebugger? "1" : "0"));
vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0")); vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0"));
vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0"));
vf.WriteLine("DEBUG=" + (buildDebug? "1" : "0")); vf.WriteLine("DEBUG=" + (buildDebug? "1" : "0"));
vf.WriteLine("STATIC=" + (buildStatic? "1" : "0")); vf.WriteLine("STATIC=" + (buildStatic? "1" : "0"));
vf.WriteLine("PREFIX=" + buildPrefix); vf.WriteLine("PREFIX=" + buildPrefix);
@ -317,7 +320,9 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
else if (opt == "debug") else if (opt == "debug")
buildDebug = strToBool(arg.substring(opt.length + 1, arg.length)); buildDebug = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "iconv") else if (opt == "iconv")
buildIconv = strToBool(arg.substring(opt.length + 1, arg.length)); withIconv = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "zlib")
withZlib = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "compiler") else if (opt == "compiler")
compiler = arg.substring(opt.length + 1, arg.length); compiler = arg.substring(opt.length + 1, arg.length);
else if (opt == "static") else if (opt == "static")
@ -398,6 +403,7 @@ txtOut += " Debugging module: " + boolToStr(withXsltDebug) + "\n";
txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n"; txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n";
txtOut += " Debugger support: " + boolToStr(withDebugger) + "\n"; txtOut += " Debugger support: " + boolToStr(withDebugger) + "\n";
txtOut += " Use iconv: " + boolToStr(withIconv) + "\n"; txtOut += " Use iconv: " + boolToStr(withIconv) + "\n";
txtOut += " With zlib: " + boolToStr(withZlib) + "\n";
txtOut += "\n"; txtOut += "\n";
txtOut += "Win32 build configuration\n"; txtOut += "Win32 build configuration\n";
txtOut += "-------------------------\n"; txtOut += "-------------------------\n";