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/05 05:05:09 UTC
svn commit: r1772599 - in /openoffice/trunk/main: Module_ooo.mk
x11_extensions/Makefile x11_extensions/Module_x11_extensions.mk
x11_extensions/Package_inc.mk x11_extensions/prj/build.lst
x11_extensions/prj/d.lst x11_extensions/prj/makefile.mk
Author: damjan
Date: Mon Dec 5 05:05:09 2016
New Revision: 1772599
URL: http://svn.apache.org/viewvc?rev=1772599&view=rev
Log:
Port main/x11_extensions to gbuild.
Patch by: me
Added:
openoffice/trunk/main/x11_extensions/Makefile (with props)
openoffice/trunk/main/x11_extensions/Module_x11_extensions.mk
openoffice/trunk/main/x11_extensions/Package_inc.mk
openoffice/trunk/main/x11_extensions/prj/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/x11_extensions/prj/build.lst
openoffice/trunk/main/x11_extensions/prj/d.lst
Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772599&r1=1772598&r2=1772599&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Dec 5 05:05:09 2016
@@ -66,6 +66,7 @@ $(eval $(call gb_Module_add_moduledirs,o
vcl \
wizards \
writerfilter \
+ x11_extensions \
xmloff \
xmlreader \
xmlscript \
Added: openoffice/trunk/main/x11_extensions/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/x11_extensions/Makefile?rev=1772599&view=auto
==============================================================================
--- openoffice/trunk/main/x11_extensions/Makefile (added)
+++ openoffice/trunk/main/x11_extensions/Makefile Mon Dec 5 05:05:09 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/x11_extensions/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/x11_extensions/Module_x11_extensions.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/x11_extensions/Module_x11_extensions.mk?rev=1772599&view=auto
==============================================================================
--- openoffice/trunk/main/x11_extensions/Module_x11_extensions.mk (added)
+++ openoffice/trunk/main/x11_extensions/Module_x11_extensions.mk Mon Dec 5 05:05:09 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,x11_extensions))
+
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Module_add_targets,x11_extensions,\
+ Package_inc \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/x11_extensions/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/x11_extensions/Package_inc.mk?rev=1772599&view=auto
==============================================================================
--- openoffice/trunk/main/x11_extensions/Package_inc.mk (added)
+++ openoffice/trunk/main/x11_extensions/Package_inc.mk Mon Dec 5 05:05:09 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_Package_Package,x11_extensions_inc,$(SRCDIR)/x11_extensions))
+
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/Xrandr,inc/Xrandr.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/Xrender,inc/Xrender.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/randr.h,inc/randr.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/randrproto.h,inc/randrproto.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/render.h,inc/render.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/renderproto.h,inc/renderproto.h))
Modified: openoffice/trunk/main/x11_extensions/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/x11_extensions/prj/build.lst?rev=1772599&r1=1772598&r2=1772599&view=diff
==============================================================================
--- openoffice/trunk/main/x11_extensions/prj/build.lst (original)
+++ openoffice/trunk/main/x11_extensions/prj/build.lst Mon Dec 5 05:05:09 2016
@@ -1,3 +1,3 @@
x1 x11_extensions : solenv NULL
-x1 x11_extensions usr1 - u x11_mkout NULL
+x1 x11_extensions\prj nmake - all x11_prj NULL
Modified: openoffice/trunk/main/x11_extensions/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/x11_extensions/prj/d.lst?rev=1772599&r1=1772598&r2=1772599&view=diff
==============================================================================
--- openoffice/trunk/main/x11_extensions/prj/d.lst (original)
+++ openoffice/trunk/main/x11_extensions/prj/d.lst Mon Dec 5 05:05:09 2016
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\X11
-mkdir: %_DEST%\inc%_EXT%\X11\extensions
-
-..\inc\*.h %_DEST%\inc%_EXT%\X11\extensions\*.h
-
Added: openoffice/trunk/main/x11_extensions/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/x11_extensions/prj/makefile.mk?rev=1772599&view=auto
==============================================================================
--- openoffice/trunk/main/x11_extensions/prj/makefile.mk (added)
+++ openoffice/trunk/main/x11_extensions/prj/makefile.mk Mon Dec 5 05:05:09 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