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/28 14:54:00 UTC
svn commit: r1776289 - in /openoffice/trunk/main: ./ UnoControls/
UnoControls/prj/ UnoControls/source/base/ UnoControls/source/controls/
UnoControls/util/ postprocess/packcomponents/
Author: damjan
Date: Wed Dec 28 14:54:00 2016
New Revision: 1776289
URL: http://svn.apache.org/viewvc?rev=1776289&view=rev
Log:
Port main/UnoControls to gbuild.
Patch by: me
Added:
openoffice/trunk/main/UnoControls/Library_ctl.mk
openoffice/trunk/main/UnoControls/Makefile (with props)
openoffice/trunk/main/UnoControls/Module_UnoControls.mk
openoffice/trunk/main/UnoControls/prj/makefile.mk
Removed:
openoffice/trunk/main/UnoControls/source/base/makefile.mk
openoffice/trunk/main/UnoControls/source/controls/makefile.mk
openoffice/trunk/main/UnoControls/util/makefile.mk
openoffice/trunk/main/UnoControls/util/makefile.pmk
openoffice/trunk/main/UnoControls/util/target.pmk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/UnoControls/prj/build.lst
openoffice/trunk/main/UnoControls/prj/d.lst
openoffice/trunk/main/UnoControls/source/base/registercontrols.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=1776289&r1=1776288&r2=1776289&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Wed Dec 28 14:54:00 2016
@@ -25,6 +25,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
MathMLDTD \
+ UnoControls \
animations \
automation \
avmedia \
Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1776289&r1=1776288&r2=1776289&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Wed Dec 28 14:54:00 2016
@@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_librari
canvastools \
communi \
cppcanvas \
+ ctl \
cui \
dba \
dbaxml \
Added: openoffice/trunk/main/UnoControls/Library_ctl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/UnoControls/Library_ctl.mk?rev=1776289&view=auto
==============================================================================
--- openoffice/trunk/main/UnoControls/Library_ctl.mk (added)
+++ openoffice/trunk/main/UnoControls/Library_ctl.mk Wed Dec 28 14:54:00 2016
@@ -0,0 +1,62 @@
+#**************************************************************
+#
+# 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,ctl))
+
+$(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl))
+
+$(eval $(call gb_Library_set_include,ctl,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/UnoControls/inc \
+ -I$(SRCDIR)/UnoControls/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,ctl,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ctl,\
+ cppuhelper \
+ cppu \
+ sal \
+ stl \
+ tl \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,ctl,\
+ UnoControls/source/base/multiplexer \
+ UnoControls/source/base/basecontrol \
+ UnoControls/source/base/basecontainercontrol \
+ UnoControls/source/base/registercontrols \
+ UnoControls/source/controls/progressbar \
+ UnoControls/source/controls/framecontrol \
+ UnoControls/source/controls/progressmonitor \
+ UnoControls/source/controls/OConnectionPointHelper \
+ UnoControls/source/controls/OConnectionPointContainerHelper \
+ UnoControls/source/controls/statusindicator \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/UnoControls/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/UnoControls/Makefile?rev=1776289&view=auto
==============================================================================
--- openoffice/trunk/main/UnoControls/Makefile (added)
+++ openoffice/trunk/main/UnoControls/Makefile Wed Dec 28 14:54:00 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/UnoControls/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/UnoControls/Module_UnoControls.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/UnoControls/Module_UnoControls.mk?rev=1776289&view=auto
==============================================================================
--- openoffice/trunk/main/UnoControls/Module_UnoControls.mk (added)
+++ openoffice/trunk/main/UnoControls/Module_UnoControls.mk Wed Dec 28 14:54:00 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,UnoControls))
+
+$(eval $(call gb_Module_add_targets,UnoControls,\
+ Library_ctl \
+))
+
+# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/UnoControls/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/UnoControls/prj/build.lst?rev=1776289&r1=1776288&r2=1776289&view=diff
==============================================================================
--- openoffice/trunk/main/UnoControls/prj/build.lst (original)
+++ openoffice/trunk/main/UnoControls/prj/build.lst Wed Dec 28 14:54:00 2016
@@ -1,5 +1,2 @@
us UnoControls : LIBXSLT:libxslt cppuhelper offapi tools NULL
-us UnoControls usr1 - all us_mkout NULL
-us UnoControls\source\base nmake - all us_base NULL
-us UnoControls\source\controls nmake - all us_ctrls NULL
-us UnoControls\util nmake - all us_util us_base us_ctrls NULL
+us UnoControls\prj nmake - all us_prj NULL
Modified: openoffice/trunk/main/UnoControls/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/UnoControls/prj/d.lst?rev=1776289&r1=1776288&r2=1776289&view=diff
==============================================================================
--- openoffice/trunk/main/UnoControls/prj/d.lst (original)
+++ openoffice/trunk/main/UnoControls/prj/d.lst Wed Dec 28 14:54:00 2016
@@ -1,6 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\ctl.component %_DEST%\xml%_EXT%\ctl.component
Added: openoffice/trunk/main/UnoControls/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/UnoControls/prj/makefile.mk?rev=1776289&view=auto
==============================================================================
--- openoffice/trunk/main/UnoControls/prj/makefile.mk (added)
+++ openoffice/trunk/main/UnoControls/prj/makefile.mk Wed Dec 28 14:54:00 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/UnoControls/source/base/registercontrols.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/UnoControls/source/base/registercontrols.cxx?rev=1776289&r1=1776288&r2=1776289&view=diff
==============================================================================
--- openoffice/trunk/main/UnoControls/source/base/registercontrols.cxx (original)
+++ openoffice/trunk/main/UnoControls/source/base/registercontrols.cxx Wed Dec 28 14:54:00 2016
@@ -154,7 +154,7 @@ CREATEINSTANCE ( StatusIndicator )
// return environment
//______________________________________________________________________________________________________________
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
@@ -164,7 +164,7 @@ extern "C" void SAL_CALL component_getIm
// create right component factory
//______________________________________________________________________________________________________________
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
void* pServiceManager ,
void* /*pRegistryKey*/ )
{
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1776289&r1=1776288&r2=1776289&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Wed Dec 28 14:54:00 2016
@@ -55,6 +55,7 @@ my_components = \
chartmodel \
charttools \
chartview \
+ component/UnoControls/util/ctl \
component/animations/source/animcore/animcore \
component/avmedia/util/avmedia \
component/basctl/util/basctl \
@@ -128,7 +129,6 @@ my_components = \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
component/xmlscript/util/xcr \
- ctl \
date \
dbase \
dbp \