Author: arist
Date: Wed Nov 14 23:00:57 2012
New Revision: 1409523
URL: http://svn.apache.org/viewvc?rev=1409523&view=rev
Log:
gnumake4_029_751b4a1bff7b.patch
# HG changeset patch
# User mba
# Date 1299087719 -3600
# Node ID 751b4a1bff7be8d5283ce19b848849e4063f6748
# Parent 9eb9b5d5181e24513ad6a6ef1c7eb3192d45fdc0
CWS gnumake4: convert xmlreader to new build system
Added:
incubator/ooo/branches/gbuild/main/xmlreader/Library_xmlreader.mk (with
props)
incubator/ooo/branches/gbuild/main/xmlreader/Makefile (with props)
incubator/ooo/branches/gbuild/main/xmlreader/Module_xmlreader.mk (with
props)
incubator/ooo/branches/gbuild/main/xmlreader/Package_inc.mk (with props)
incubator/ooo/branches/gbuild/main/xmlreader/prj/makefile.mk (with props)
Modified:
incubator/ooo/branches/gbuild/main/Repository.mk
incubator/ooo/branches/gbuild/main/xmlreader/prj/d.lst
incubator/ooo/branches/gbuild/main/xmlreader/source/pad.cxx
incubator/ooo/branches/gbuild/main/xmlreader/source/span.cxx
incubator/ooo/branches/gbuild/main/xmlreader/source/xmlreader.cxx
Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409523&r1=1409522&r2=1409523&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Wed Nov 14 23:00:57 2012
@@ -97,6 +97,7 @@ $(eval $(call gb_Helper_register_librari
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
xml2 \
+ xmlreader \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
Added: incubator/ooo/branches/gbuild/main/xmlreader/Library_xmlreader.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/Library_xmlreader.mk?rev=1409523&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/Library_xmlreader.mk (added)
+++ incubator/ooo/branches/gbuild/main/xmlreader/Library_xmlreader.mk Wed Nov
14 23:00:57 2012
@@ -0,0 +1,53 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,xmlreader))
+
+$(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc))
+
+$(eval $(call gb_Library_add_api,xmlreader,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_set_defs,xmlreader,\
+ $$(DEFS) \
+ -DOOO_DLLIMPLEMENTATION_XMLREADER \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xmlreader,\
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xmlreader,\
+ xmlreader/source/pad \
+ xmlreader/source/span \
+ xmlreader/source/xmlreader \
+))
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/xmlreader/Library_xmlreader.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/xmlreader/Makefile
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/Makefile?rev=1409523&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/xmlreader/Makefile Wed Nov 14 23:00:57
2012
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/xmlreader/Makefile
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/xmlreader/Module_xmlreader.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/Module_xmlreader.mk?rev=1409523&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/Module_xmlreader.mk (added)
+++ incubator/ooo/branches/gbuild/main/xmlreader/Module_xmlreader.mk Wed Nov 14
23:00:57 2012
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,xmlreader))
+
+$(eval $(call gb_Module_add_targets,xmlreader,\
+ Library_xmlreader \
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/xmlreader/Module_xmlreader.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/xmlreader/Package_inc.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/Package_inc.mk?rev=1409523&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/Package_inc.mk (added)
+++ incubator/ooo/branches/gbuild/main/xmlreader/Package_inc.mk Wed Nov 14
23:00:57 2012
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,xmlreader_inc,$(SRCDIR)/xmlreader/inc))
+$(eval $(call
gb_Package_add_file,xmlreader_inc,inc/xmlreader/pad.hxx,xmlreader/pad.hxx))
+$(eval $(call
gb_Package_add_file,xmlreader_inc,inc/xmlreader/span.hxx,xmlreader/span.hxx))
+$(eval $(call
gb_Package_add_file,xmlreader_inc,inc/xmlreader/xmlreader.hxx,xmlreader/xmlreader.hxx))
+$(eval $(call
gb_Package_add_file,xmlreader_inc,inc/xmlreader/detail/xmlreaderdllapi.hxx,xmlreader/detail/xmlreaderdllapi.hxx))
+
+# vim: set noet sw=4 ts=4:
Propchange: incubator/ooo/branches/gbuild/main/xmlreader/Package_inc.mk
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/ooo/branches/gbuild/main/xmlreader/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/prj/d.lst?rev=1409523&r1=1409522&r2=1409523&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/xmlreader/prj/d.lst Wed Nov 14 23:00:57
2012
@@ -1,11 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmlreader
-mkdir: %_DEST%\inc%_EXT%\xmlreader\detail
-..\%__SRC%\bin\xmlread*.dll %_DEST%\bin%_EXT%\xmlread*.dll
-..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib%_EXT%\ixmlreader.lib
-..\%__SRC%\lib\xmlreader*.lib %_DEST%\lib%_EXT%\xmlreader*.lib
-..\%__SRC%\lib\libxmlreader.dylib %_DEST%\lib%_EXT%\libxmlreader.dylib
-..\%__SRC%\lib\libxmlreader.so %_DEST%\lib%_EXT%\libxmlreader.so
-..\inc\xmlreader\detail\xmlreaderdllapi.hxx
%_DEST%\inc%_EXT%\xmlreader\detail\xmlreaderdllapi.hxx
-..\inc\xmlreader\pad.hxx %_DEST%\inc%_EXT%\xmlreader\pad.hxx
-..\inc\xmlreader\span.hxx %_DEST%\inc%_EXT%\xmlreader\span.hxx
-..\inc\xmlreader\xmlreader.hxx %_DEST%\inc%_EXT%\xmlreader\xmlreader.hxx
Added: incubator/ooo/branches/gbuild/main/xmlreader/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/prj/makefile.mk?rev=1409523&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/xmlreader/prj/makefile.mk Wed Nov 14
23:00:57 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
Propchange: incubator/ooo/branches/gbuild/main/xmlreader/prj/makefile.mk
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/ooo/branches/gbuild/main/xmlreader/source/pad.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/source/pad.cxx?rev=1409523&r1=1409522&r2=1409523&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/source/pad.cxx (original)
+++ incubator/ooo/branches/gbuild/main/xmlreader/source/pad.cxx Wed Nov 14
23:00:57 2012
@@ -21,9 +21,7 @@
-#include "precompiled_xmlreader.hxx"
#include "sal/config.h"
-
#include "osl/diagnose.h"
#include "rtl/string.h"
#include "sal/types.h"
Modified: incubator/ooo/branches/gbuild/main/xmlreader/source/span.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/source/span.cxx?rev=1409523&r1=1409522&r2=1409523&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/source/span.cxx (original)
+++ incubator/ooo/branches/gbuild/main/xmlreader/source/span.cxx Wed Nov 14
23:00:57 2012
@@ -21,9 +21,7 @@
-#include "precompiled_xmlreader.hxx"
#include "sal/config.h"
-
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/XInterface.hpp"
#include "osl/diagnose.h"
Modified: incubator/ooo/branches/gbuild/main/xmlreader/source/xmlreader.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/source/xmlreader.cxx?rev=1409523&r1=1409522&r2=1409523&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/source/xmlreader.cxx (original)
+++ incubator/ooo/branches/gbuild/main/xmlreader/source/xmlreader.cxx Wed Nov
14 23:00:57 2012
@@ -21,7 +21,6 @@
-#include "precompiled_xmlreader.hxx"
#include "sal/config.h"
#include <climits>
