expat/expat.patch

   1 --- misc/expat/makefile.mk      Wed Aug 20 14:33:55 2008
   2 +++ misc/build/expat/makefile.mk        Wed Aug 20 14:26:42 2008
   3 @@ -1,1 +1,34 @@
   4 -dummy
   5 +#*************************************************************************
   6 +#
   7 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   8 +#
   9 +# Copyright 2008 by Sun Microsystems, Inc.
  10 +#
  11 +# OpenOffice.org - a multi-platform office productivity suite
  12 +#
  13 +# $RCSfile: header.hxx,v $
  14 +#
  15 +# $Revision: 1.1 $
  16 +#
  17 +# This file is part of OpenOffice.org.
  18 +#
  19 +# OpenOffice.org is free software: you can redistribute it and/or modify
  20 +# it under the terms of the GNU Lesser General Public License version 3
  21 +# only, as published by the Free Software Foundation.
  22 +#
  23 +# OpenOffice.org is distributed in the hope that it will be useful,
  24 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  25 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  26 +# GNU Lesser General Public License version 3 for more details
  27 +# (a copy is included in the LICENSE file that accompanied this code).
  28 +#
  29 +# You should have received a copy of the GNU Lesser General Public License
  30 +# version 3 along with OpenOffice.org.  If not, see
  31 +# <http://www.openoffice.org/license.html>
  32 +# for a copy of the LGPLv3 License.
  33 +#
  34 +#*************************************************************************
  35 +
  36 +target:
  37 +       cd xmltok && $(MAKE) $(MFLAGS) $(CALLMACROS)
  38 +       cd xmlparse && $(MAKE) $(MFLAGS) $(CALLMACROS)
  39 --- misc/expat/xmlparse/makefile.mk     Wed Aug 20 14:33:54 2008
  40 +++ misc/build/expat/xmlparse/makefile.mk       Wed Aug 20 14:40:52 2008
  41 @@ -1,1 +1,73 @@
  42 -dummy
  43 +#*************************************************************************
  44 +#
  45 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  46 +#
  47 +# Copyright 2008 by Sun Microsystems, Inc.
  48 +#
  49 +# OpenOffice.org - a multi-platform office productivity suite
  50 +#
  51 +# $RCSfile: header.hxx,v $
  52 +#
  53 +# $Revision: 1.1 $
  54 +#
  55 +# This file is part of OpenOffice.org.
  56 +#
  57 +# OpenOffice.org is free software: you can redistribute it and/or modify
  58 +# it under the terms of the GNU Lesser General Public License version 3
  59 +# only, as published by the Free Software Foundation.
  60 +#
  61 +# OpenOffice.org is distributed in the hope that it will be useful,
  62 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  63 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  64 +# GNU Lesser General Public License version 3 for more details
  65 +# (a copy is included in the LICENSE file that accompanied this code).
  66 +#
  67 +# You should have received a copy of the GNU Lesser General Public License
  68 +# version 3 along with OpenOffice.org.  If not, see
  69 +# <http://www.openoffice.org/license.html>
  70 +# for a copy of the LGPLv3 License.
  71 +#
  72 +#*************************************************************************
  73 +PRJ=..$/..$/..$/..$/..
  74 +
  75 +PRJNAME=expat
  76 +TARGET=expat_xmlparse
  77 +LIBTARGET=NO
  78 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
  79 +
  80 +# --- Settings -----------------------------------------------------
  81 +.INCLUDE :  settings.mk
  82 +# --- Files --------------------------------------------------------
  83 +
  84 +CFLAGS+=-I..$/xmltok
  85 +
  86 +SLOFILES=      $(SLO)$/xmlparse.obj
  87 +
  88 +SECOND_BUILD=UNICODE
  89 +UNICODE_SLOFILES=      $(SLO)$/xmlparse.obj
  90 +UNICODECDEFS+=-DXML_UNICODE
  91 +
  92 +LIB1ARCHIV=   $(LB)$/libascii_$(TARGET).a
  93 +LIB1TARGET= $(SLB)$/ascii_$(TARGET).lib
  94 +LIB1OBJFILES = $(SLOFILES)
  95 +
  96 +LIB2ARCHIV=   $(LB)$/lib$(TARGET).a
  97 +LIB2TARGET= $(SLB)$/$(TARGET).lib
  98 +LIB2OBJFILES = $(REAL_UNICODE_SLOFILES)
  99 +
 100 +.IF "$(BUILD_X64)"!=""
 101 +# ---------------- X64 stuff special ---------------------
 102 +#  use UNICODE only because shell/shlxthandler
 103 +#  doesn't link against ascii_expat_xmlparse
 104 +#---------------------------------------------------------
 105 +SLOFILES_X64= $(SLO_X64)$/xmlparse.obj
 106 +CDEFS_X64+=-DXML_UNICODE
 107 +CFLAGS_X64+=-I..$/xmltok
 108 +LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
 109 +LIB1OBJFILES_X64=$(SLOFILES_X64)
 110 +.ENDIF # "$(BUILD_X64)"!=""
 111 +
 112 +# --- Targets ------------------------------------------------------
 113 +.INCLUDE :  set_wntx64.mk
 114 +.INCLUDE :     target.mk
 115 +.INCLUDE :  tg_wntx64.mk
 116 --- misc/expat/xmltok/makefile.mk       Wed Aug 20 14:33:54 2008
 117 +++ misc/build/expat/xmltok/makefile.mk Wed Aug 20 14:33:12 2008
 118 @@ -1,1 +1,64 @@
 119 -dummy
 120 +#*************************************************************************
 121 +#
 122 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 123 +#
 124 +# Copyright 2008 by Sun Microsystems, Inc.
 125 +#
 126 +# OpenOffice.org - a multi-platform office productivity suite
 127 +#
 128 +# $RCSfile: header.hxx,v $
 129 +#
 130 +# $Revision: 1.1 $
 131 +#
 132 +# This file is part of OpenOffice.org.
 133 +#
 134 +# OpenOffice.org is free software: you can redistribute it and/or modify
 135 +# it under the terms of the GNU Lesser General Public License version 3
 136 +# only, as published by the Free Software Foundation.
 137 +#
 138 +# OpenOffice.org is distributed in the hope that it will be useful,
 139 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 140 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 141 +# GNU Lesser General Public License version 3 for more details
 142 +# (a copy is included in the LICENSE file that accompanied this code).
 143 +#
 144 +# You should have received a copy of the GNU Lesser General Public License
 145 +# version 3 along with OpenOffice.org.  If not, see
 146 +# <http://www.openoffice.org/license.html>
 147 +# for a copy of the LGPLv3 License.
 148 +#
 149 +#*************************************************************************
 150 +
 151 +PRJ=..$/..$/..$/..$/..
 152 +
 153 +PRJNAME=expat
 154 +TARGET=expat_xmltok
 155 +LIBTARGET=NO
 156 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 157 +
 158 +# --- Settings -----------------------------------------------------
 159 +.INCLUDE :  settings.mk
 160 +# --- Files --------------------------------------------------------
 161 +
 162 +SLOFILES =  \
 163 +       $(SLO)$/xmlrole.obj\
 164 +       $(SLO)$/xmltok.obj
 165 +
 166 +LIB1ARCHIV= $(LB)$/lib$(TARGET).a
 167 +LIB1TARGET= $(SLB)$/$(TARGET).lib
 168 +LIB1OBJFILES = $(SLOFILES)
 169 +
 170 +.IF "$(BUILD_X64)"!=""
 171 +# ---------------- X64 stuff special ---------------------
 172 +SLOFILES_X64=        \
 173 +     $(SLO_X64)$/xmlrole.obj\
 174 +     $(SLO_X64)$/xmltok.obj
 175 +
 176 +LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
 177 +LIB1OBJFILES_X64=$(SLOFILES_X64)
 178 +.ENDIF # "$(BUILD_X64)"!=""
 179 +
 180 +# --- Targets ------------------------------------------------------
 181 +.INCLUDE :  set_wntx64.mk
 182 +.INCLUDE :     target.mk
 183 +.INCLUDE :  tg_wntx64.mk