gnumake3: adjust comphelper to new build env

comphelper/Library_comphelp.mk

+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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,comphelper))
+
+$(eval $(call gb_Library_add_package_headers,comphelper,comphelper_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,comphelper,$(SRCDIR)/comphelper/inc/pch/precompiled_comphelper))
+
+$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp4))
+
+$(eval $(call gb_Library_set_include,comphelper,\
+    -I$(SRCDIR)/comphelper/inc/pch \
+    -I$(SRCDIR)/comphelper/source/inc \
+    -I$(SRCDIR)/comphelper/inc \
+    -I$(WORKDIR)/inc/comphelper/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/comphelper \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,comphelper,\
+        sal \
+        cppuhelper \
+    cppu \
+        ucbhelper \
+    vos3 \
+    stl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,comphelper,\
+    comphelper/source/compare/AnyCompareFactory \
+    comphelper/source/container/IndexedPropertyValuesContainer \
+    comphelper/source/container/NamedPropertyValuesContainer \
+    comphelper/source/container/container \
+    comphelper/source/container/containermultiplexer \
+    comphelper/source/container/embeddedobjectcontainer \
+    comphelper/source/container/enumerablemap \
+    comphelper/source/container/enumhelper \
+    comphelper/source/container/namecontainer \
+    comphelper/source/eventattachermgr/eventattachermgr \
+    comphelper/source/misc/accessiblecomponenthelper \
+    comphelper/source/misc/accessiblecontexthelper \
+    comphelper/source/misc/accessibleeventbuffer \
+    comphelper/source/misc/accessibleeventnotifier \
+    comphelper/source/misc/accessiblekeybindinghelper \
+    comphelper/source/misc/accessibleselectionhelper \
+    comphelper/source/misc/accessibletexthelper \
+    comphelper/source/misc/accessiblewrapper \
+    comphelper/source/misc/accimplaccess \
+    comphelper/source/misc/anytostring \
+    comphelper/source/misc/asyncnotification \
+    comphelper/source/misc/comphelper_module \
+    comphelper/source/misc/comphelper_services \
+    comphelper/source/misc/componentbase \
+    comphelper/source/misc/componentcontext \
+    comphelper/source/misc/componentmodule \
+    comphelper/source/misc/configurationhelper \
+    comphelper/source/misc/docpasswordhelper \
+    comphelper/source/misc/docpasswordrequest \
+    comphelper/source/misc/documentinfo \
+    comphelper/source/misc/documentiologring \
+    comphelper/source/misc/evtlistenerhlp \
+    comphelper/source/misc/evtmethodhelper \
+    comphelper/source/misc/ihwrapnofilter \
+    comphelper/source/misc/instancelocker \
+    comphelper/source/misc/interaction \
+    comphelper/source/misc/legacysingletonfactory \
+    comphelper/source/misc/listenernotification \
+    comphelper/source/misc/locale \
+    comphelper/source/misc/logging \
+    comphelper/source/misc/mediadescriptor \
+    comphelper/source/misc/mimeconfighelper \
+    comphelper/source/misc/namedvaluecollection \
+    comphelper/source/misc/numberedcollection \
+    comphelper/source/misc/numbers \
+    comphelper/source/misc/officeresourcebundle \
+    comphelper/source/misc/officerestartmanager \
+    comphelper/source/misc/proxyaggregation \
+    comphelper/source/misc/regpathhelper \
+    comphelper/source/misc/scopeguard \
+    comphelper/source/misc/SelectionMultiplex \
+    comphelper/source/misc/sequenceashashmap \
+    comphelper/source/misc/sequence \
+    comphelper/source/misc/servicedecl \
+    comphelper/source/misc/serviceinfohelper \
+    comphelper/source/misc/sharedmutex \
+    comphelper/source/misc/stillreadwriteinteraction \
+    comphelper/source/misc/storagehelper \
+    comphelper/source/misc/string \
+    comphelper/source/misc/synchronousdispatch \
+    comphelper/source/misc/types \
+    comphelper/source/misc/uieventslogger \
+    comphelper/source/misc/weak \
+    comphelper/source/misc/weakeventlistener \
+        comphelper/source/officeinstdir/officeinstallationdirectories \
+    comphelper/source/processfactory/componentfactory \
+    comphelper/source/processfactory/processfactory \
+    comphelper/source/property/ChainablePropertySet \
+    comphelper/source/property/ChainablePropertySetInfo \
+    comphelper/source/property/composedprops \
+    comphelper/source/property/genericpropertyset \
+    comphelper/source/property/MasterPropertySet \
+    comphelper/source/property/MasterPropertySetInfo \
+    comphelper/source/property/opropertybag \
+    comphelper/source/property/propagg \
+    comphelper/source/property/propertybag \
+    comphelper/source/property/propertycontainer \
+    comphelper/source/property/propertycontainerhelper \
+    comphelper/source/property/property \
+    comphelper/source/property/propertysethelper \
+    comphelper/source/property/propertysetinfo \
+    comphelper/source/property/propertystatecontainer \
+    comphelper/source/property/propmultiplex \
+    comphelper/source/property/propstate \
+    comphelper/source/property/TypeGeneration \
+    comphelper/source/streaming/basicio \
+    comphelper/source/streaming/memorystream \
+    comphelper/source/streaming/oslfile2streamwrap \
+    comphelper/source/streaming/otransactedfilestream \
+    comphelper/source/streaming/seekableinput \
+    comphelper/source/streaming/seqinputstreamserv \
+    comphelper/source/streaming/seqoutputstreamserv \
+    comphelper/source/streaming/seqstream \
+    comphelper/source/streaming/streamsection \
+    comphelper/source/xml/attributelist \
+    comphelper/source/xml/ofopxmlhelper \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,comphelper,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,comphelper,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:

comphelper/version.mk → comphelper/Makefile

@@ -25,22 +25,14 @@
 #
 #*************************************************************************
 
-# ----------------------------COMPHLP settings------------------------------------#
-# target
-COMPHLP_TARGET=comphelp
-
-# the major 
-COMPHLP_MAJOR=4
-# the minor 
-COMPHLP_MINOR=0
-# the micro 
-COMPHLP_MICRO=0
-
-# this is a c++ compatible library 
-COMPHLP_CPP=1
-
-COMPHLP=$(COMPHLP_TARGET_TARGET)_$(CMPEXT)
-
+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:

comphelper/util/makefile.mk → comphelper/Module_comphelper.mk

@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,65 +14,22 @@
 #
 # 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
+# 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
+# version 3 along with OpenOffice.org.	If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
-PRJ=..
-PRJNAME=comphelper
-TARGET=comphelper
+$(eval $(call gb_Module_Module,comphelper))
 
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/version.mk
+$(eval $(call gb_Module_add_targets,comphelper,\
+    Package_inc \
+    Library_comphelp \
+))
 
-# --- Library -----------------------------------
-
-LIB1TARGET=	$(SLB)$/$(TARGET).lib
-LIB1FILES=	$(SLB)$/container.lib		\
-            $(SLB)$/evtattmgr.lib		\
-            $(SLB)$/misc.lib			\
-            $(SLB)$/processfactory.lib	\
-            $(SLB)$/property.lib		\
-            $(SLB)$/streaming.lib		\
-            $(SLB)$/compare.lib         \
-            $(SLB)$/officeinstdir.lib	\
-            $(SLB)$/xml.lib
-
-SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)$(COMID)
-.IF "$(GUI)" == "OS2"
-SHL1TARGET=comph$(COMPHLP_MAJOR)
-.ENDIF
-SHL1STDLIBS= \
-    $(SALLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(UCBHELPERLIB) \
-    $(VOSLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(COMPHLP_TARGET)
-SHL1USE_EXPORTS=name
-SHL1LIBS=	$(LIB1TARGET)
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/comphelp4.component
-
-$(MISC)/comphelp4.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        comphelp4.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt comphelp4.component
+# vim: set noet ts=4 sw=4:

comphelper/prj/build.lst

-ph	comphelper	:	cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL
-ph	comphelper								usr1	-	all	ph_mkout NULL
-ph	comphelper\inc							nmake	-	all	ph_inc NULL
-ph	comphelper\source\container				nmake	-	all	ph_container ph_inc NULL
-ph	comphelper\source\eventattachermgr		nmake	-	all	ph_evtatmgr ph_inc NULL
-ph	comphelper\source\misc					nmake	-	all	ph_misc ph_inc NULL
-ph	comphelper\source\processfactory		nmake	-	all	ph_procfact ph_inc NULL
-ph	comphelper\source\property				nmake	-	all	ph_property ph_inc NULL
-ph	comphelper\source\streaming				nmake	-	all	ph_streaming ph_inc NULL
-ph	comphelper\source\compare				nmake	-	all	ph_compare ph_inc NULL
-ph  comphelper\source\officeinstdir         nmake   -   all ph_officeinstdir ph_inc NULL
-ph  comphelper\source\xml                   nmake   -   all ph_xml NULL
-ph  comphelper\util                         nmake   -   all ph_util ph_container ph_evtatmgr ph_misc ph_procfact ph_property ph_streaming ph_compare ph_officeinstdir ph_xml NULL
-
-ph comphelper\qa\complex\comphelper nmake - all ph_complex ph_util NULL
+ch rcomphelper : cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL
+ch comphelper\prj nmake - all ch_all NULL

comphelper/prj/d.lst

-..\%__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%\comphelper
-..\inc\comphelper\*.hxx %_DEST%\inc%_EXT%\comphelper\*.hxx
-..\inc\comphelper\*.h %_DEST%\inc%_EXT%\comphelper\*.h
-mkdir: %_DEST%\inc%_EXT%\cppuhelper
-..\inc\comphelper\extract.hxx %_DEST%\inc%_EXT%\cppuhelper\extract.hxx
-..\version.mk  %_DEST%\inc%_EXT%\comphelper\version.mk
-..\%__SRC%\misc\comphelp4.component %_DEST%\xml%_EXT%\comphelp4.component

comphelper/util/makefile.pmk → comphelper/prj/makefile.mk

@@ -25,11 +25,16 @@
 #
 #*************************************************************************
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
 
-# define COMPHELPER_DLLIMPLEMENTATION (see @ comphelperdllapi.h)
-CDEFS += -DCOMPHELPER_DLLIMPLEMENTATION
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
-VISIBILITY_HIDDEN=TRUE
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)

comphelper/util/exports.dxp

-component_getImplementationEnvironment
-component_getFactory
\ No newline at end of file