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:47:18 UTC
svn commit: r1409494 - in /incubator/ooo/branches/gbuild/main: ./
postprocess/packcomponents/ unotools/ unotools/prj/
Author: arist
Date: Wed Nov 14 22:47:17 2012
New Revision: 1409494
URL: http://svn.apache.org/viewvc?rev=1409494&view=rev
Log:
gnumake4_010_8b87f6a2c1dd.patch
# HG changeset patch
# User mba
# Date 1298569273 -3600
# Node ID 8b87f6a2c1ddcf6dd6b0bd80f8dd7dbdd168eab0
# Parent c948dbe96fb695e832b603718a4ba01d7155bab3
CWS gnumake4: convert unotools to new build system
Added:
incubator/ooo/branches/gbuild/main/unotools/JunitTest_unotools_complex.mk
incubator/ooo/branches/gbuild/main/unotools/Library_utl.mk
incubator/ooo/branches/gbuild/main/unotools/Makefile
incubator/ooo/branches/gbuild/main/unotools/Module_unotools.mk
incubator/ooo/branches/gbuild/main/unotools/Package_inc.mk
incubator/ooo/branches/gbuild/main/unotools/prj/makefile.mk
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
incubator/ooo/branches/gbuild/main/unotools/prj/build.lst
incubator/ooo/branches/gbuild/main/unotools/prj/d.lst
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409494&r1=1409493&r2=1409494&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 22:47:17 2012
@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,o
toolkit \
tools \
udkapi \
+ unotools \
unoxml \
vbahelper \
vcl \
Modified: incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk?rev=1409494&r1=1409493&r2=1409494&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk Wed Nov 14 22:47:17 2012
@@ -76,6 +76,7 @@ my_components = \
component/sw/util/sw \
component/sw/util/swd \
component/sw/util/vbaswobj \
+ component/unotools/util/utl \
component/toolkit/util/tk \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
@@ -164,7 +165,6 @@ my_components = \
ucptdoc1 \
updatefeed \
updchk \
- utl \
uui \
vbaevents \
vbaobj \
Added: incubator/ooo/branches/gbuild/main/unotools/JunitTest_unotools_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unotools/JunitTest_unotools_complex.mk?rev=1409494&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/unotools/JunitTest_unotools_complex.mk (added)
+++ incubator/ooo/branches/gbuild/main/unotools/JunitTest_unotools_complex.mk Wed Nov 14 22:47:17 2012
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# 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_JunitTest_JunitTest,unotools_complex))
+
+$(eval $(call gb_JunitTest_set_defs,unotools_complex,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_JunitTest_add_jars,unotools_complex,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/test-tools.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,unotools_complex,\
+ unotools/qa/complex/tempfile/TempFileTest \
+ unotools/qa/complex/tempfile/TempFileUnitTest \
+ unotools/qa/complex/tempfile/Test01 \
+ unotools/qa/complex/tempfile/Test02 \
+ unotools/qa/complex/tempfile/TestHelper \
+))
+
+$(eval $(call gb_JunitTest_add_classes,unotools_complex,\
+ complex.tempfile.TempFileUnitTest \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/unotools/Library_utl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unotools/Library_utl.mk?rev=1409494&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/unotools/Library_utl.mk (added)
+++ incubator/ooo/branches/gbuild/main/unotools/Library_utl.mk Wed Nov 14 22:47:17 2012
@@ -0,0 +1,160 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# unotools is the name of the module the makefile is located in
+
+# declare a library
+# utl is the name of the library as it is found in Repository.mk
+$(eval $(call gb_Library_Library,utl))
+
+# declare packages that will be delivered before compilation of utl
+# learn more about TYPE in the Package.mk template
+$(eval $(call gb_Library_add_package_headers,utl,unotools_inc))
+
+# for platforms supporting PCH: declare the location of the pch file
+# this is the name of the cxx file (without extension)
+$(eval $(call gb_Library_add_precompiled_header,utl,$(SRCDIR)/unotools/inc/pch/precompiled_unotools))
+
+# in case UNO services are exported: declare location of component file
+$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))
+
+$(eval $(call gb_Library_add_api,utl,\
+ udkapi \
+ offapi \
+))
+
+# add any additional include paths for this library here
+$(eval $(call gb_Library_set_include,utl,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/unotools/inc \
+ -I$(SRCDIR)/unotools/inc/pch \
+))
+
+# add any additional definitions to be set for compilation here
+# (e.g. -DLIB_DLLIMPLEMENTATION)
+$(eval $(call gb_Library_set_defs,utl,\
+ $$(DEFS) \
+ -DUNOTOOLS_DLLIMPLEMENTATION \
+))
+
+# add libraries to be linked to utl; again these names need to be given as
+# specified in Repository.mk
+$(eval $(call gb_Library_add_linked_libs,utl,\
+ sal \
+ salhelper \
+ stl \
+ comphelper \
+ ucbhelper \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ tl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+# add all source files that shall be compiled with exceptions enabled
+# the name is relative to $(SRCROOT) and must not contain an extension
+$(eval $(call gb_Library_add_exception_objects,utl,\
+ unotools/source/streaming/streamhelper \
+ unotools/source/streaming/streamwrap \
+ unotools/source/accessibility/accessiblestatesethelper \
+ unotools/source/accessibility/accessiblerelationsethelper \
+ unotools/source/property/propertysethelper \
+ unotools/source/property/propertysetinfo \
+ unotools/source/misc/sharedunocomponent \
+ unotools/source/misc/componentresmodule \
+ unotools/source/misc/eventlisteneradapter \
+ unotools/source/misc/fontcvt \
+ unotools/source/misc/syslocale \
+ unotools/source/misc/fontdefs \
+ unotools/source/misc/datetime \
+ unotools/source/misc/atom \
+ unotools/source/misc/desktopterminationobserver \
+ unotools/source/processfactory/processfactory \
+ unotools/source/ucbhelper/localfilehelper \
+ unotools/source/ucbhelper/ucbstreamhelper \
+ unotools/source/ucbhelper/xtempfile \
+ unotools/source/ucbhelper/ucblockbytes \
+ unotools/source/ucbhelper/tempfile \
+ unotools/source/ucbhelper/ucbhelper \
+ unotools/source/ucbhelper/progresshandlerwrap \
+ unotools/source/config/historyoptions \
+ unotools/source/config/optionsdlg \
+ unotools/source/config/bootstrap \
+ unotools/source/config/configpathes \
+ unotools/source/config/javaoptions \
+ unotools/source/config/lingucfg \
+ unotools/source/config/fontoptions \
+ unotools/source/config/useroptions \
+ unotools/source/config/internaloptions \
+ unotools/source/config/viewoptions \
+ unotools/source/config/workingsetoptions \
+ unotools/source/config/fltrcfg \
+ unotools/source/config/localisationoptions \
+ unotools/source/config/itemholder1 \
+ unotools/source/config/cmdoptions \
+ unotools/source/config/cacheoptions \
+ unotools/source/config/docinfohelper \
+ unotools/source/config/inetoptions \
+ unotools/source/config/misccfg \
+ unotools/source/config/options \
+ unotools/source/config/xmlaccelcfg \
+ unotools/source/config/fontcfg \
+ unotools/source/config/startoptions \
+ unotools/source/config/extendedsecurityoptions \
+ unotools/source/config/printwarningoptions \
+ unotools/source/config/configmgr \
+ unotools/source/config/eventcfg \
+ unotools/source/config/configitem \
+ unotools/source/config/defaultoptions \
+ unotools/source/config/searchopt \
+ unotools/source/config/confignode \
+ unotools/source/config/sourceviewconfig \
+ unotools/source/config/compatibility \
+ unotools/source/config/pathoptions \
+ unotools/source/config/dynamicmenuoptions \
+ unotools/source/config/moduleoptions \
+ unotools/source/config/undoopt \
+ unotools/source/config/configvaluecontainer \
+ unotools/source/config/syslocaleoptions \
+ unotools/source/config/accelcfg \
+ unotools/source/config/saveopt \
+ unotools/source/config/securityoptions \
+ unotools/source/i18n/charclass \
+ unotools/source/i18n/textsearch \
+ unotools/source/i18n/readwritemutexguard \
+ unotools/source/i18n/intlwrapper \
+ unotools/source/i18n/transliterationwrapper \
+ unotools/source/i18n/calendarwrapper \
+ unotools/source/i18n/localedatawrapper \
+ unotools/source/i18n/collatorwrapper \
+ unotools/source/i18n/numberformatcodewrapper \
+ unotools/source/i18n/nativenumberwrapper \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/unotools/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unotools/Makefile?rev=1409494&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/unotools/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/unotools/Makefile Wed Nov 14 22:47:17 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:
Added: incubator/ooo/branches/gbuild/main/unotools/Module_unotools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unotools/Module_unotools.mk?rev=1409494&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/unotools/Module_unotools.mk (added)
+++ incubator/ooo/branches/gbuild/main/unotools/Module_unotools.mk Wed Nov 14 22:47:17 2012
@@ -0,0 +1,39 @@
+#*************************************************************************
+#
+# 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,unotools))
+
+$(eval $(call gb_Module_add_targets,unotools,\
+ Library_utl \
+ Package_inc \
+))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,unotools,\
+ JunitTest_unotools_complex \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/unotools/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unotools/Package_inc.mk?rev=1409494&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/unotools/Package_inc.mk (added)
+++ incubator/ooo/branches/gbuild/main/unotools/Package_inc.mk Wed Nov 14 22:47:17 2012
@@ -0,0 +1,114 @@
+#*************************************************************************
+#
+# 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,unotools_inc,$(SRCDIR)/unotools/inc))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/calendarwrapper.hxx,unotools/calendarwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/syslocale.hxx,unotools/syslocale.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localedatawrapper.hxx,unotools/localedatawrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/searchopt.hxx,unotools/searchopt.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/digitgroupingiterator.hxx,unotools/digitgroupingiterator.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/streamsection.hxx,unotools/streamsection.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/streamhelper.hxx,unotools/streamhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontcfg.hxx,unotools/fontcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configvaluecontainer.hxx,unotools/configvaluecontainer.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/docinfohelper.hxx,unotools/docinfohelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/historyoptions_const.hxx,unotools/historyoptions_const.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/querydeep.hxx,unotools/querydeep.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/internaloptions.hxx,unotools/internaloptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/componentresmodule.hxx,unotools/componentresmodule.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/cmdoptions.hxx,unotools/cmdoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/workingsetoptions.hxx,unotools/workingsetoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/extendedsecurityoptions.hxx,unotools/extendedsecurityoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/defaultoptions.hxx,unotools/defaultoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/charclass.hxx,unotools/charclass.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/itemholderbase.hxx,unotools/itemholderbase.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accelcfg.hxx,unotools/accelcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/readwritemutexguard.hxx,unotools/readwritemutexguard.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/syslocaleoptions.hxx,unotools/syslocaleoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fltrcfg.hxx,unotools/fltrcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/useroptions_const.hxx,unotools/useroptions_const.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/propertysetinfo.hxx,unotools/propertysetinfo.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucblockbytes.hxx,unotools/ucblockbytes.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/viewoptions.hxx,unotools/viewoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucbstreamhelper.hxx,unotools/ucbstreamhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/idhelper.hxx,unotools/idhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/numberformatcodewrapper.hxx,unotools/numberformatcodewrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/misccfg.hxx,unotools/misccfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configpathes.hxx,unotools/configpathes.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/regpathhelper.hxx,unotools/regpathhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontoptions.hxx,unotools/fontoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/pathoptions.hxx,unotools/pathoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/confignode.hxx,unotools/confignode.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/datetime.hxx,unotools/datetime.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/javaoptions.hxx,unotools/javaoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucbhelper.hxx,unotools/ucbhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/textsearch.hxx,unotools/textsearch.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configitem.hxx,unotools/configitem.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/eventcfg.hxx,unotools/eventcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/saveopt.hxx,unotools/saveopt.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/nativenumberwrapper.hxx,unotools/nativenumberwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/processfactory.hxx,unotools/processfactory.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/sourceviewconfig.hxx,unotools/sourceviewconfig.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/dynamicmenuoptions.hxx,unotools/dynamicmenuoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/loghelper.hxx,unotools/loghelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/progresshandlerwrap.hxx,unotools/progresshandlerwrap.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/startoptions.hxx,unotools/startoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/collatorwrapper.hxx,unotools/collatorwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/cacheoptions.hxx,unotools/cacheoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/lingucfg.hxx,unotools/lingucfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/unotunnelhelper.hxx,unotools/unotunnelhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontcvt.hxx,unotools/fontcvt.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/atom.hxx,unotools/atom.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/linguprops.hxx,unotools/linguprops.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/printwarningoptions.hxx,unotools/printwarningoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/compatibility.hxx,unotools/compatibility.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configmgr.hxx,unotools/configmgr.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/bootstrap.hxx,unotools/bootstrap.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/intlwrapper.hxx,unotools/intlwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/securityoptions.hxx,unotools/securityoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/eventlisteneradapter.hxx,unotools/eventlisteneradapter.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/tempfile.hxx,unotools/tempfile.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/optionsdlg.hxx,unotools/optionsdlg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/transliterationwrapper.hxx,unotools/transliterationwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/xmlaccelcfg.hxx,unotools/xmlaccelcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/undoopt.hxx,unotools/undoopt.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblerelationsethelper.hxx,unotools/accessiblerelationsethelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/useroptions.hxx,unotools/useroptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/desktopterminationobserver.hxx,unotools/desktopterminationobserver.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/options.hxx,unotools/options.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/streamwrap.hxx,unotools/streamwrap.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/propertysethelper.hxx,unotools/propertysethelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/historyoptions.hxx,unotools/historyoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontdefs.hxx,unotools/fontdefs.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/sharedunocomponent.hxx,unotools/sharedunocomponent.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblestatesethelper.hxx,unotools/accessiblestatesethelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/moduleoptions.hxx,unotools/moduleoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/unotoolsdllapi.h,unotools/unotoolsdllapi.h))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localfilehelper.hxx,unotools/localfilehelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/inetoptions.hxx,unotools/inetoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localisationoptions.hxx,unotools/localisationoptions.hxx))
+# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/unotools/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unotools/prj/build.lst?rev=1409494&r1=1409493&r2=1409494&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/unotools/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/unotools/prj/build.lst Wed Nov 14 22:47:17 2012
@@ -1,14 +1,2 @@
ut unotools : LIBXSLT:libxslt comphelper cppuhelper offapi tools ucbhelper NULL
-ut unotools usr1 - all ut_mkout NULL
-ut unotools\inc nmake - all ut_inc NULL
-ut unotools\source\misc nmake - all ut_misc ut_config ut_inc NULL
-ut unotools\source\streaming nmake - all ut_streaming ut_inc NULL
-ut unotools\source\config nmake - all ut_config ut_i18n ut_inc NULL
-ut unotools\source\ucbhelper nmake - all ut_ucbhelper ut_inc NULL
-ut unotools\source\processfactory nmake - all ut_procfact ut_inc NULL
-ut unotools\source\i18n nmake - all ut_i18n ut_inc NULL
-ut unotools\source\property nmake - all ut_property ut_inc NULL
-ut unotools\source\accessibility nmake - all ut_accessibility ut_inc NULL
-ut unotools\util nmake - all ut_util ut_config ut_i18n ut_misc ut_procfact ut_streaming ut_ucbhelper ut_property ut_accessibility NULL
-
-ut unotools\qa\complex\tempfile nmake - all ut_qa_complex ut_util NULL
+ut unotools\prj nmake - all ut_prj NULL
Modified: incubator/ooo/branches/gbuild/main/unotools/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unotools/prj/d.lst?rev=1409494&r1=1409493&r2=1409494&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/unotools/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/unotools/prj/d.lst Wed Nov 14 22:47:17 2012
@@ -1,12 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\inc\*.bin %_DEST%\bin%_EXT%\*.bin
-
-mkdir: %_DEST%\inc%_EXT%\unotools
-..\inc\unotools\*.hxx %_DEST%\inc%_EXT%\unotools\*.hxx
-..\inc\unotools\unotoolsdllapi.h %_DEST%\inc%_EXT%\unotools\unotoolsdllapi.h
-..\%__SRC%\misc\utl.component %_DEST%\xml%_EXT%\utl.component
Added: incubator/ooo/branches/gbuild/main/unotools/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unotools/prj/makefile.mk?rev=1409494&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/unotools/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/unotools/prj/makefile.mk Wed Nov 14 22:47:17 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