Author: damjan
Date: Mon Dec 5 16:59:04 2016
New Revision: 1772716
URL: http://svn.apache.org/viewvc?rev=1772716&view=rev
Log:
Port main/animations to gbuild.
Patch by: me
Added:
openoffice/trunk/main/animations/Library_animcore.mk
openoffice/trunk/main/animations/Makefile (with props)
openoffice/trunk/main/animations/Module_animations.mk
openoffice/trunk/main/animations/Package_inc.mk
openoffice/trunk/main/animations/Package_xml.mk
openoffice/trunk/main/animations/prj/makefile.mk
Removed:
openoffice/trunk/main/animations/source/animcore/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/animations/prj/build.lst
openoffice/trunk/main/animations/prj/d.lst
openoffice/trunk/main/animations/source/animcore/factreg.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=1772716&r1=1772715&r2=1772716&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Dec 5 16:59:04 2016
@@ -25,6 +25,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
MathMLDTD \
+ animations \
basebmp \
basegfx \
canvas \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1772716&r1=1772715&r2=1772716&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Mon Dec 5 16:59:04 2016
@@ -44,6 +44,7 @@ $(eval $(call gb_Helper_register_librari
adabas \
adabasui \
agg \
+ animcore \
avmedia \
basebmp \
basegfx \
Added: openoffice/trunk/main/animations/Library_animcore.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/animations/Library_animcore.mk?rev=1772716&view=auto
==============================================================================
--- openoffice/trunk/main/animations/Library_animcore.mk (added)
+++ openoffice/trunk/main/animations/Library_animcore.mk Mon Dec 5 16:59:04
2016
@@ -0,0 +1,52 @@
+#**************************************************************
+#
+# 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,animcore))
+
+$(eval $(call
gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
+
+$(eval $(call gb_Library_set_include,animcore,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/animations/inc \
+))
+
+$(eval $(call gb_Library_add_api,animcore,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,animcore,\
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,animcore,\
+ animations/source/animcore/animcore \
+ animations/source/animcore/factreg \
+ animations/source/animcore/targetpropertiescreator \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/animations/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/animations/Makefile?rev=1772716&view=auto
==============================================================================
--- openoffice/trunk/main/animations/Makefile (added)
+++ openoffice/trunk/main/animations/Makefile Mon Dec 5 16:59:04 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/animations/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/animations/Module_animations.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/animations/Module_animations.mk?rev=1772716&view=auto
==============================================================================
--- openoffice/trunk/main/animations/Module_animations.mk (added)
+++ openoffice/trunk/main/animations/Module_animations.mk Mon Dec 5 16:59:04
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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,animations))
+
+$(eval $(call gb_Module_add_targets,animations,\
+ Library_animcore \
+ Package_inc \
+ Package_xml \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/animations/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/animations/Package_inc.mk?rev=1772716&view=auto
==============================================================================
--- openoffice/trunk/main/animations/Package_inc.mk (added)
+++ openoffice/trunk/main/animations/Package_inc.mk Mon Dec 5 16:59:04 2016
@@ -0,0 +1,26 @@
+#**************************************************************
+#
+# 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_Package_Package,animations_inc,$(SRCDIR)/animations/inc))
+
+$(eval $(call
gb_Package_add_file,animations_inc,inc/animations/animationnodehelper.hxx,animations/animationnodehelper.hxx))
Added: openoffice/trunk/main/animations/Package_xml.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/animations/Package_xml.mk?rev=1772716&view=auto
==============================================================================
--- openoffice/trunk/main/animations/Package_xml.mk (added)
+++ openoffice/trunk/main/animations/Package_xml.mk Mon Dec 5 16:59:04 2016
@@ -0,0 +1,26 @@
+###############################################################
+#
+# 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_Package_Package,animations_xml,$(SRCDIR)/animations/source))
+
+$(eval $(call
gb_Package_add_file,animations_xml,xml/animcore.xml,animcore/animcore.xml))
Modified: openoffice/trunk/main/animations/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/animations/prj/build.lst?rev=1772716&r1=1772715&r2=1772716&view=diff
==============================================================================
--- openoffice/trunk/main/animations/prj/build.lst (original)
+++ openoffice/trunk/main/animations/prj/build.lst Mon Dec 5 16:59:04 2016
@@ -1,3 +1,2 @@
animations animations : cppuhelper comphelper offapi
LIBXSLT:libxslt NULL
-animations animations usr1
- all animations_mkout NULL
-animations animations\source\animcore nmake - all
animations_animcore NULL
+animations animations\prj nmake
- all animations_prj NULL
Modified: openoffice/trunk/main/animations/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/animations/prj/d.lst?rev=1772716&r1=1772715&r2=1772716&view=diff
==============================================================================
--- openoffice/trunk/main/animations/prj/d.lst (original)
+++ openoffice/trunk/main/animations/prj/d.lst Mon Dec 5 16:59:04 2016
@@ -1,10 +0,0 @@
-..\%__SRC%\bin\animcore.dll %_DEST%\bin%_EXT%\animcore.dll
-..\%__SRC%\lib\libanimcore.so %_DEST%\lib%_EXT%\libanimcore.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-..\source\animcore\animcore.xml %_DEST%\xml%_EXT%\animcore.xml
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
-
-mkdir: %_DEST%\inc%_EXT%\animations
-..\inc\animations\animationnodehelper.hxx
%_DEST%\inc%_EXT%\animations\animationnodehelper.hxx
-..\%__SRC%\misc\animcore.component %_DEST%\xml%_EXT%\animcore.component
Added: openoffice/trunk/main/animations/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/animations/prj/makefile.mk?rev=1772716&view=auto
==============================================================================
--- openoffice/trunk/main/animations/prj/makefile.mk (added)
+++ openoffice/trunk/main/animations/prj/makefile.mk Mon Dec 5 16:59:04 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/animations/source/animcore/factreg.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/animations/source/animcore/factreg.cxx?rev=1772716&r1=1772715&r2=1772716&view=diff
==============================================================================
--- openoffice/trunk/main/animations/source/animcore/factreg.cxx (original)
+++ openoffice/trunk/main/animations/source/animcore/factreg.cxx Mon Dec 5
16:59:04 2016
@@ -69,19 +69,19 @@ static struct ImplementationEntry g_entr
extern "C"
{
-sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-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 * pRegistryKey
)
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1772716&r1=1772715&r2=1772716&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Mon Dec 5
16:59:04 2016
@@ -50,7 +50,6 @@ my_components = \
uuresolver \
abp \
analysis \
- animcore \
avmedia \
basctl \
basprov \
@@ -61,6 +60,7 @@ my_components = \
chartmodel \
charttools \
chartview \
+ component/animations/source/animcore/animcore \
component/canvas/source/factory/canvasfactory \
component/canvas/source/simplecanvas/simplecanvas \
component/canvas/source/vcl/vclcanvas \
