Re: commit - [HEAD] expat upgrade

From: Kenneth J. Davis (jeremyd@computer.org)
Date: Fri Jan 31 2003 - 15:52:51 EST

  • Next message: Michael D. Pritchett: "Re: commit - [HEAD] expat upgrade"

    This broke the stable build as it still tries to build on Windows
    via ./configure, which (at least for me) fails to generate the
    expat/lib/expat.h file from expat/lib/expat.h.in
    Does this work on a Unix platform correctly?

    Anyway, since expat is shared between head & stable, would
    anyone (Hub?) mind if I updated STABLE src/config/require/xp/Makefile
    so it is like the Head variant and builds expat via the
    Makefile.abi on Windows instead of trying via ./configure?

    (If I can figure out why my tinderbox client doesn't show up
     you can see the pretty red busted log. :-)

    Thanks,
    Jeremy

    ------ That is change current STABLE -------

            @if [ -d $(ABI_ROOT)/../expat ]; then \
                    echo "Found expat in peer directory"; \
                    if [ ! -r $(ABI_ROOT)/../expat/Makefile ]; then \
                            cd $(ABI_ROOT)/../expat; \
                            $(EXPAT_PLATFORM_DEFS) ./configure --disable-shared --enable-static; \
                            $(MAKE) ABI_ROOT=$(ABI_ROOT) -C $(ABI_ROOT)/../expat; \
                    fi; \
            elif [ -f /usr/include/expat.h -o -f /usr/local/include/expat.h ]; then \
    ...[cut]...
            fi

    ------- To build Windows using preconfigured stuff -----------

    +#use pregenerated Makefile on Windows, else configure generated one
    +ifeq ($(OS_NAME),WIN32)
    + @if [ -d $(ABI_ROOT)/../expat ]; then \
    + echo "Found expat in peer directory"; \
    + cd $(ABI_ROOT)/../expat; \
    + $(ABICOPY) config.h.msvc config.h; \
    + $(ABICOPY) expat_config.h.msvc expat_config.h; \
    + $(ABICOPY) lib/winconfig.h lib/config.h; \
    + $(ABICOPY) lib/expat.h.in lib/expat.h; \
    + $(MAKE) -fMakefile.abi ABI_ROOT=$(ABI_ROOT) -C $(ABI_ROOT)/../expat; \
    + else \
    + echo "ERROR -- peer expat not found"; \
    + exit 1; \
    + fi
    +else
             @if [ -d $(ABI_ROOT)/../expat ]; then \
                     echo "Found expat in peer directory"; \
                     if [ ! -r $(ABI_ROOT)/../expat/Makefile ]; then \
                             cd $(ABI_ROOT)/../expat; \
                             $(EXPAT_PLATFORM_DEFS) ./configure --disable-shared --enable-static; \
                             $(MAKE) ABI_ROOT=$(ABI_ROOT) -C $(ABI_ROOT)/../expat; \
                     fi; \
             elif [ -f /usr/include/expat.h -o -f /usr/local/include/expat.h ]; then \
    ...[cut]...
             fi
    +endif

    --------- ok to commit to stable branch? -------------

    This archive was generated by hypermail 2.1.4 : Fri Jan 31 2003 - 15:58:14 EST