INTEGRATION: CWS obo33 (1.8.8); FILE MERGED

2008/08/20 13:45:09 obo 1.8.8.1: #i92950# Changes for 64 bit Vista shell extension

1 files changed, 183 insertions, 0 deletions

diff --git a/expat/expat.patch b/expat/expat.patch
new file mode 100644
index 000000000000..4e5336c55786
--- /dev/null
+++ b/expat/expat.patch
@@ -0,0 +1,183 @@
+--- 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