From 4aba8d5cec9544080c79802bb6c120a2a1dd1fe8 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 18 Sep 2011 16:36:58 -0400 Subject: convert eventattacher to gbuild and add to tail_build --- eventattacher/Library_evtatt.mk | 46 +++++++++++++++++++++++ eventattacher/Makefile | 38 +++++++++++++++++++ eventattacher/Module_eventattacher.mk | 34 +++++++++++++++++ eventattacher/prj/build.lst | 6 +-- eventattacher/prj/d.lst | 4 -- eventattacher/prj/makefile.mk | 40 ++++++++++++++++++++ eventattacher/source/makefile.mk | 71 ----------------------------------- 7 files changed, 160 insertions(+), 79 deletions(-) create mode 100644 eventattacher/Library_evtatt.mk create mode 100644 eventattacher/Makefile create mode 100644 eventattacher/Module_eventattacher.mk create mode 100644 eventattacher/prj/makefile.mk delete mode 100755 eventattacher/source/makefile.mk (limited to 'eventattacher') diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk new file mode 100644 index 000000000000..7c3f9ef43d1a --- /dev/null +++ b/eventattacher/Library_evtatt.mk @@ -0,0 +1,46 @@ +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Peter Foley +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +# + +$(eval $(call gb_Library_Library,evtatt)) + +$(eval $(call gb_Library_set_componentfile,evtatt,eventattacher/source/evtatt)) + +$(eval $(call gb_Library_add_linked_libs,evtatt,\ + cppuhelper \ + cppu \ + sal \ +)) + +$(eval $(call gb_Library_add_exception_objects,evtatt,\ + eventattacher/source/eventattacher \ +)) + +$(eval $(call gb_Library_add_api,evtatt,\ + udkapi \ +)) diff --git a/eventattacher/Makefile b/eventattacher/Makefile new file mode 100644 index 000000000000..5bedaf0b9dcf --- /dev/null +++ b/eventattacher/Makefile @@ -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 +# +# 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: diff --git a/eventattacher/Module_eventattacher.mk b/eventattacher/Module_eventattacher.mk new file mode 100644 index 000000000000..a3a8e845b616 --- /dev/null +++ b/eventattacher/Module_eventattacher.mk @@ -0,0 +1,34 @@ +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Peter Foley +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +# + +$(eval $(call gb_Module_Module,eventattacher)) + +$(eval $(call gb_Module_add_targets,eventattacher,\ + Library_evtatt \ +)) diff --git a/eventattacher/prj/build.lst b/eventattacher/prj/build.lst index 7c9532034772..6e5faf8a8fa5 100644 --- a/eventattacher/prj/build.lst +++ b/eventattacher/prj/build.lst @@ -1,4 +1,2 @@ -ea eventattacher : offapi cppuhelper LIBXSLT:libxslt NULL -ea eventattacher usr1 - all ea_mkout NULL -ea eventattacher\prj get - all ea_prj NULL -ea eventattacher\source nmake - all ea_source NULL +ea eventattacher : offapi cppuhelper LIBXSLT:libxslt NULL +ea eventattacher\prj nmake - all ea_prj NULL diff --git a/eventattacher/prj/d.lst b/eventattacher/prj/d.lst index 9b2d88dedb01..e69de29bb2d1 100644 --- a/eventattacher/prj/d.lst +++ b/eventattacher/prj/d.lst @@ -1,4 +0,0 @@ -..\%__SRC%\bin\*.dll %_DEST%\bin -..\%__SRC%\lib\lib*.so %_DEST%\lib -..\%__SRC%\lib\*.dylib %_DEST%\lib -..\%__SRC%\misc\evtatt.component %_DEST%\xml\evtatt.component diff --git a/eventattacher/prj/makefile.mk b/eventattacher/prj/makefile.mk new file mode 100644 index 000000000000..85b25665cc83 --- /dev/null +++ b/eventattacher/prj/makefile.mk @@ -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 +# +# 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$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/eventattacher/source/makefile.mk b/eventattacher/source/makefile.mk deleted file mode 100755 index 360dcdabd7d7..000000000000 --- a/eventattacher/source/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME= eventattacher -TARGET= evtatt - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ -.IF "$(L10N_framework)"=="" - -SLOFILES= \ - $(SLO)$/eventattacher.obj - -SHL1TARGET= $(TARGET) -SHL1IMPLIB= i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1LIBS= $(SLB)$/$(TARGET).lib - -.ENDIF # L10N_framework - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/evtatt.component - -$(MISC)/evtatt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - evtatt.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt evtatt.component -- cgit v1.2.3