diff --git a/NEWS b/NEWS index b797ac47e..65fd0349b 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,8 @@ More internal functions and struct members were deprecated. The built-in HTTP client and support for LZMA compression were removed. +The custom Windows build system in `win32` was removed in favor of CMake. + ### Planned removals The Python bindings and support for Schematron validation are planned to @@ -37,7 +39,6 @@ The following features are considered for removal: - Modules API (xmlmodule.h) - Support for zlib compressed file I/O -- Legacy Windows build system in win32 RELAX NG support is still in a bad state and a long-term removal candidate. diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb deleted file mode 100644 index 6899227b3..000000000 --- a/win32/Makefile.bcb +++ /dev/null @@ -1,306 +0,0 @@ -# Makefile for libxml2, specific for Windows, BCB6 and Borland make. -# -# Take a look at the beginning and modify the variables to suit your -# environment. Having done that, you can do a -# -# make [all] to build the libxml and the accompanying utilities. -# make clean to remove all compiler output files and return to a -# clean state. -# make rebuild to rebuild everything from scratch. This basically does -# a 'nmake clean' and then a 'nmake all'. -# make install to install the library and its header files. -# -# August 2003, Eric Zurcher -# based on the MSVC version of -# March 2002, Igor Zlatkovic -# - -# There should never be a need to modify anything below this line. -# ---------------------------------------------------------------- - -AUTOCONF = .\config.bcb -!include $(AUTOCONF) - -!if !$d(BCB) -BCB = $(MAKEDIR)\.. -!endif -.autodepend - -# Names of various input and output components. -XML_NAME = xml2 -XML_BASENAME = lib$(XML_NAME) -XML_SO = $(XML_BASENAME).dll -XML_IMP = $(XML_BASENAME).lib -XML_A = $(XML_BASENAME)_a.lib -DUMMY = dir.exists - -# Place where we let the compiler put its intermediate trash. -BINDIR = bin.bcb -XML_INTDIR = int.bcb -XML_INTDIR_A = int.a.bcb -UTILS_INTDIR = int.utils.bcb - -# The preprocessor and its options. -CPP = cpp32.exe -P- -CPPFLAGS = -I"$(XML_SRCDIR)\include" -DNOLIBTOOL -!if "$(WITH_THREADS)" != "no" -CPPFLAGS = $(CPPFLAGS) -D__MT__ -!endif - -# The compiler and its options. -CC = bcc32.exe -CFLAGS = -q -D_NO_VCL -D_WINDOWS -D_MBCS -DEILSEQ=2 -DNOLIBTOOL -w- -CFLAGS = $(CFLAGS) -I"$(XML_SRCDIR)" -I"$(XML_SRCDIR)\include" -I"$(INCPREFIX)" -I"$(INCLUDE)" -!if "$(WITH_THREADS)" != "no" -CFLAGS = $(CFLAGS) -tWM -!endif -!if "$(DYNRUNTIME)" == "1" -CFLAGS = $(CFLAGS) -tWR -!endif -!if "$(WITH_THREADS)" == "ctls" -CFLAGS = $(CFLAGS) "-DXML_THREAD_LOCAL=__declspec(thread)" -!endif - -# The linker and its options. -LD = ilink32.exe -LDFLAGS = -q -U$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION) -LDFLAGS = $(LDFLAGS) -L"$(BINDIR);$(LIBPREFIX);$(LIB);$(BCB)\lib;$(BCB)\lib\PSdk" -LIBS = import32.lib -!if "$(WITH_THREADS)" != "no" && "$(DYNRUNTIME)" == "1" -LIBS = $(LIBS) cw32mti.lib -!elif "$(WITH_THREADS)" != "no" -LIBS = $(LIBS) cw32mt.lib -!elif "$(DYNRUNTIME)" == "1" -LIBS = $(LIBS) cw32i.lib -!else -LIBS = $(LIBS) cw32.lib -!endif -!if "$(WITH_ICONV)" == "1" -LIBS = $(LIBS) iconvomf.lib -!endif -!if "$(WITH_ZLIB)" == "1" -LIBS = $(LIBS) zlibomf.lib -!endif -!if "$(WITH_THREADS)" == "posix" -LIBS = $(LIBS) pthreadVC.lib -!endif -!if "$(WITH_MODULES)" == "1" -LIBS = $(LIBS) kernel32.lib -!endif - -# The archiver and its options. -AR = tlib.exe -ARFLAGS = /P64 /0 - -# Optimisation and debug symbols. -!if "$(DEBUG)" == "1" -CFLAGS = $(CFLAGS) -D_DEBUG -Od -v -LDFLAGS = $(LDFLAGS) -v -!else -CFLAGS = $(CFLAGS) -DNDEBUG -O2 -LDFLAGS = $(LDFLAGS) -!endif - -# Libxml object files. -XML_OBJS = $(XML_INTDIR)\buf.obj\ - $(XML_INTDIR)\c14n.obj\ - $(XML_INTDIR)\catalog.obj\ - $(XML_INTDIR)\chvalid.obj\ - $(XML_INTDIR)\debugXML.obj\ - $(XML_INTDIR)\dict.obj\ - $(XML_INTDIR)\encoding.obj\ - $(XML_INTDIR)\entities.obj\ - $(XML_INTDIR)\error.obj\ - $(XML_INTDIR)\globals.obj\ - $(XML_INTDIR)\hash.obj\ - $(XML_INTDIR)\HTMLparser.obj\ - $(XML_INTDIR)\HTMLtree.obj\ - $(XML_INTDIR)\list.obj\ - $(XML_INTDIR)\nanohttp.obj\ - $(XML_INTDIR)\parser.obj\ - $(XML_INTDIR)\parserInternals.obj\ - $(XML_INTDIR)\pattern.obj\ - $(XML_INTDIR)\relaxng.obj\ - $(XML_INTDIR)\SAX2.obj\ - $(XML_INTDIR)\schematron.obj\ - $(XML_INTDIR)\threads.obj\ - $(XML_INTDIR)\tree.obj\ - $(XML_INTDIR)\uri.obj\ - $(XML_INTDIR)\valid.obj\ - $(XML_INTDIR)\xinclude.obj\ - $(XML_INTDIR)\xlink.obj\ - $(XML_INTDIR)\xmlIO.obj\ - $(XML_INTDIR)\xmlmemory.obj\ - $(XML_INTDIR)\xmlreader.obj\ - $(XML_INTDIR)\xmlregexp.obj\ - $(XML_INTDIR)\xmlmodule.obj\ - $(XML_INTDIR)\xmlsave.obj\ - $(XML_INTDIR)\xmlschemas.obj\ - $(XML_INTDIR)\xmlschemastypes.obj\ - $(XML_INTDIR)\xmlunicode.obj\ - $(XML_INTDIR)\xmlwriter.obj\ - $(XML_INTDIR)\xpath.obj\ - $(XML_INTDIR)\xpointer.obj\ - $(XML_INTDIR)\xmlstring.obj - -# Static libxml object files. -XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\ - $(XML_INTDIR_A)\c14n.obj\ - $(XML_INTDIR_A)\catalog.obj\ - $(XML_INTDIR_A)\chvalid.obj\ - $(XML_INTDIR_A)\debugXML.obj\ - $(XML_INTDIR_A)\dict.obj\ - $(XML_INTDIR_A)\encoding.obj\ - $(XML_INTDIR_A)\entities.obj\ - $(XML_INTDIR_A)\error.obj\ - $(XML_INTDIR_A)\globals.obj\ - $(XML_INTDIR_A)\hash.obj\ - $(XML_INTDIR_A)\HTMLparser.obj\ - $(XML_INTDIR_A)\HTMLtree.obj\ - $(XML_INTDIR_A)\list.obj\ - $(XML_INTDIR_A)\nanohttp.obj\ - $(XML_INTDIR_A)\parser.obj\ - $(XML_INTDIR_A)\parserInternals.obj\ - $(XML_INTDIR_A)\pattern.obj\ - $(XML_INTDIR_A)\relaxng.obj\ - $(XML_INTDIR_A)\SAX2.obj\ - $(XML_INTDIR_A)\schematron.obj\ - $(XML_INTDIR_A)\threads.obj\ - $(XML_INTDIR_A)\tree.obj\ - $(XML_INTDIR_A)\uri.obj\ - $(XML_INTDIR_A)\valid.obj\ - $(XML_INTDIR_A)\xinclude.obj\ - $(XML_INTDIR_A)\xlink.obj\ - $(XML_INTDIR_A)\xmlIO.obj\ - $(XML_INTDIR_A)\xmlmemory.obj\ - $(XML_INTDIR_A)\xmlreader.obj\ - $(XML_INTDIR_A)\xmlregexp.obj\ - $(XML_INTDIR_A)\xmlmodule.obj\ - $(XML_INTDIR_A)\xmlsave.obj\ - $(XML_INTDIR_A)\xmlschemas.obj\ - $(XML_INTDIR_A)\xmlschemastypes.obj\ - $(XML_INTDIR_A)\xmlunicode.obj\ - $(XML_INTDIR_A)\xmlwriter.obj\ - $(XML_INTDIR_A)\xpath.obj\ - $(XML_INTDIR_A)\xpointer.obj\ - $(XML_INTDIR_A)\xmlstring.obj - -# Xmllint and friends executables. -UTILS = $(BINDIR)\xmllint.exe\ - $(BINDIR)\xmlcatalog.exe\ - $(BINDIR)\testModule.exe\ - $(BINDIR)\runtest.exe\ - $(BINDIR)\runsuite.exe\ - $(BINDIR)\testapi.exe\ - $(BINDIR)\testlimits.exe - -all : libxml libxmla utils - -libxml : $(BINDIR)\$(XML_SO) - -libxmla : $(BINDIR)\$(XML_A) - -utils : $(UTILS) - -clean : - if exist $(XML_INTDIR) rmdir /S /Q $(XML_INTDIR) - if exist $(XML_INTDIR_A) rmdir /S /Q $(XML_INTDIR_A) - if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR) - if exist $(BINDIR) rmdir /S /Q $(BINDIR) - -distclean : clean - if exist config.* del config.* - if exist Makefile del Makefile - -rebuild : clean all - -install-libs : all - if not exist "$(INCPREFIX)\libxml2" mkdir "$(INCPREFIX)\libxml2" - if not exist "$(INCPREFIX)\libxml2\libxml" mkdir "$(INCPREFIX)\libxml2\libxml" - if not exist "$(BINPREFIX)" mkdir "$(BINPREFIX)" - if not exist "$(LIBPREFIX)" mkdir "$(LIBPREFIX)" - copy $(XML_SRCDIR)\include\libxml\*.h "$(INCPREFIX)\libxml2\libxml" - copy $(BINDIR)\$(XML_SO) "$(SOPREFIX)" - copy $(BINDIR)\$(XML_A) "$(LIBPREFIX)" - copy $(BINDIR)\$(XML_IMP) "$(LIBPREFIX)" - copy $(BINDIR)\*.exe "$(BINPREFIX)" - -install : install-libs - copy $(BINDIR)\*.exe "$(BINPREFIX)" - -install-dist : install-libs - copy $(BINDIR)\xml*.exe "$(BINPREFIX)" - -# This is a target for me, to make a binary distribution. Not for the public use, -# keep your hands off :-) -BDVERSION = $(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION).$(LIBXML_MICRO_VERSION) -BDPREFIX = $(XML_BASENAME)-$(BDVERSION).win32 -bindist : all - $(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-dist - cscript //NoLogo configure.js genreadme $(XML_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt - - -# Makes the output directory. -$(BINDIR)\$(DUMMY) : - if not exist $(BINDIR) mkdir $(BINDIR) - touch $(BINDIR)\$(DUMMY) - -# Makes the libxml intermediate directory. -$(XML_INTDIR)\$(DUMMY) : - if not exist $(XML_INTDIR) mkdir $(XML_INTDIR) - touch $(XML_INTDIR)\$(DUMMY) - -# Makes the static libxml intermediate directory. -$(XML_INTDIR_A)\$(DUMMY) : - if not exist $(XML_INTDIR_A) mkdir $(XML_INTDIR_A) - touch $(XML_INTDIR_A)\$(DUMMY) - -# An implicit rule for libxml compilation. -{$(XML_SRCDIR)}.c{$(XML_INTDIR)}.obj: - $(CC) $(CFLAGS) -n$(XML_INTDIR) -c $< - -# An implicit rule for static libxml compilation. -{$(XML_SRCDIR)}.c{$(XML_INTDIR_A)}.obj: - $(CC) $(CFLAGS) -DLIBXML_STATIC -n$(XML_INTDIR_A)\ -c $< - -# Compiles libxml source. Uses the implicit rule for commands. -$(XML_OBJS) : $(XML_INTDIR)\$(DUMMY) - -# Compiles static libxml source. Uses the implicit rule for commands. -$(XML_OBJS_A) : $(XML_INTDIR_A)\$(DUMMY) - -#def4bcb.exe : def4bcb.c - -# Creates the libxml shared object. -$(BINDIR)\$(XML_SO) : $(BINDIR)\$(DUMMY) $(XML_OBJS) - $(LD) $(LDFLAGS) -Tpd -Gi c0d32.obj $(XML_OBJS),$(BINDIR)\$(XML_SO),,$(LIBS) - -#$(BINDIR)\$(XML_SO) : $(BINDIR)\$(DUMMY) $(XML_OBJS) -# $(LD) $(LDFLAGS) -Tpd -Gi c0d32.obj $(XML_OBJS),$(BINDIR)\$(XML_SO),,$(LIBS) - -# Creates the libxml archive. -$(BINDIR)\$(XML_A) : $(BINDIR)\$(DUMMY) $(XML_OBJS_A) - $(AR) $(BINDIR)\$(XML_A) $(ARFLAGS) /u $(XML_OBJS_A) - -# Makes the utils intermediate directory. -$(UTILS_INTDIR)\$(DUMMY) : - if not exist $(UTILS_INTDIR) mkdir $(UTILS_INTDIR) - touch $(UTILS_INTDIR)\$(DUMMY) - -# An implicit rule for xmllint and friends. -!if "$(STATIC)" == "1" -{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe: - $(CC) -DLIBXML_STATIC -w -tWC $(CFLAGS) -o$(UTILS_INTDIR)\$&.obj -c $< - $(LD) $(LDFLAGS) c0x32.obj $(UTILS_INTDIR)\$&.obj,$@,,$(LIBS) $(XML_A) -!else -{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe: - $(CC) $(CFLAGS) -tWC -o$(UTILS_INTDIR)\$&.obj -c $< - $(LD) $(LDFLAGS) c0x32.obj $(UTILS_INTDIR)\$&.obj $(XML_IMP),$@,,$(LIBS) -!endif - -# Builds xmllint and friends. Uses the implicit rule for commands. -$(UTILS) : $(UTILS_INTDIR)\$(DUMMY) $(BINDIR)\$(DUMMY) $(BINDIR)\$(XML_SO) $(BINDIR)\$(XML_A) - -# Source dependences should be autogenerated somehow here, but how to -# do it? I have no clue. - diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw deleted file mode 100644 index 4fe275d94..000000000 --- a/win32/Makefile.mingw +++ /dev/null @@ -1,294 +0,0 @@ -# Makefile for libxml2, specific for Windows, GCC (mingw) and GNU make. -# -# Take a look at the beginning and modify the variables to suit your -# environment. Having done that, you can do a -# -# nmake [all] to build the libxml and the accompanying utilities. -# nmake clean to remove all compiler output files and return to a -# clean state. -# nmake rebuild to rebuild everything from scratch. This basically does -# a 'nmake clean' and then a 'nmake all'. -# nmake install to install the library and its header files. -# -# November 2002, Igor Zlatkovic - -# There should never be a need to modify anything below this line. -# ---------------------------------------------------------------- - -AUTOCONF = .\config.mingw -include $(AUTOCONF) - -# Names of various input and output components. -XML_NAME = xml2 -XML_BASENAME = lib$(XML_NAME) -XML_SO = $(XML_BASENAME).dll -XML_IMP = $(XML_BASENAME).lib -XML_A = $(XML_BASENAME).a - -# Place where we let the compiler put its output. -BINDIR = bin.mingw -XML_INTDIR = int.mingw -XML_INTDIR_A = int.a.mingw -UTILS_INTDIR = int.utils.mingw - -# The preprocessor and its options. -CPP = gcc.exe -E -CPPFLAGS += -I$(XML_SRCDIR)/include -DNOLIBTOOL - -# The compiler and its options. -CC = gcc.exe -CFLAGS += -D_WINDOWS -D_MBCS -DNOLIBTOOL -CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX) $(INCLUDE) -ifeq ($(WITH_THREADS),ctls) -CFLAGS += "-DXML_THREAD_LOCAL=__declspec(thread)" -endif - -# The linker and its options. -LD = gcc.exe -LDFLAGS += -Wl,--major-image-version,$(LIBXML_MAJOR_VERSION) -LDFLAGS += -Wl,--minor-image-version,$(LIBXML_MINOR_VERSION) -LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX) -LIBS = -ifeq ($(WITH_ICONV),1) -LIBS += -liconv -endif -ifeq ($(WITH_ZLIB),1) -# Could be named differently -# LIBS += -lzdll -LIBS += -lz -endif -ifeq ($(WITH_THREADS),posix) -LIBS += -lpthreadGC -endif -ifeq ($(WITH_MODULES),1) -LIBS += -lkernel32 -endif - -LIBS += $(LIB) - -# The archiver and its options. -AR = ar.exe -ARFLAGS = -r - -# Optimisation and debug symbols. -ifeq ($(DEBUG),1) -CFLAGS += -D_DEBUG -g -LDFLAGS += -else -CFLAGS += -DNDEBUG -O2 -LDFLAGS += -endif - - -# Libxml object files. -XML_OBJS = $(XML_INTDIR)/buf.o\ - $(XML_INTDIR)/c14n.o\ - $(XML_INTDIR)/catalog.o\ - $(XML_INTDIR)/chvalid.o\ - $(XML_INTDIR)/debugXML.o\ - $(XML_INTDIR)/dict.o\ - $(XML_INTDIR)/encoding.o\ - $(XML_INTDIR)/entities.o\ - $(XML_INTDIR)/error.o\ - $(XML_INTDIR)/globals.o\ - $(XML_INTDIR)/hash.o\ - $(XML_INTDIR)/HTMLparser.o\ - $(XML_INTDIR)/HTMLtree.o\ - $(XML_INTDIR)/legacy.o\ - $(XML_INTDIR)/list.o\ - $(XML_INTDIR)/nanohttp.o\ - $(XML_INTDIR)/parser.o\ - $(XML_INTDIR)/parserInternals.o\ - $(XML_INTDIR)/pattern.o\ - $(XML_INTDIR)/relaxng.o\ - $(XML_INTDIR)/SAX.o\ - $(XML_INTDIR)/SAX2.o\ - $(XML_INTDIR)/schematron.o\ - $(XML_INTDIR)/threads.o\ - $(XML_INTDIR)/tree.o\ - $(XML_INTDIR)/uri.o\ - $(XML_INTDIR)/valid.o\ - $(XML_INTDIR)/xinclude.o\ - $(XML_INTDIR)/xlink.o\ - $(XML_INTDIR)/xmlIO.o\ - $(XML_INTDIR)/xmlmemory.o\ - $(XML_INTDIR)/xmlreader.o\ - $(XML_INTDIR)/xmlregexp.o\ - $(XML_INTDIR)/xmlmodule.o\ - $(XML_INTDIR)/xmlsave.o\ - $(XML_INTDIR)/xmlschemas.o\ - $(XML_INTDIR)/xmlschemastypes.o\ - $(XML_INTDIR)/xmlunicode.o\ - $(XML_INTDIR)/xmlwriter.o\ - $(XML_INTDIR)/xpath.o\ - $(XML_INTDIR)/xpointer.o\ - $(XML_INTDIR)/xmlstring.o - -XML_SRCS = $(subst .o,.c,$(subst $(XML_INTDIR)/,$(XML_SRCDIR)/,$(XML_OBJS))) - -# Static libxml object files. -XML_OBJS_A = $(XML_INTDIR_A)/buf.o\ - $(XML_INTDIR_A)/c14n.o\ - $(XML_INTDIR_A)/catalog.o\ - $(XML_INTDIR_A)/chvalid.o\ - $(XML_INTDIR_A)/debugXML.o\ - $(XML_INTDIR_A)/dict.o\ - $(XML_INTDIR_A)/encoding.o\ - $(XML_INTDIR_A)/entities.o\ - $(XML_INTDIR_A)/error.o\ - $(XML_INTDIR_A)/globals.o\ - $(XML_INTDIR_A)/hash.o\ - $(XML_INTDIR_A)/HTMLparser.o\ - $(XML_INTDIR_A)/HTMLtree.o\ - $(XML_INTDIR_A)/legacy.o\ - $(XML_INTDIR_A)/list.o\ - $(XML_INTDIR_A)/nanohttp.o\ - $(XML_INTDIR_A)/parser.o\ - $(XML_INTDIR_A)/parserInternals.o\ - $(XML_INTDIR_A)/pattern.o\ - $(XML_INTDIR_A)/relaxng.o\ - $(XML_INTDIR_A)/SAX.o\ - $(XML_INTDIR_A)/SAX2.o\ - $(XML_INTDIR_A)/schematron.o\ - $(XML_INTDIR_A)/threads.o\ - $(XML_INTDIR_A)/tree.o\ - $(XML_INTDIR_A)/uri.o\ - $(XML_INTDIR_A)/valid.o\ - $(XML_INTDIR_A)/xinclude.o\ - $(XML_INTDIR_A)/xlink.o\ - $(XML_INTDIR_A)/xmlIO.o\ - $(XML_INTDIR_A)/xmlmemory.o\ - $(XML_INTDIR_A)/xmlreader.o\ - $(XML_INTDIR_A)/xmlregexp.o\ - $(XML_INTDIR_A)/xmlmodule.o\ - $(XML_INTDIR_A)/xmlsave.o\ - $(XML_INTDIR_A)/xmlschemas.o\ - $(XML_INTDIR_A)/xmlschemastypes.o\ - $(XML_INTDIR_A)/xmlunicode.o\ - $(XML_INTDIR_A)/xmlwriter.o\ - $(XML_INTDIR_A)/xpath.o\ - $(XML_INTDIR_A)/xpointer.o\ - $(XML_INTDIR_A)/xmlstring.o - -XML_SRCS_A = $(subst .o,.c,$(subst $(XML_INTDIR_A)/,$(XML_SRCDIR)/,$(XML_OBJS_A))) - -# Xmllint and friends executables. -UTILS = $(BINDIR)/xmllint.exe\ - $(BINDIR)/xmlcatalog.exe\ - $(BINDIR)/testModule.exe\ - $(BINDIR)/runtest.exe\ - $(BINDIR)/runsuite.exe\ - $(BINDIR)/testapi.exe\ - $(BINDIR)/testlimits.exe - -all : dep libxml libxmla utils - -libxml : $(BINDIR)/$(XML_SO) - -libxmla : $(BINDIR)/$(XML_A) - -utils : $(UTILS) - -clean : - cmd.exe /C "if exist $(XML_INTDIR) rmdir /S /Q $(XML_INTDIR)" - cmd.exe /C "if exist $(XML_INTDIR_A) rmdir /S /Q $(XML_INTDIR_A)" - cmd.exe /C "if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR)" - cmd.exe /C "if exist $(BINDIR) rmdir /S /Q $(BINDIR)" - cmd.exe /C "if exist depends.mingw del depends.mingw" - -distclean : clean - cmd.exe /C "if exist config.* del config.*" - cmd.exe /C "if exist Makefile del Makefile" - -rebuild : clean all - -install-libs : all - cmd.exe /C "if not exist $(INCPREFIX)\libxml2 mkdir $(INCPREFIX)\libxml2" - cmd.exe /C "if not exist $(INCPREFIX)\libxml2\libxml mkdir $(INCPREFIX)\libxml2\libxml" - cmd.exe /C "if not exist $(BINPREFIX) mkdir $(BINPREFIX)" - cmd.exe /C "if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)" - cmd.exe /C "copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml2\libxml" - cmd.exe /C "copy $(BINDIR)\$(XML_SO) $(SOPREFIX)" - cmd.exe /C "copy $(BINDIR)\$(XML_A) $(LIBPREFIX)" - cmd.exe /C "copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)" - cmd.exe /C "copy $(BINDIR)\xml*.exe $(BINPREFIX)" - -install : install-libs - cmd.exe /C "copy $(BINDIR)\*.exe $(BINPREFIX)" - -install-dist : install-libs - cmd.exe /C "copy $(BINDIR)\xml*.exe $(BINPREFIX)" - -# This is a target for me, to make a binary distribution. Not for the public use, -# keep your hands off :-) -BDVERSION = $(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION).$(LIBXML_MICRO_VERSION) -BDPREFIX = $(XML_BASENAME)-$(BDVERSION).win32 -bindist : all - $(MAKE) PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)/bin install-dist - cscript //NoLogo configure.js genreadme $(XML_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt - - -# Creates the dependency file -dep : - $(CC) $(CFLAGS) -M $(XML_SRCS) > depends.mingw - - -# Makes the output directory. -$(BINDIR) : - cmd.exe /C if not exist $(BINDIR) mkdir $(BINDIR) - - -# Makes the libxml intermediate directory. -$(XML_INTDIR) : - cmd.exe /C if not exist $(XML_INTDIR) mkdir $(XML_INTDIR) - -# Makes the static libxml intermediate directory. -$(XML_INTDIR_A) : - cmd.exe /C if not exist $(XML_INTDIR_A) mkdir $(XML_INTDIR_A) - -# An implicit rule for libxml compilation. -$(XML_INTDIR)/%.o : $(XML_SRCDIR)/%.c - $(CC) $(CFLAGS) -o $@ -c $< - -# An implicit rule for static libxml compilation. -$(XML_INTDIR_A)/%.o : $(XML_SRCDIR)/%.c - $(CC) $(CFLAGS) -DLIBXML_STATIC -o $@ -c $< - - -# Compiles libxml source. Uses the implicit rule for commands. -$(XML_OBJS) : $(XML_INTDIR) - -# Compiles static libxml source. Uses the implicit rule for commands. -$(XML_OBJS_A) : $(XML_INTDIR_A) - -# Creates the libxml shared object. -XMLSO_LDFLAGS = $(LDFLAGS) -shared -Wl,--dll -Wl,--out-implib,$(BINDIR)/$(XML_IMP) -$(BINDIR)/$(XML_SO) : $(BINDIR) $(XML_OBJS) - $(LD) $(XMLSO_LDFLAGS) -o $(BINDIR)/$(XML_SO) $(XML_OBJS) $(LIBS) - -# Creates the libxml archive. -$(BINDIR)/$(XML_A) : $(BINDIR) $(XML_OBJS_A) - $(AR) $(ARFLAGS) $(BINDIR)\$(XML_A) $(XML_OBJS_A) - - -# Makes the utils intermediate directory. -$(UTILS_INTDIR) : - cmd.exe /C if not exist $(UTILS_INTDIR) mkdir $(UTILS_INTDIR) - -# An implicit rule for xmllint and friends. -ifeq ($(STATIC),1) -$(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c - $(CC) -DLIBXML_STATIC $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$( - -# There should never be a need to modify anything below this line. -# ---------------------------------------------------------------- - -AUTOCONF = .\config.msvc -!include $(AUTOCONF) - -# Names of various input and output components. -XML_NAME = xml2 -XML_BASENAME = lib$(XML_NAME) -XML_SO = $(XML_BASENAME).dll -XML_RES = $(XML_BASENAME).res -XML_IMP = $(XML_BASENAME).lib -XML_A = $(XML_BASENAME)_a.lib -XML_A_DLL = $(XML_BASENAME)_a_dll.lib - -# Place where we let the compiler put its output. -BINDIR = bin.msvc -XML_INTDIR = int.msvc -XML_INTDIR_A = int.a.msvc -XML_INTDIR_A_DLL = int.a.dll.msvc -UTILS_INTDIR = int.utils.msvc - -# The preprocessor and its options. -CPP = cl.exe /EP -CPPFLAGS = /nologo /I$(XML_SRCDIR)\include /D "NOLIBTOOL" - -# The compiler and its options. -CC = cl.exe -CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME) -CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) -!if "$(WITH_THREADS)" == "ctls" -CFLAGS = $(CFLAGS) /D "XML_THREAD_LOCAL=__declspec(thread)" -!endif -CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE - -# The linker and its options. -LD = link.exe -LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION) -LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) -LIBS = -!if "$(WITH_ICONV)" == "1" -LIBS = $(LIBS) iconv.lib -!endif -!if "$(WITH_ICU)" == "1" -!if "$(STATIC)" == "1" -LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib -!else -LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib -!endif -!endif -!if "$(WITH_ZLIB)" == "1" -# could be named differently zdll or zlib -# LIBS = $(LIBS) zdll.lib -LIBS = $(LIBS) zlib.lib -!endif -!if "$(WITH_THREADS)" == "posix" -LIBS = $(LIBS) pthreadVC.lib -!endif -!if "$(WITH_MODULES)" == "1" -LIBS = $(LIBS) kernel32.lib -!endif -LIBS = $(LIBS) Bcrypt.lib - -# The archiver and its options. -AR = lib.exe -ARFLAGS = /nologo - -# Optimisation and debug symbols. -!if "$(DEBUG)" == "1" -CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 -LDFLAGS = $(LDFLAGS) /DEBUG -!else -CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 -# commented out as this break VC10 c.f. 634846 -# LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 -LDFLAGS = $(LDFLAGS) -!endif - -# append CFLAGS etc. passed on command line -CPPFLAGS = $(CPPFLAGS) $(EXTRA_CPPFLAGS) -CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) -LDFLAGS = $(LDFLAGS) $(EXTRA_LDFLAGS) - -# Libxml object files. -XML_OBJS = $(XML_INTDIR)\buf.obj\ - $(XML_INTDIR)\c14n.obj\ - $(XML_INTDIR)\catalog.obj\ - $(XML_INTDIR)\chvalid.obj\ - $(XML_INTDIR)\debugXML.obj\ - $(XML_INTDIR)\dict.obj\ - $(XML_INTDIR)\encoding.obj\ - $(XML_INTDIR)\entities.obj\ - $(XML_INTDIR)\error.obj\ - $(XML_INTDIR)\globals.obj\ - $(XML_INTDIR)\hash.obj\ - $(XML_INTDIR)\HTMLparser.obj\ - $(XML_INTDIR)\HTMLtree.obj\ - $(XML_INTDIR)\list.obj\ - $(XML_INTDIR)\nanohttp.obj\ - $(XML_INTDIR)\parser.obj\ - $(XML_INTDIR)\parserInternals.obj\ - $(XML_INTDIR)\pattern.obj\ - $(XML_INTDIR)\relaxng.obj\ - $(XML_INTDIR)\SAX2.obj\ - $(XML_INTDIR)\schematron.obj\ - $(XML_INTDIR)\threads.obj\ - $(XML_INTDIR)\tree.obj\ - $(XML_INTDIR)\uri.obj\ - $(XML_INTDIR)\valid.obj\ - $(XML_INTDIR)\xinclude.obj\ - $(XML_INTDIR)\xlink.obj\ - $(XML_INTDIR)\xmlIO.obj\ - $(XML_INTDIR)\xmlmemory.obj\ - $(XML_INTDIR)\xmlreader.obj\ - $(XML_INTDIR)\xmlregexp.obj\ - $(XML_INTDIR)\xmlmodule.obj\ - $(XML_INTDIR)\xmlsave.obj\ - $(XML_INTDIR)\xmlschemas.obj\ - $(XML_INTDIR)\xmlschemastypes.obj\ - $(XML_INTDIR)\xmlunicode.obj\ - $(XML_INTDIR)\xmlwriter.obj\ - $(XML_INTDIR)\xpath.obj\ - $(XML_INTDIR)\xpointer.obj\ - $(XML_INTDIR)\xmlstring.obj - -# Static libxml object files. -XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\ - $(XML_INTDIR_A)\c14n.obj\ - $(XML_INTDIR_A)\catalog.obj\ - $(XML_INTDIR_A)\chvalid.obj\ - $(XML_INTDIR_A)\debugXML.obj\ - $(XML_INTDIR_A)\dict.obj\ - $(XML_INTDIR_A)\encoding.obj\ - $(XML_INTDIR_A)\entities.obj\ - $(XML_INTDIR_A)\error.obj\ - $(XML_INTDIR_A)\globals.obj\ - $(XML_INTDIR_A)\hash.obj\ - $(XML_INTDIR_A)\HTMLparser.obj\ - $(XML_INTDIR_A)\HTMLtree.obj\ - $(XML_INTDIR_A)\list.obj\ - $(XML_INTDIR_A)\nanohttp.obj\ - $(XML_INTDIR_A)\parser.obj\ - $(XML_INTDIR_A)\parserInternals.obj\ - $(XML_INTDIR_A)\pattern.obj\ - $(XML_INTDIR_A)\relaxng.obj\ - $(XML_INTDIR_A)\SAX2.obj\ - $(XML_INTDIR_A)\schematron.obj\ - $(XML_INTDIR_A)\threads.obj\ - $(XML_INTDIR_A)\tree.obj\ - $(XML_INTDIR_A)\uri.obj\ - $(XML_INTDIR_A)\valid.obj\ - $(XML_INTDIR_A)\xinclude.obj\ - $(XML_INTDIR_A)\xlink.obj\ - $(XML_INTDIR_A)\xmlIO.obj\ - $(XML_INTDIR_A)\xmlmemory.obj\ - $(XML_INTDIR_A)\xmlreader.obj\ - $(XML_INTDIR_A)\xmlregexp.obj\ - $(XML_INTDIR_A)\xmlmodule.obj\ - $(XML_INTDIR_A)\xmlsave.obj\ - $(XML_INTDIR_A)\xmlschemas.obj\ - $(XML_INTDIR_A)\xmlschemastypes.obj\ - $(XML_INTDIR_A)\xmlunicode.obj\ - $(XML_INTDIR_A)\xmlwriter.obj\ - $(XML_INTDIR_A)\xpath.obj\ - $(XML_INTDIR_A)\xpointer.obj\ - $(XML_INTDIR_A)\xmlstring.obj - -# Static libxml object files. -XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\buf.obj\ - $(XML_INTDIR_A_DLL)\c14n.obj\ - $(XML_INTDIR_A_DLL)\catalog.obj\ - $(XML_INTDIR_A_DLL)\chvalid.obj\ - $(XML_INTDIR_A_DLL)\debugXML.obj\ - $(XML_INTDIR_A_DLL)\dict.obj\ - $(XML_INTDIR_A_DLL)\encoding.obj\ - $(XML_INTDIR_A_DLL)\entities.obj\ - $(XML_INTDIR_A_DLL)\error.obj\ - $(XML_INTDIR_A_DLL)\globals.obj\ - $(XML_INTDIR_A_DLL)\hash.obj\ - $(XML_INTDIR_A_DLL)\HTMLparser.obj\ - $(XML_INTDIR_A_DLL)\HTMLtree.obj\ - $(XML_INTDIR_A_DLL)\list.obj\ - $(XML_INTDIR_A_DLL)\nanohttp.obj\ - $(XML_INTDIR_A_DLL)\parser.obj\ - $(XML_INTDIR_A_DLL)\parserInternals.obj\ - $(XML_INTDIR_A_DLL)\pattern.obj\ - $(XML_INTDIR_A_DLL)\relaxng.obj\ - $(XML_INTDIR_A_DLL)\SAX2.obj\ - $(XML_INTDIR_A_DLL)\schematron.obj\ - $(XML_INTDIR_A_DLL)\threads.obj\ - $(XML_INTDIR_A_DLL)\tree.obj\ - $(XML_INTDIR_A_DLL)\uri.obj\ - $(XML_INTDIR_A_DLL)\valid.obj\ - $(XML_INTDIR_A_DLL)\xinclude.obj\ - $(XML_INTDIR_A_DLL)\xlink.obj\ - $(XML_INTDIR_A_DLL)\xmlIO.obj\ - $(XML_INTDIR_A_DLL)\xmlmemory.obj\ - $(XML_INTDIR_A_DLL)\xmlreader.obj\ - $(XML_INTDIR_A_DLL)\xmlregexp.obj\ - $(XML_INTDIR_A_DLL)\xmlmodule.obj\ - $(XML_INTDIR_A_DLL)\xmlsave.obj\ - $(XML_INTDIR_A_DLL)\xmlschemas.obj\ - $(XML_INTDIR_A_DLL)\xmlschemastypes.obj\ - $(XML_INTDIR_A_DLL)\xmlunicode.obj\ - $(XML_INTDIR_A_DLL)\xmlwriter.obj\ - $(XML_INTDIR_A_DLL)\xpath.obj\ - $(XML_INTDIR_A_DLL)\xpointer.obj\ - $(XML_INTDIR_A_DLL)\xmlstring.obj - -# Xmllint and friends executables. -UTILS = $(BINDIR)\xmllint.exe\ - $(BINDIR)\xmlcatalog.exe\ - $(BINDIR)\testModule.exe\ - $(BINDIR)\runtest.exe\ - $(BINDIR)\runsuite.exe\ - $(BINDIR)\runxmlconf.exe\ - $(BINDIR)\testapi.exe\ - $(BINDIR)\testchar.exe\ - $(BINDIR)\testdict.exe\ - $(BINDIR)\testlimits.exe\ - $(BINDIR)\testrecurse.exe - -!if "$(VCMANIFEST)" == "1" -_VC_MANIFEST_EMBED_EXE= if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1 -_VC_MANIFEST_EMBED_DLL= if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2 -!else -_VC_MANIFEST_EMBED_EXE= -_VC_MANIFEST_EMBED_DLL= -!endif - -all : libxml libxmla libxmladll utils - -libxml : $(BINDIR)\$(XML_SO) - -libxmla : $(BINDIR)\$(XML_A) - -libxmladll : $(BINDIR)\$(XML_A_DLL) - -utils : $(UTILS) - -clean : - if exist $(XML_INTDIR) rmdir /S /Q $(XML_INTDIR) - if exist $(XML_INTDIR_A) rmdir /S /Q $(XML_INTDIR_A) - if exist $(XML_INTDIR_A_DLL) rmdir /S /Q $(XML_INTDIR_A_DLL) - if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR) - if exist $(BINDIR) rmdir /S /Q $(BINDIR) - -distclean : clean - if exist config.* del config.* - if exist Makefile del Makefile - -rebuild : clean all - -install-libs : all - if not exist $(INCPREFIX)\libxml2 mkdir $(INCPREFIX)\libxml2 - if not exist $(INCPREFIX)\libxml2\libxml mkdir $(INCPREFIX)\libxml2\libxml - if not exist $(BINPREFIX) mkdir $(BINPREFIX) - if not exist $(LIBPREFIX) mkdir $(LIBPREFIX) - if not exist $(SOPREFIX) mkdir $(SOPREFIX) - copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml2\libxml - copy $(BINDIR)\$(XML_SO) $(SOPREFIX) - copy $(BINDIR)\$(XML_A) $(LIBPREFIX) - copy $(BINDIR)\$(XML_A_DLL) $(LIBPREFIX) - copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX) - -install : install-libs - copy $(BINDIR)\*.exe $(BINPREFIX) - -copy $(BINDIR)\*.pdb $(BINPREFIX) - -install-dist : install-libs - copy $(BINDIR)\xml*.exe $(BINPREFIX) - -copy $(BINDIR)\xml*.pdb $(BINPREFIX) - -# This is a target for me, to make a binary distribution. Not for the public use, -# keep your hands off :-) -BDVERSION = $(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION).$(LIBXML_MICRO_VERSION) -BDPREFIX = $(XML_BASENAME)-$(BDVERSION).win32 -bindist : all - $(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-dist - cscript //NoLogo configure.js genreadme $(XML_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt - - -# Makes the output directory. -$(BINDIR) : - if not exist $(BINDIR) mkdir $(BINDIR) - - -# Makes the libxml intermediate directory. -$(XML_INTDIR) : - if not exist $(XML_INTDIR) mkdir $(XML_INTDIR) - -# Makes the static libxml intermediate directory. -$(XML_INTDIR_A) : - if not exist $(XML_INTDIR_A) mkdir $(XML_INTDIR_A) - -# Makes the static for dll libxml intermediate directory. -$(XML_INTDIR_A_DLL) : - if not exist $(XML_INTDIR_A_DLL) mkdir $(XML_INTDIR_A_DLL) - -# An implicit rule for libxml compilation. -{$(XML_SRCDIR)}.c{$(XML_INTDIR)}.obj:: - $(CC) $(CFLAGS) /Fo$(XML_INTDIR)\ /c $< - -# An implicit rule for static libxml compilation. -{$(XML_SRCDIR)}.c{$(XML_INTDIR_A)}.obj:: - $(CC) $(CFLAGS) /D "LIBXML_STATIC" /Fo$(XML_INTDIR_A)\ /c $< - -# An implicit rule for static for dll libxml compilation. -{$(XML_SRCDIR)}.c{$(XML_INTDIR_A_DLL)}.obj:: - $(CC) $(CFLAGS) /D "LIBXML_STATIC" /D "LIBXML_STATIC_FOR_DLL" /Fo$(XML_INTDIR_A_DLL)\ /c $< - -# Compiles libxml source. Uses the implicit rule for commands. -$(XML_OBJS) : $(XML_INTDIR) - -# Compiles static libxml source. Uses the implicit rule for commands. -$(XML_OBJS_A) : $(XML_INTDIR_A) - -# Compiles static for dll libxml source. Uses the implicit rule for commands. -$(XML_OBJS_A_DLL) : $(XML_INTDIR_A_DLL) - -$(XML_INTDIR)\$(XML_RES) : $(XML_INTDIR) libxml2.rc - rc -Fo $(XML_INTDIR)\$(XML_RES) libxml2.rc - -# Creates the libxml shared object. -$(BINDIR)\$(XML_SO) : $(BINDIR) $(XML_OBJS) $(XML_INTDIR)\$(XML_RES) - $(LD) $(LDFLAGS) /DLL \ - /IMPLIB:$(BINDIR)\$(XML_IMP) /OUT:$(BINDIR)\$(XML_SO) $(XML_OBJS) $(XML_INTDIR)\$(XML_RES) $(LIBS) - @$(_VC_MANIFEST_EMBED_DLL) - -# Creates the libxml archive. -$(BINDIR)\$(XML_A) : $(BINDIR) $(XML_OBJS_A) - $(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(XML_A) $(XML_OBJS_A) - -# Creates the libxml static for dll archive. -$(BINDIR)\$(XML_A_DLL) : $(BINDIR) $(XML_OBJS_A_DLL) - $(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(XML_A_DLL) $(XML_OBJS_A_DLL) - -# Makes the utils intermediate directory. -$(UTILS_INTDIR) : - if not exist $(UTILS_INTDIR) mkdir $(UTILS_INTDIR) - -# An implicit rule for xmllint and friends. -!if "$(STATIC)" == "1" -{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe: - $(CC) /D "LIBXML_STATIC" $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $< - $(LD) $(LDFLAGS) /OUT:$@ $(XML_A) $(LIBS) $(UTILS_INTDIR)\$( - Eric Zurcher - - diff --git a/win32/configure.js b/win32/configure.js deleted file mode 100644 index dd2bb8818..000000000 --- a/win32/configure.js +++ /dev/null @@ -1,668 +0,0 @@ -/* Configure script for libxml, specific for Windows with Scripting Host. - * - * This script will configure the libxml build process and create necessary files. - * Run it with an 'help', or an invalid option and it will tell you what options - * it accepts. - * - * March 2002, Igor Zlatkovic - */ - -/* The source directory, relative to the one where this file resides. */ -var srcDirXml = ".."; -var srcDirUtils = ".."; -/* Base name of what we are building. */ -var baseName = "libxml2"; -/* Configure file which contains the version and the output file where - we can store our build configuration. */ -var libxmlVersionFile = srcDirXml + "\\VERSION"; -var versionFile = ".\\config.msvc"; -/* Input and output files regarding the libxml features. */ -var optsFileIn = srcDirXml + "\\include\\libxml\\xmlversion.h.in"; -var optsFile = srcDirXml + "\\include\\libxml\\xmlversion.h"; -/* Version strings for the binary distribution. Will be filled later - in the code. */ -var verMajor; -var verMinor; -var verMicro; -var verMicroSuffix; -var verCvs; -var useCvsVer = true; -/* Libxml features. */ -var withThreads = "native"; -var withHttp = true; -var withHtml = true; -var withC14n = true; -var withCatalog = true; -var withXpath = true; -var withXptr = true; -var withXinclude = true; -var withIconv = true; -var withIcu = false; -var withIso8859x = false; -var withZlib = false; -var withDebug = true; -var withSchemas = true; -var withSchematron = true; -var withRegExps = true; -var withRelaxNg = true; -var withModules = true; -var withTree = true; -var withReader = true; -var withWriter = true; -var withWalker = true; -var withPattern = true; -var withPush = true; -var withValid = true; -var withSax1 = true; -var withLegacy = true; -var withOutput = true; -var withPython = false; -/* Win32 build options. */ -var dirSep = "\\"; -var compiler = "msvc"; -var cruntime = "/MD"; -var dynruntime = true; -var vcmanifest = false; -var buildDebug = 0; -var buildStatic = 0; -var buildPrefix = "."; -var buildBinPrefix = ""; -var buildIncPrefix = ""; -var buildLibPrefix = ""; -var buildSoPrefix = ""; -var buildInclude = "."; -var buildLib = "."; -/* Local stuff */ -var error = 0; - -/* Helper function, transforms the option variable into the 'Enabled' - or 'Disabled' string. */ -function boolToStr(opt) -{ - if (opt == false) - return "no"; - else if (opt == true) - return "yes"; - error = 1; - return "*** undefined ***"; -} - -/* Helper function, transforms the argument string into a boolean - value. */ -function strToBool(opt) -{ - if (opt == 0 || opt == "no") - return false; - else if (opt == 1 || opt == "yes") - return true; - error = 1; - return false; -} - -/* Displays the details about how to use this script. */ -function usage() -{ - var txt; - txt = "Usage:\n"; - txt += " cscript " + WScript.ScriptName + " \n"; - txt += " cscript " + WScript.ScriptName + " help\n\n"; - txt += "Options can be specified in the form