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/12 03:44:37 UTC
svn commit: r1773730 - in /openoffice/trunk/main: ./ udm/ udm/prj/
udm/source/html/ udm/source/mkinc/ udm/source/xml/
Author: damjan
Date: Mon Dec 12 03:44:36 2016
New Revision: 1773730
URL: http://svn.apache.org/viewvc?rev=1773730&view=rev
Log:
Port main/udm to gbuild.
Patch by: me
Added:
openoffice/trunk/main/udm/Makefile (with props)
openoffice/trunk/main/udm/Module_udm.mk
openoffice/trunk/main/udm/Package_inc.mk
openoffice/trunk/main/udm/StaticLibrary_udm.mk
openoffice/trunk/main/udm/prj/makefile.mk
Removed:
openoffice/trunk/main/udm/source/html/makefile.mk
openoffice/trunk/main/udm/source/mkinc/
openoffice/trunk/main/udm/source/xml/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/udm/prj/build.lst
openoffice/trunk/main/udm/prj/d.lst
Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1773730&r1=1773729&r2=1773730&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Dec 12 03:44:36 2016
@@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,o
uui \
vbahelper \
vcl \
+ udm \
wizards \
writerfilter \
x11_extensions \
Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1773730&r1=1773729&r2=1773730&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Mon Dec 12 03:44:36 2016
@@ -193,6 +193,7 @@ $(eval $(call gb_Helper_register_static_
ooopathutils \
salcpprt \
vclmain \
+ udm \
))
# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/udm/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udm/Makefile?rev=1773730&view=auto
==============================================================================
--- openoffice/trunk/main/udm/Makefile (added)
+++ openoffice/trunk/main/udm/Makefile Mon Dec 12 03:44:36 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/udm/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/udm/Module_udm.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udm/Module_udm.mk?rev=1773730&view=auto
==============================================================================
--- openoffice/trunk/main/udm/Module_udm.mk (added)
+++ openoffice/trunk/main/udm/Module_udm.mk Mon Dec 12 03:44:36 2016
@@ -0,0 +1,31 @@
+#**************************************************************
+#
+# 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,udm))
+
+$(eval $(call gb_Module_add_targets,udm,\
+ Package_inc \
+ StaticLibrary_udm \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/udm/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udm/Package_inc.mk?rev=1773730&view=auto
==============================================================================
--- openoffice/trunk/main/udm/Package_inc.mk (added)
+++ openoffice/trunk/main/udm/Package_inc.mk Mon Dec 12 03:44:36 2016
@@ -0,0 +1,27 @@
+#**************************************************************
+#
+# 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,udm_inc,$(SRCDIR)/udm/inc/udm))
+
+$(eval $(call gb_Package_add_file,udm_inc,inc/udm/html/htmlitem.hxx,html/htmlitem.hxx))
+$(eval $(call gb_Package_add_file,udm_inc,inc/udm/xml/xmlitem.hxx,xml/xmlitem.hxx))
Added: openoffice/trunk/main/udm/StaticLibrary_udm.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udm/StaticLibrary_udm.mk?rev=1773730&view=auto
==============================================================================
--- openoffice/trunk/main/udm/StaticLibrary_udm.mk (added)
+++ openoffice/trunk/main/udm/StaticLibrary_udm.mk Mon Dec 12 03:44:36 2016
@@ -0,0 +1,47 @@
+#**************************************************************
+#
+# 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_StaticLibrary_StaticLibrary,udm))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_StaticLibrary_add_cflags,udm,-GR))
+else ifeq ($(OS),LINUX)
+$(eval $(call gb_StaticLibrary_add_cflags,udm,-frtti))
+else ifeq ($(OS),FREEBSD)
+$(eval $(call gb_StaticLibrary_add_cflags,udm,-frtti))
+else ifeq ($(OS),NETBSD)
+$(eval $(call gb_StaticLibrary_add_cflags,udm,-frtti))
+endif
+
+$(eval $(call gb_StaticLibrary_set_include,udm,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/udm/source/inc \
+ -I$(SRCDIR)/udm/inc \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,udm,\
+ udm/source/html/htmlitem \
+ udm/source/xml/xmlitem \
+))
+
+# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/udm/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udm/prj/build.lst?rev=1773730&r1=1773729&r2=1773730&view=diff
==============================================================================
--- openoffice/trunk/main/udm/prj/build.lst (original)
+++ openoffice/trunk/main/udm/prj/build.lst Mon Dec 12 03:44:36 2016
@@ -1,12 +1,2 @@
ud udm : cosv NULL
-ud udm usr1 - all ud_mkout NULL
-ud udm\prj get - all ud_prj NULL
-ud udm\inc get - all ud_inc NULL
-ud udm\inc\udm get - all udi_udm NULL
-ud udm\inc\udm\html get - all udiu_html NULL
-ud udm\inc\udm\xml get - all udiu_xml NULL
-ud udm\source get - all ud_src NULL
-ud udm\source\html nmake - all uds_html NULL
-ud udm\source\xml nmake - all uds_xml NULL
-ud udm\util nmake - all ud_util uds_xml uds_html NULL
-#================================================================================
+ud udm\prj nmake - all ud_prj NULL
Modified: openoffice/trunk/main/udm/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udm/prj/d.lst?rev=1773730&r1=1773729&r2=1773730&view=diff
==============================================================================
--- openoffice/trunk/main/udm/prj/d.lst (original)
+++ openoffice/trunk/main/udm/prj/d.lst Mon Dec 12 03:44:36 2016
@@ -1,9 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\udm
-mkdir: %_DEST%\inc%_EXT%\udm\html
-mkdir: %_DEST%\inc%_EXT%\udm\xml
-
-..\%__SRC%\lib\udm.lib %_DEST%\lib%_EXT%\udm.lib
-..\%__SRC%\lib\libudm.a %_DEST%\lib%_EXT%\libudm.a
-..\inc\udm\html\*.hxx %_DEST%\inc%_EXT%\udm\html\*.hxx
-..\inc\udm\xml\*.hxx %_DEST%\inc%_EXT%\udm\xml\*.hxx
-
Added: openoffice/trunk/main/udm/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udm/prj/makefile.mk?rev=1773730&view=auto
==============================================================================
--- openoffice/trunk/main/udm/prj/makefile.mk (added)
+++ openoffice/trunk/main/udm/prj/makefile.mk Mon Dec 12 03:44:36 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