diff options
Diffstat (limited to 'expat')
| -rw-r--r-- | expat/expat-2.0.1.patch | 97 | ||||
| -rw-r--r-- | expat/expat-winapi.patch | 13 | ||||
| -rw-r--r-- | expat/expat.patch | 183 | ||||
| -rw-r--r-- | expat/makefile.mk | 15 | ||||
| -rw-r--r-- | expat/prj/d.lst | 3 |
5 files changed, 121 insertions, 190 deletions
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch new file mode 100644 index 000000000000..9ed7413d40de --- /dev/null +++ b/expat/expat-2.0.1.patch @@ -0,0 +1,97 @@ +--- 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,93 @@ +-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 ++ ++.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!="" ++CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY ++.ENDIF # "$(OS)"=="MACOSX" ++ ++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 -DCOMPILED_FROM_DSP ++CFLAGS_X64+=-I.. ++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib ++LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj ++LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib ++LIB2OBJFILES_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 000000000000..dfac519f2ed2 --- /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 4e5336c55786..000000000000 --- 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 1b5abd365ef3..a7e9a6fe5d68 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 e20e81ed4bda..62e29c2c6005 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 |