You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 23:49:54 UTC
svn commit: r1409498 - in /incubator/ooo/branches/gbuild/main/canvas:
Module_canvas.mk prj/build.lst prj/d.lst prj/makefile.mk
Author: arist
Date: Wed Nov 14 22:49:53 2012
New Revision: 1409498
URL: http://svn.apache.org/viewvc?rev=1409498&view=rev
Log:
gnumake4_013_04b466050e00.patch
# HG changeset patch
# User mba
# Date 1298649676 -3600
# Node ID 04b466050e000ca7c7b6e299c3d29d67ac4dcd04
# Parent 49254e592cff2224a04549f2009ba516f4a80b81
CWS gnumake4: convert canvas to new build system
Added:
incubator/ooo/branches/gbuild/main/canvas/prj/makefile.mk
Modified:
incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk
incubator/ooo/branches/gbuild/main/canvas/prj/build.lst
incubator/ooo/branches/gbuild/main/canvas/prj/d.lst
Modified: incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk?rev=1409498&r1=1409497&r2=1409498&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk (original)
+++ incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk Wed Nov 14 22:49:53 2012
@@ -54,7 +54,7 @@ $(eval $(call gb_Module_add_targets,canv
endif
endif
-ifneq ($(strip $(ENABLE_CAIRO)),)
+ifneq ($(strip $(ENABLE_CAIRO_CANVAS)),)
$(eval $(call gb_Module_add_targets,canvas,\
Library_cairocanvas \
))
Modified: incubator/ooo/branches/gbuild/main/canvas/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/prj/build.lst?rev=1409498&r1=1409497&r2=1409498&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/canvas/prj/build.lst Wed Nov 14 22:49:53 2012
@@ -1,10 +1,2 @@
cv canvas : javaunohelper comphelper cppuhelper offapi unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
-cv canvas usr1 - all cv_mkout NULL
-cv canvas\inc nmake - all cv_inc NULL
-cv canvas\source\tools nmake - all cv_tools cv_inc NULL
-cv canvas\source\vcl nmake - all cv_vcl cv_tools cv_inc NULL
-cv canvas\source\simplecanvas nmake - all cv_simplecanvas cv_tools cv_inc NULL
-cv canvas\source\cairo nmake - all cv_cairo cv_tools cv_inc NULL
-cv canvas\source\directx nmake - w cv_directx cv_tools cv_inc NULL
-cv canvas\source\null nmake - all cv_null cv_tools cv_inc NULL
-cv canvas\source\factory nmake - all cv_factory cv_inc NULL
+cv canvas\prj nmake - all cv_prj NULL
Modified: incubator/ooo/branches/gbuild/main/canvas/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/prj/d.lst?rev=1409498&r1=1409497&r2=1409498&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/canvas/prj/d.lst Wed Nov 14 22:49:53 2012
@@ -1,35 +0,0 @@
-..\%__SRC%\bin\canvasto*.dll %_DEST%\bin%_EXT%\canvasto*.dll
-..\%__SRC%\bin\cairocan*.dll %_DEST%\bin%_EXT%\cairocan*.dll
-..\%__SRC%\bin\directx*.dll %_DEST%\bin%_EXT%\directx*.dll
-..\%__SRC%\bin\gdiplus*.dll %_DEST%\bin%_EXT%\gdiplus*.dll
-..\%__SRC%\bin\vclcanva*.dll %_DEST%\bin%_EXT%\vclcanva*.dll
-..\%__SRC%\bin\nullcanv*.dll %_DEST%\bin%_EXT%\nullcanv*.dll
-..\%__SRC%\bin\simpleca*.dll %_DEST%\bin%_EXT%\simpleca*.dll
-..\%__SRC%\bin\canvasfa*.dll %_DEST%\bin%_EXT%\canvasfa*.dll
-..\%__SRC%\lib\icanvastools.lib %_DEST%\lib%_EXT%\icanvastools.lib
-..\%__SRC%\lib\canvastools.lib %_DEST%\lib%_EXT%\canvastools.lib
-..\%__SRC%\lib\libcanvastools*.so %_DEST%\lib%_EXT%\
-..\%__SRC%\lib\cairocanvas.uno.so %_DEST%\lib%_EXT%\cairocanvas.uno.so
-..\%__SRC%\lib\vclcanvas.uno.so %_DEST%\lib%_EXT%\vclcanvas.uno.so
-..\%__SRC%\lib\nullcanvas.uno.so %_DEST%\lib%_EXT%\nullcanvas.uno.so
-..\%__SRC%\lib\simplecanvas.uno.so %_DEST%\lib%_EXT%\simplecanvas.uno.so
-..\%__SRC%\lib\canvasfactory.uno.so %_DEST%\lib%_EXT%\canvasfactory.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\class\javacanvas.uno.jar %_DEST%\bin%_EXT%\javacanvas.uno.jar
-..\%__SRC%\misc\cairocanvas.component %_DEST%\xml%_EXT%\cairocanvas.component
-
-mkdir: %_DEST%\inc%_EXT%\canvas\base
-..\inc\canvas\base\*.hxx %_DEST%\inc%_EXT%\canvas\base\*.hxx
-
-mkdir: %_DEST%\inc%_EXT%\canvas\rendering
-..\inc\canvas\rendering\*.hxx %_DEST%\inc%_EXT%\canvas\rendering\*.hxx
-
-mkdir: %_DEST%\inc%_EXT%\canvas
-..\inc\canvas\*.hxx %_DEST%\inc%_EXT%\canvas\*.hxx
-..\inc\canvas\*.h %_DEST%\inc%_EXT%\canvas\*.h
-..\%__SRC%\misc\canvasfactory.component %_DEST%\xml%_EXT%\canvasfactory.component
-..\%__SRC%\misc\directx5canvas.component %_DEST%\xml%_EXT%\directx5canvas.component
-..\%__SRC%\misc\directx9canvas.component %_DEST%\xml%_EXT%\directx9canvas.component
-..\%__SRC%\misc\gdipluscanvas.component %_DEST%\xml%_EXT%\gdipluscanvas.component
-..\%__SRC%\misc\simplecanvas.component %_DEST%\xml%_EXT%\simplecanvas.component
-..\%__SRC%\misc\vclcanvas.component %_DEST%\xml%_EXT%\vclcanvas.component
Added: incubator/ooo/branches/gbuild/main/canvas/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/prj/makefile.mk?rev=1409498&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/prj/makefile.mk Wed Nov 14 22:49:53 2012
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog