From fae8f0f1439964e4b3cbf1dae5bd91bf4924ebfd Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Sun, 30 Nov 2008 07:56:43 +0000 Subject: CWS-TOOLING: integrate CWS cairosource01 2008-11-28 13:29:24 +0100 rene r264546 : i96634# add patch from kendy fixing --disable-mozilla with the new mozbootstrap stuff 2008-11-28 12:43:54 +0100 rene r264540 : revert commit to wrong branch 2008-11-28 11:52:54 +0100 rene r264537 : #ii10000# work around gcc taking hours/OOMing with qnametostr.cxx 2008-11-24 21:40:36 +0100 mox r264268 : Remove the support for pre-built binaries, now that cairo can be built from source 2008-11-24 21:39:01 +0100 mox r264267 : Remove the support for pre-built binaries, now that cairo can be built from source 2008-11-14 22:25:27 +0100 mox r263699 : Fix build breakers on vanilla Win32 2008-11-10 19:45:48 +0100 mox r263538 : Try to fix build breaker 2008-11-09 10:48:43 +0100 mox r263493 : Full pixman_CFLAGS and pixman_LIBS are needed for configure to work properly on UNX. 2008-11-08 20:24:06 +0100 mox r263491 : Patch for pixman is still needed to fix build breakers in VM with Linux/FreeBSD 2008-11-05 21:29:44 +0100 mox r263358 : CWS-TOOLING: rebase CWS cairosource01 to trunk@263288 (milestone: DEV300:m35) 2008-11-03 20:36:48 +0100 mox r263306 : Update cairo sources missing from migration. 2008-11-03 20:33:17 +0100 mox r263305 : Migrate CWS cairosource01 to SVN. --- external/cairo/makefile.mk | 119 --------------------------------------------- external/prj/build.lst | 1 - external/prj/d.lst | 12 ----- 3 files changed, 132 deletions(-) delete mode 100644 external/cairo/makefile.mk diff --git a/external/cairo/makefile.mk b/external/cairo/makefile.mk deleted file mode 100644 index 28815aa12fdd..000000000000 --- a/external/cairo/makefile.mk +++ /dev/null @@ -1,119 +0,0 @@ -#************************************************************************* -# -# 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: makefile.mk,v $ -# -# $Revision: 1.3.16.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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=cairo -TARGET=cairo_unzip - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(SYSTEM_CAIRO)" == "YES" - -dummy: - @echo "Nothing to do, using system cairo." - -.ELIF "$(ENABLE_CAIRO)" == "" - -dummy: - @echo "Nothing to do (Cairo not enabled)." - -.ELIF "$(BUILD_CAIRO)" != "" - -dummy: - @echo "Not using prebuilt binaries, cairo will be built from source." - -.ELIF "$(OS)" != "MACOSX" && "$(GUI)" != "WNT" - -dummy: - @echo "Cairo prebuilt not supported on this platform." - -.ELSE # unpack prebuild cairo libraries -.INCLUDE : target.mk - -ALLTAR: \ - $(MISC)$/unpacked_$(TARGET)_inc \ - $(MISC)$/unpacked_$(TARGET)_lib - -.IF "$(OS)" == "MACOSX" - -# On Mac OS X the Cairo prebuilt binary is for native (Quartz) cairo only. -# Intel library is MACOSXGCCI -# -CAIROURL=http://porting.openoffice.org/mac/prebuilt -CAIROINC=cairo-$(OS)$(COM)$(CPU)-inc.tar.gz -CAIROLIB=cairo-$(OS)$(COM)$(CPU)-lib.tar.gz - -$(MISC)$/unpacked_$(TARGET)_lib : $(CAIROLIB) - $(COPY) $< $(MISC)$/$< - cd $(LB) && tar xvzf ..$/misc$/$< - $(TOUCH) $@ - chmod -R 775 $(LB) - -$(MISC)$/unpacked_$(TARGET)_inc : $(CAIROINC) - $(COPY) $< $(MISC)$/$< - cd $(INCCOM) && tar xvzf ..$/misc$/$< - $(TOUCH) $@ - chmod -R 775 $(INCCOM) - - -.ELIF "$(GUI)" == "WNT" - -CAIROURL=http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies -CAIROINC=cairo-dev-1.4.8-win32-only.zip -CAIROLIB=cairo-1.4.8-win32-only.zip - -$(MISC)$/unpacked_$(TARGET)_lib : $(CAIROLIB) - unzip -o -d $(MISC)$/cairo$/ $< && \ - $(COPY) -r $(MISC)$/cairo$/bin$/*cairo*.* $(LB)$/ && \ - $(TOUCH) $@ - -$(MISC)$/unpacked_$(TARGET)_inc : $(CAIROINC) - unzip -o -d $(MISC)$/cairo$/ $< && \ - $(COPY) -r $(MISC)$/cairo$/include$/cairo $(INCCOM)$/ && \ - $(COPY) -r $(MISC)$/cairo$/lib$/*cairo*.* $(LB)$/ && \ - $(TOUCH) $@ - -.ENDIF # WNT - -$(CAIROLIB) : - curl $(CAIROURL)/$(CAIROLIB) > $@ - -$(CAIROINC) : - curl $(CAIROURL)/$(CAIROINC) > $@ - - -.ENDIF # unpack prebuild cairo libraries - diff --git a/external/prj/build.lst b/external/prj/build.lst index 870826def6b5..3fc0a6522be3 100644 --- a/external/prj/build.lst +++ b/external/prj/build.lst @@ -4,4 +4,3 @@ el external\glibc nmake - all el_glibc NULL el external\gpc nmake - all el_gpc NULL el external\gcc3_specific nmake - u el_gcc3 NULL el external\mingwheaders nmake - w el_mingwheaders NULL -el external\cairo nmake - all el_cairo NULL diff --git a/external/prj/d.lst b/external/prj/d.lst index b33923468f2f..7652eafbdd1e 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -62,17 +62,5 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib -mkdir: %_DEST%\inc%_EXT%\cairo -..\%__SRC%\inc\cairo\* %_DEST%\inc%_EXT%\cairo\* - -..\%__SRC%\lib\libcairo.dll.* %_DEST%\lib%_EXT%\libcairo.dll.* -..\%__SRC%\lib\cairo.lib %_DEST%\lib%_EXT%\cairo.lib -..\%__SRC%\lib\libcairo*.dll %_DEST%\bin%_EXT%\libcairo*.dll - -..\%__SRC%\lib\libcairo.a %_DEST%\lib%_EXT%\libcairo.a -..\%__SRC%\lib\libcairo.la %_DEST%\lib%_EXT%\libcairo.la -..\%__SRC%\lib\libpixman-1.a %_DEST%\lib%_EXT%\libpixman-1.a -..\%__SRC%\lib\libpixman-1.la %_DEST%\lib%_EXT%\libpixman-1.la - linklib: libgcc_s.*.* -- cgit