diff options
| -rw-r--r-- | Module_tail_build.mk | 1 | ||||
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
| -rw-r--r-- | eventattacher/Library_evtatt.mk | 46 | ||||
| -rw-r--r-- | eventattacher/Makefile | 38 | ||||
| -rw-r--r-- | eventattacher/Module_eventattacher.mk | 34 | ||||
| -rw-r--r-- | eventattacher/prj/build.lst | 6 | ||||
| -rw-r--r-- | eventattacher/prj/d.lst | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | eventattacher/prj/makefile.mk (renamed from eventattacher/source/makefile.mk) | 53 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 2 | ||||
| -rw-r--r-- | postprocess/prj/build.lst | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 11 |
12 files changed, 137 insertions, 62 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 9e35fc89e255..c08919bcdb9d 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ cui \ dbaccess \ desktop \ + eventattacher \ fileaccess \ forms \ formula \ diff --git a/Repository.mk b/Repository.mk index afdd5ca3f21e..950a23983b63 100644 --- a/Repository.mk +++ b/Repository.mk @@ -100,6 +100,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ canvastools \ communi \ date \ + evtatt \ forui \ odbc \ odbcbase \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 8e1b817aab96..58e31c596f28 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ drawinglayer \ dtrans \ editeng \ + eventattacher \ fileaccess \ forms \ formula \ 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 <pefoley2@verizon.net> +# 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 +# <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: 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 <pefoley2@verizon.net> +# 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/source/makefile.mk b/eventattacher/prj/makefile.mk index 360dcdabd7d7..85b25665cc83 100755..100644 --- a/eventattacher/source/makefile.mk +++ b/eventattacher/prj/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # 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 @@ -24,48 +24,17 @@ # 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 ------------------------------------------------------ +PRJ=.. +TARGET=prj -.INCLUDE : target.mk +.INCLUDE : settings.mk -ALLTAR : $(MISC)/evtatt.component +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -$(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 +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index d4d58c5c8a40..639aa7cf2e08 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -62,6 +62,7 @@ my_components = \ component/dbaccess/util/dbu \ component/dbaccess/util/sdbt \ component/dtrans/util/mcnttype \ + component/eventattacher/source/evtatt \ component/fileaccess/source/fileacc \ component/filter/source/config/cache/filterconfig1 \ component/filter/source/flash/flash \ @@ -142,7 +143,6 @@ my_components = \ dbtools \ dlgprov \ embobj \ - evtatt \ flat \ fpicker \ fps_office \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 739cd06a0a82..30248b57a806 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL +po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\checkdeliver nmake - all po_checkdlv NULL diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 6849d2d53cfb..cb63e783f318 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -450,16 +450,7 @@ STD_LIB_FILE( gid_File_Lib_Evoab , evoab) #endif // #ifdef UNX -File gid_File_Lib_Evtatt - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(libevtatt,UNXSUFFIX)); - #else - Name = "evtatt.dll"; - #endif -End +STD_LIB_FILE(gid_File_Lib_Evtatt, evtatt) SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc) |