Author: pfg
Date: Tue Oct 2 01:27:43 2012
New Revision: 1392706
URL: http://svn.apache.org/viewvc?rev=1392706&view=rev
Log:
Update internal expat to version 2.1.0.
Added:
incubator/ooo/trunk/main/expat/expat-2.1.0.patch
Removed:
incubator/ooo/trunk/ext_sources/ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
incubator/ooo/trunk/main/expat/expat-2.0.1.patch
Modified:
incubator/ooo/trunk/main/expat/expat-winapi.patch
incubator/ooo/trunk/main/expat/makefile.mk
incubator/ooo/trunk/main/expat/prj/d.lst
incubator/ooo/trunk/main/external_deps.lst
Added: incubator/ooo/trunk/main/expat/expat-2.1.0.patch
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/expat/expat-2.1.0.patch?rev=1392706&view=auto
==============================================================================
--- incubator/ooo/trunk/main/expat/expat-2.1.0.patch (added)
+++ incubator/ooo/trunk/main/expat/expat-2.1.0.patch Tue Oct 2 01:27:43 2012
@@ -0,0 +1,87 @@
+--- misc/expat-2.1.0/lib/makefile.mk Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.1.0/lib/makefile.mk Wed Aug 20 14:26:42 2008
+@@ -1 +1,83 @@
+-dummy
++#**************************************************************
++#
++# Licensed to the Apache Software Foundation (ASF) under one
++# or more contributor license agreements. See the NOTICE file
++# distributed with this work for additional information
++# regarding copyright ownership. The ASF licenses this file
++# to you under the Apache License, Version 2.0 (the
++# "License"); you may not use this file except in compliance
++# with the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing,
++# software distributed under the License is distributed on an
++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# KIND, either express or implied. See the License for the
++# specific language governing permissions and limitations
++# under the 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
Modified: incubator/ooo/trunk/main/expat/expat-winapi.patch
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/expat/expat-winapi.patch?rev=1392706&r1=1392705&r2=1392706&view=diff
==============================================================================
--- incubator/ooo/trunk/main/expat/expat-winapi.patch (original)
+++ incubator/ooo/trunk/main/expat/expat-winapi.patch Tue Oct 2 01:27:43 2012
@@ -1,5 +1,5 @@
---- 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
+--- misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.375000000
+0000
++++ misc/build/expat-2.1.0/lib/expat_external.h 2009-11-16
08:53:34.703125000 +0000
@@ -7,10 +7,6 @@
/* External API definitions */
Modified: incubator/ooo/trunk/main/expat/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/expat/makefile.mk?rev=1392706&r1=1392705&r2=1392706&view=diff
==============================================================================
--- incubator/ooo/trunk/main/expat/makefile.mk (original)
+++ incubator/ooo/trunk/main/expat/makefile.mk Tue Oct 2 01:27:43 2012
@@ -38,10 +38,10 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=expat-2.0.1
-TARFILE_MD5=ee8b492592568805593f81f8cdf2a04c
+TARFILE_NAME=expat-2.1.0
+TARFILE_MD5=dd7dab7a5fea97d2a6a43f511449b7cd
ADDITIONAL_FILES=lib$/makefile.mk
-PATCH_FILES=expat-2.0.1.patch \
+PATCH_FILES=$(TARFILE_NAME).patch \
expat-winapi.patch
CONFIGURE_DIR=
Modified: incubator/ooo/trunk/main/expat/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/expat/prj/d.lst?rev=1392706&r1=1392705&r2=1392706&view=diff
==============================================================================
--- incubator/ooo/trunk/main/expat/prj/d.lst (original)
+++ incubator/ooo/trunk/main/expat/prj/d.lst Tue Oct 2 01:27:43 2012
@@ -1,7 +1,7 @@
mkdir: %_DEST%\inc%_EXT%\external\expat
mkdir: %_DEST%\lib%_EXT%\x64
-..\%__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%\misc\build\expat-2.1.0\lib\expat.h
%_DEST%\inc%_EXT%\external\expat.h
+..\%__SRC%\misc\build\expat-2.1.0\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
Modified: incubator/ooo/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external_deps.lst?rev=1392706&r1=1392705&r2=1392706&view=diff
==============================================================================
--- incubator/ooo/trunk/main/external_deps.lst (original)
+++ incubator/ooo/trunk/main/external_deps.lst Tue Oct 2 01:27:43 2012
@@ -235,18 +235,18 @@ if (SYSTEM_VIGRA != YES)
URL1 = http://hci.iwr.uni-heidelberg.de/vigra/vigra1.6.0.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+if (SYSTEM_EXPAT != YES)
+ MD5 = dd7dab7a5fea97d2a6a43f511449b7cd
+ name = expat-2.1.0.tar.gz
+ URL1 =
http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
+ URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+
if (SYSTEM_CURL != YES)
MD5 = ecb2e37e45c9933e2a963cabe03670ab
name = curl-7.19.7.tar.gz
URL1 = http://curl.haxx.se/download/curl-7.19.7.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-if (SYSTEM_EXPAT != YES)
- MD5 = ee8b492592568805593f81f8cdf2a04c
- name = expat-2.0.1.tar.gz
- URL1 =
http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download
- URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
if (WITH_CATA_FONTS == YES)
MD5 = f872f4ac066433d8ff92f5e316b36ff9
name = dejavu-fonts-ttf-2.33.zip
