[ooo-build-commit] Branch 'ooo/OOO320' - 3 commits - dictionaries/diclst expat/download expat/expat-2.0.1.patch expat/expat.patch expat/expat-winapi.patch expat/makefile.mk expat/prj nss/download nss/makefile.mk nss/nss.patch
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Dec 9 20:40:26 PST 2009
dev/null |binary
dictionaries/diclst/makefile.mk | 4
expat/download/expat-2.0.1.tar.gz |binary
expat/expat-2.0.1.patch | 93 +++++++++++++++++++
expat/expat-winapi.patch | 13 ++
expat/expat.patch | 183 --------------------------------------
expat/makefile.mk | 15 +--
expat/prj/d.lst | 3
nss/download/nss_3_12_5.tar.gz |binary
nss/makefile.mk | 2
nss/nss.patch | 41 ++++----
11 files changed, 139 insertions(+), 215 deletions(-)
New commits:
commit cfa9bb41e5b4cb80d510e8458ec0ce19ef1cfdc2
Author: Oliver Bolte <obo at openoffice.org>
Date: Wed Dec 9 09:51:13 2009 +0000
CWS-TOOLING: integrate CWS fontooocleanup32
2009-11-30 21:39:22 +0100 rene r277681 : remove empty msfontextract dir
2009-11-30 21:32:22 +0100 rene r277680 : #i79153# remove remains of FontOOo
diff --git a/dictionaries/diclst/FontOOo.sxw b/dictionaries/diclst/FontOOo.sxw
deleted file mode 100644
index 35f6df3..0000000
Binary files a/dictionaries/diclst/FontOOo.sxw and /dev/null differ
diff --git a/dictionaries/diclst/makefile.mk b/dictionaries/diclst/makefile.mk
index d18da94..879a053 100644
--- a/dictionaries/diclst/makefile.mk
+++ b/dictionaries/diclst/makefile.mk
@@ -45,10 +45,6 @@ all_target: $(MISC)$/$(TARGET).don
DIC2BIN= \
dictionary_head
-.IF "$(WITH_FONTOOO)" == "YES"
-DIC2BIN+= FontOOo.sxw
-.ENDIF
-
$(MISC)$/$(TARGET).don : $(DIC2BIN)
$(COPY) $(foreach,i,$(DIC2BIN) $i) $(BIN)
@$(TOUCH) $@
commit 5e0b79491b051ae5b306d0b48047f332facfe64a
Author: Oliver Bolte <obo at openoffice.org>
Date: Wed Dec 9 09:04:40 2009 +0000
CWS-TOOLING: integrate CWS jl143
2009-11-25 10:16:50 +0100 jl r277624 : #b6900566# updated NSS
2009-11-25 10:15:01 +0100 jl r277623 : #b6900566# updated NSS
diff --git a/nss/download/nss_3_12_4.tar.gz b/nss/download/nss_3_12_4.tar.gz
deleted file mode 100644
index 8b626df..0000000
Binary files a/nss/download/nss_3_12_4.tar.gz and /dev/null differ
diff --git a/nss/download/nss_3_12_5.tar.gz b/nss/download/nss_3_12_5.tar.gz
new file mode 100644
index 0000000..b44521e
Binary files /dev/null and b/nss/download/nss_3_12_5.tar.gz differ
diff --git a/nss/makefile.mk b/nss/makefile.mk
index fabae94..4487f6c 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -45,7 +45,7 @@ all:
@echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'"
.ENDIF
-TARFILE_NAME=nss_3_12_4
+TARFILE_NAME=nss_3_12_5
TARFILE_ROOTDIR=mozilla
PATCH_FILES=nss.patch dtoa.patch
# Note: dtoa.patch fixes https://bugzilla.mozilla.org/show_bug.cgi?id=516396. It can be removed as soon as
diff --git a/nss/nss.patch b/nss/nss.patch
index 32831ea..9605e0d 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -1,5 +1,5 @@
---- misc/mozilla/nsprpub/config/rules.mk 2009-05-02 01:08:01.000000000 +0200
-+++ misc/build/mozilla/nsprpub/config/rules.mk 2009-10-20 17:03:24.733286198 +0200
+--- misc/mozilla/nsprpub/config/rules.mk Sat May 2 01:08:01 2009
++++ misc/build/mozilla/nsprpub/config/rules.mk Wed Nov 25 08:06:47 2009
@@ -350,7 +350,12 @@
ifdef NS_USE_GCC
$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
@@ -14,9 +14,9 @@
endif # GCC
@echo $(RES) finished
endif
---- misc/mozilla/nsprpub/configure 2009-05-08 15:12:31.000000000 +0200
-+++ misc/build/mozilla/nsprpub/configure 2009-10-20 17:03:24.759501457 +0200
-@@ -3898,7 +3898,7 @@
+--- misc/mozilla/nsprpub/configure Mon Nov 23 11:44:15 2009
++++ misc/build/mozilla/nsprpub/configure Wed Nov 25 08:06:47 2009
+@@ -3899,7 +3899,7 @@
PR_MD_CSRCS=linux.c
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=-fPIC
@@ -25,8 +25,8 @@
_OPTIMIZE_FLAGS=-O2
_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that
# combo is not yet good at debugging inlined
---- misc/mozilla/security/coreconf/Darwin.mk 2009-07-30 23:36:02.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/Darwin.mk 2009-10-20 17:03:24.767804881 +0200
+--- misc/mozilla/security/coreconf/Darwin.mk Thu Jul 30 23:36:02 2009
++++ misc/build/mozilla/security/coreconf/Darwin.mk Wed Nov 25 08:06:47 2009
@@ -39,8 +39,12 @@
DEFAULT_COMPILER = cc
@@ -42,8 +42,8 @@
RANLIB = ranlib
ifndef CPU_ARCH
---- misc/mozilla/security/coreconf/Linux.mk 2009-07-30 01:43:41.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/Linux.mk 2009-10-20 17:04:09.972612751 +0200
+--- misc/mozilla/security/coreconf/Linux.mk Mon Nov 23 11:06:29 2009
++++ misc/build/mozilla/security/coreconf/Linux.mk Wed Nov 25 08:11:35 2009
@@ -46,8 +46,11 @@
IMPL_STRATEGY = _PTH
endif
@@ -64,10 +64,10 @@
ZDEFS_FLAG = -Wl,-z,defs
-DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
+DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN'
- DSO_LDFLAGS =
LDFLAGS += $(ARCHFLAG)
-@@ -161,8 +164,13 @@
+ # INCLUDES += -I/usr/include -Y/usr/include/linux
+@@ -160,8 +163,13 @@
#
CPU_TAG = _$(CPU_ARCH)
@@ -81,8 +81,8 @@
# The -rpath '$$ORIGIN' linker option instructs this library to search for its
# dependencies in the same directory where it resides.
---- misc/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/SunOS5.mk 2009-10-20 17:03:24.786509911 +0200
+--- misc/mozilla/security/coreconf/SunOS5.mk Thu Jun 11 02:55:32 2009
++++ misc/build/mozilla/security/coreconf/SunOS5.mk Wed Nov 25 08:06:47 2009
@@ -89,8 +89,12 @@
# OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
endif
@@ -98,8 +98,8 @@
ASFLAGS += -Wa,-P
OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
ifndef BUILD_OPT
---- misc/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/arch.mk 2009-10-20 17:03:24.807236644 +0200
+--- misc/mozilla/security/coreconf/arch.mk Fri Jun 5 04:14:49 2009
++++ misc/build/mozilla/security/coreconf/arch.mk Wed Nov 25 08:06:47 2009
@@ -324,7 +324,12 @@
# IMPL_STRATEGY may be defined too.
#
@@ -114,8 +114,8 @@
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
ifndef BUILD_OPT
---- misc/mozilla/security/coreconf/rules.mk 2009-08-11 05:23:39.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/rules.mk 2009-10-20 17:03:24.815121351 +0200
+--- misc/mozilla/security/coreconf/rules.mk Tue Aug 11 05:23:39 2009
++++ misc/build/mozilla/security/coreconf/rules.mk Wed Nov 25 08:06:47 2009
@@ -355,7 +355,12 @@
ifdef NS_USE_GCC
$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
@@ -130,9 +130,9 @@
endif
@echo $(RES) finished
endif
---- misc/mozilla/security/nss/cmd/platlibs.mk 2009-06-18 01:01:48.000000000 +0200
-+++ misc/build/mozilla/security/nss/cmd/platlibs.mk 2009-10-20 17:03:24.831220397 +0200
-@@ -41,27 +41,28 @@
+--- misc/mozilla/security/nss/cmd/platlibs.mk Thu Jun 18 01:01:48 2009
++++ misc/build/mozilla/security/nss/cmd/platlibs.mk Wed Nov 25 08:06:47 2009
+@@ -41,12 +41,13 @@
ifeq ($(OS_ARCH), SunOS)
ifeq ($(BUILD_SUN_PKG), 1)
ifeq ($(USE_64), 1)
@@ -149,6 +149,7 @@
endif
endif
+@@ -53,15 +54,15 @@
ifeq ($(OS_ARCH), Linux)
ifeq ($(BUILD_SUN_PKG), 1)
ifeq ($(USE_64), 1)
commit 487afa5a5e64b6f74708b9162a44c09e141e9709
Author: Oliver Bolte <obo at openoffice.org>
Date: Wed Dec 9 07:00:10 2009 +0000
CWS-TOOLING: integrate CWS expat201
2009-11-16 09:53:37 +0100 cmc r277511 : #i106889# tweak api defs under windows
2009-11-13 12:06:34 +0100 cmc r277499 : #i106889# upgrade expat to 2.0.1
diff --git a/expat/download/expat-2.0.1.tar.gz b/expat/download/expat-2.0.1.tar.gz
new file mode 100644
index 0000000..f42c713
Binary files /dev/null and b/expat/download/expat-2.0.1.tar.gz differ
diff --git a/expat/download/expat.zip b/expat/download/expat.zip
deleted file mode 100755
index 872f5a9..0000000
Binary files a/expat/download/expat.zip and /dev/null differ
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
new file mode 100644
index 0000000..1be45d1
--- /dev/null
+++ b/expat/expat-2.0.1.patch
@@ -0,0 +1,93 @@
+--- misc/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008
+@@ -1 +1,89 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: header.hxx,v $
++#
++# $Revision: 1.1 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org. If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=expat
++TARGET=expat
++LIBTARGET=NO
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++# --- Settings -----------------------------------------------------
++.INCLUDE : settings.mk
++# --- Files --------------------------------------------------------
++
++CFLAGS+=-I..
++
++.IF "$(OS)"=="WNT"
++CDEFS+=-DCOMPILED_FROM_DSP
++.ELSE
++CDEFS+=-DHAVE_EXPAT_CONFIG_H
++.ENDIF
++
++SLOFILES=$(SLO)$/xmlparse.obj \
++ $(SLO)$/xmlrole.obj \
++ $(SLO)$/xmltok.obj
++
++SECOND_BUILD=UNICODE
++UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
++UNICODECDEFS+=-DXML_UNICODE
++
++LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
++LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
++LIB1OBJFILES=$(SLO)$/xmlparse.obj
++
++LIB2ARCHIV=$(LB)$/lib$(TARGET)_xmlparse.a
++LIB2TARGET=$(SLB)$/$(TARGET)_xmlparse.lib
++LIB2OBJFILES =$(REAL_UNICODE_SLOFILES)
++
++LIB3ARCHIV=$(LB)$/lib$(TARGET)_xmltok.a
++LIB3TARGET=$(SLB)$/$(TARGET)_xmltok.lib
++LIB3OBJFILES=$(SLO)$/xmlrole.obj $(SLO)$/xmltok.obj
++
++.IF "$(BUILD_X64)"!=""
++# ---------------- X64 stuff special ---------------------
++# use UNICODE only because shell/shlxthandler
++# doesn't link against ascii_expat_xmlparse
++#---------------------------------------------------------
++SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \
++ $(SLO_X64)$/xmlrole.obj \
++ $(SLO_X64)$/xmltok.obj
++CDEFS_X64+=-DXML_UNICODE
++CFLAGS_X64+=-I..
++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
++LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
++LIB3TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
++LIB3OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
++.ENDIF # "$(BUILD_X64)"!=""
++
++# --- Targets ------------------------------------------------------
++.INCLUDE : set_wntx64.mk
++.INCLUDE : target.mk
++.INCLUDE : tg_wntx64.mk
diff --git a/expat/expat-winapi.patch b/expat/expat-winapi.patch
new file mode 100644
index 0000000..dfac519
--- /dev/null
+++ b/expat/expat-winapi.patch
@@ -0,0 +1,13 @@
+--- misc/expat-2.0.1/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000
++++ misc/build/expat-2.0.1/lib/expat_external.h 2009-11-16 08:53:34.703125000 +0000
+@@ -7,10 +7,6 @@
+
+ /* External API definitions */
+
+-#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
+-#define XML_USE_MSC_EXTENSIONS 1
+-#endif
+-
+ /* Expat tries very hard to make the API boundary very specifically
+ defined. There are two macros defined to control this boundary;
+ each of these can be defined before including this header to
diff --git a/expat/expat.patch b/expat/expat.patch
deleted file mode 100644
index 4e5336c..0000000
--- a/expat/expat.patch
+++ /dev/null
@@ -1,183 +0,0 @@
---- misc/expat/makefile.mk Wed Aug 20 14:33:55 2008
-+++ misc/build/expat/makefile.mk Wed Aug 20 14:26:42 2008
-@@ -1,1 +1,34 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: header.hxx,v $
-+#
-+# $Revision: 1.1 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+target:
-+ cd xmltok && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+ cd xmlparse && $(MAKE) $(MFLAGS) $(CALLMACROS)
---- misc/expat/xmlparse/makefile.mk Wed Aug 20 14:33:54 2008
-+++ misc/build/expat/xmlparse/makefile.mk Wed Aug 20 14:40:52 2008
-@@ -1,1 +1,73 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: header.hxx,v $
-+#
-+# $Revision: 1.1 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=expat
-+TARGET=expat_xmlparse
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+.INCLUDE : settings.mk
-+# --- Files --------------------------------------------------------
-+
-+CFLAGS+=-I..$/xmltok
-+
-+SLOFILES= $(SLO)$/xmlparse.obj
-+
-+SECOND_BUILD=UNICODE
-+UNICODE_SLOFILES= $(SLO)$/xmlparse.obj
-+UNICODECDEFS+=-DXML_UNICODE
-+
-+LIB1ARCHIV= $(LB)$/libascii_$(TARGET).a
-+LIB1TARGET= $(SLB)$/ascii_$(TARGET).lib
-+LIB1OBJFILES = $(SLOFILES)
-+
-+LIB2ARCHIV= $(LB)$/lib$(TARGET).a
-+LIB2TARGET= $(SLB)$/$(TARGET).lib
-+LIB2OBJFILES = $(REAL_UNICODE_SLOFILES)
-+
-+.IF "$(BUILD_X64)"!=""
-+# ---------------- X64 stuff special ---------------------
-+# use UNICODE only because shell/shlxthandler
-+# doesn't link against ascii_expat_xmlparse
-+#---------------------------------------------------------
-+SLOFILES_X64= $(SLO_X64)$/xmlparse.obj
-+CDEFS_X64+=-DXML_UNICODE
-+CFLAGS_X64+=-I..$/xmltok
-+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
-+LIB1OBJFILES_X64=$(SLOFILES_X64)
-+.ENDIF # "$(BUILD_X64)"!=""
-+
-+# --- Targets ------------------------------------------------------
-+.INCLUDE : set_wntx64.mk
-+.INCLUDE : target.mk
-+.INCLUDE : tg_wntx64.mk
---- misc/expat/xmltok/makefile.mk Wed Aug 20 14:33:54 2008
-+++ misc/build/expat/xmltok/makefile.mk Wed Aug 20 14:33:12 2008
-@@ -1,1 +1,64 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: header.hxx,v $
-+#
-+# $Revision: 1.1 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=expat
-+TARGET=expat_xmltok
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+.INCLUDE : settings.mk
-+# --- Files --------------------------------------------------------
-+
-+SLOFILES = \
-+ $(SLO)$/xmlrole.obj\
-+ $(SLO)$/xmltok.obj
-+
-+LIB1ARCHIV= $(LB)$/lib$(TARGET).a
-+LIB1TARGET= $(SLB)$/$(TARGET).lib
-+LIB1OBJFILES = $(SLOFILES)
-+
-+.IF "$(BUILD_X64)"!=""
-+# ---------------- X64 stuff special ---------------------
-+SLOFILES_X64= \
-+ $(SLO_X64)$/xmlrole.obj\
-+ $(SLO_X64)$/xmltok.obj
-+
-+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
-+LIB1OBJFILES_X64=$(SLOFILES_X64)
-+.ENDIF # "$(BUILD_X64)"!=""
-+
-+# --- Targets ------------------------------------------------------
-+.INCLUDE : set_wntx64.mk
-+.INCLUDE : target.mk
-+.INCLUDE : tg_wntx64.mk
diff --git a/expat/makefile.mk b/expat/makefile.mk
index 1b5abd3..a7e9a6f 100644
--- a/expat/makefile.mk
+++ b/expat/makefile.mk
@@ -46,15 +46,19 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=expat
-ADDITIONAL_FILES=xmlparse$/makefile.mk xmltok$/makefile.mk makefile.mk
-
-PATCH_FILES=expat.patch
+TARFILE_NAME=expat-2.0.1
+ADDITIONAL_FILES=lib$/makefile.mk
+PATCH_FILES=expat-2.0.1.patch \
+ expat-winapi.patch
CONFIGURE_DIR=
+.IF "$(OS)"=="WNT"
CONFIGURE_ACTION=
+.ELSE
+CONFIGURE_ACTION=.$/configure
+.ENDIF
-BUILD_DIR=
+BUILD_DIR=lib
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
# --- Targets ------------------------------------------------------
@@ -62,4 +66,3 @@ BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
-
diff --git a/expat/prj/d.lst b/expat/prj/d.lst
index e20e81e..62e29c2 100644
--- a/expat/prj/d.lst
+++ b/expat/prj/d.lst
@@ -1,6 +1,7 @@
mkdir: %_DEST%\inc%_EXT%\external\expat
mkdir: %_DEST%\lib%_EXT%\x64
-..\%__SRC%\misc\build\expat\xmlparse\xmlparse.h %_DEST%\inc%_EXT%\external\expat\xmlparse.h
+..\%__SRC%\misc\build\expat-2.0.1\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
+..\%__SRC%\misc\build\expat-2.0.1\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib
..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib
..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib
More information about the ooo-build-commit
mailing list