You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/06 01:40:58 UTC
svn commit: r1772819 - in /openoffice/trunk/main: ./ eventattacher/
eventattacher/prj/ eventattacher/source/ postprocess/packcomponents/
Author: damjan
Date: Tue Dec 6 01:40:58 2016
New Revision: 1772819
URL: http://svn.apache.org/viewvc?rev=1772819&view=rev
Log:
Port eventattacher to gbuild.
Patch by: me
Added:
openoffice/trunk/main/eventattacher/Library_evtatt.mk
openoffice/trunk/main/eventattacher/Makefile (with props)
openoffice/trunk/main/eventattacher/Module_eventattacher.mk
openoffice/trunk/main/eventattacher/prj/makefile.mk
Removed:
openoffice/trunk/main/eventattacher/source/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/eventattacher/prj/build.lst
openoffice/trunk/main/eventattacher/prj/d.lst
openoffice/trunk/main/eventattacher/source/eventattacher.cxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772819&r1=1772818&r2=1772819&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Tue Dec 6 01:40:58 2016
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_moduledirs,o
dbaccess \
drawinglayer \
editeng \
+ eventattacher \
fileaccess \
formula \
framework \
Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1772819&r1=1772818&r2=1772819&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Tue Dec 6 01:40:58 2016
@@ -61,6 +61,7 @@ $(eval $(call gb_Helper_register_librari
drawinglayer \
svgio \
editeng \
+ evtatt \
file \
fileacc \
for \
Added: openoffice/trunk/main/eventattacher/Library_evtatt.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/eventattacher/Library_evtatt.mk?rev=1772819&view=auto
==============================================================================
--- openoffice/trunk/main/eventattacher/Library_evtatt.mk (added)
+++ openoffice/trunk/main/eventattacher/Library_evtatt.mk Tue Dec 6 01:40:58 2016
@@ -0,0 +1,48 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,evtatt))
+
+$(eval $(call gb_Library_set_componentfile,evtatt,eventattacher/source/evtatt))
+
+$(eval $(call gb_Library_set_include,evtatt,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,evtatt,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,evtatt,\
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,evtatt,\
+ eventattacher/source/eventattacher \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/eventattacher/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/eventattacher/Makefile?rev=1772819&view=auto
==============================================================================
--- openoffice/trunk/main/eventattacher/Makefile (added)
+++ openoffice/trunk/main/eventattacher/Makefile Tue Dec 6 01:40:58 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the 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: openoffice/trunk/main/eventattacher/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/eventattacher/Module_eventattacher.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/eventattacher/Module_eventattacher.mk?rev=1772819&view=auto
==============================================================================
--- openoffice/trunk/main/eventattacher/Module_eventattacher.mk (added)
+++ openoffice/trunk/main/eventattacher/Module_eventattacher.mk Tue Dec 6 01:40:58 2016
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,eventattacher))
+
+$(eval $(call gb_Module_add_targets,eventattacher,\
+ Library_evtatt \
+))
+
+# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/eventattacher/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/eventattacher/prj/build.lst?rev=1772819&r1=1772818&r2=1772819&view=diff
==============================================================================
--- openoffice/trunk/main/eventattacher/prj/build.lst (original)
+++ openoffice/trunk/main/eventattacher/prj/build.lst Tue Dec 6 01:40:58 2016
@@ -1,4 +1,2 @@
ea eventattacher : offapi cppuhelper vos 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\prj nmake - all ea_prj NULL
Modified: openoffice/trunk/main/eventattacher/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/eventattacher/prj/d.lst?rev=1772819&r1=1772818&r2=1772819&view=diff
==============================================================================
--- openoffice/trunk/main/eventattacher/prj/d.lst (original)
+++ openoffice/trunk/main/eventattacher/prj/d.lst Tue Dec 6 01:40:58 2016
@@ -1,4 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%
-..\%__SRC%\misc\evtatt.component %_DEST%\xml%_EXT%\evtatt.component
Added: openoffice/trunk/main/eventattacher/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/eventattacher/prj/makefile.mk?rev=1772819&view=auto
==============================================================================
--- openoffice/trunk/main/eventattacher/prj/makefile.mk (added)
+++ openoffice/trunk/main/eventattacher/prj/makefile.mk Tue Dec 6 01:40:58 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/eventattacher/source/eventattacher.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/eventattacher/source/eventattacher.cxx?rev=1772819&r1=1772818&r2=1772819&view=diff
==============================================================================
--- openoffice/trunk/main/eventattacher/source/eventattacher.cxx (original)
+++ openoffice/trunk/main/eventattacher/source/eventattacher.cxx Tue Dec 6 01:40:58 2016
@@ -832,13 +832,13 @@ void EventAttacherImpl::removeListener
extern "C"
{
//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = 0;
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1772819&r1=1772818&r2=1772819&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Tue Dec 6 01:40:58 2016
@@ -74,6 +74,7 @@ my_components = \
component/dbaccess/util/dba \
component/dbaccess/util/dbu \
component/dbaccess/util/sdbt \
+ component/eventattacher/source/evtatt \
component/fileaccess/util/fileacc \
component/formula/util/for \
component/framework/util/fwk \
@@ -131,7 +132,6 @@ my_components = \
deploymentgui \
dlgprov \
embobj \
- evtatt \
filterconfig1 \
flash \
flat \