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 04:46:49 UTC
svn commit: r1772596 - in /openoffice/trunk/main: MathMLDTD/Makefile
MathMLDTD/Module_MathMLDTD.mk MathMLDTD/Package_dtd.mk
MathMLDTD/Package_html.mk MathMLDTD/prj/build.lst MathMLDTD/prj/d.lst
MathMLDTD/prj/makefile.mk Module_ooo.mk
Author: damjan
Date: Mon Dec 5 04:46:49 2016
New Revision: 1772596
URL: http://svn.apache.org/viewvc?rev=1772596&view=rev
Log:
Port main/MathMLDTD to gbuild.
Patch by: me
Added:
openoffice/trunk/main/MathMLDTD/Makefile (with props)
openoffice/trunk/main/MathMLDTD/Module_MathMLDTD.mk
openoffice/trunk/main/MathMLDTD/Package_dtd.mk
openoffice/trunk/main/MathMLDTD/Package_html.mk
openoffice/trunk/main/MathMLDTD/prj/makefile.mk
Modified:
openoffice/trunk/main/MathMLDTD/prj/build.lst
openoffice/trunk/main/MathMLDTD/prj/d.lst
openoffice/trunk/main/Module_ooo.mk
Added: openoffice/trunk/main/MathMLDTD/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/MathMLDTD/Makefile?rev=1772596&view=auto
==============================================================================
--- openoffice/trunk/main/MathMLDTD/Makefile (added)
+++ openoffice/trunk/main/MathMLDTD/Makefile Mon Dec 5 04:46:49 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/MathMLDTD/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/MathMLDTD/Module_MathMLDTD.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/MathMLDTD/Module_MathMLDTD.mk?rev=1772596&view=auto
==============================================================================
--- openoffice/trunk/main/MathMLDTD/Module_MathMLDTD.mk (added)
+++ openoffice/trunk/main/MathMLDTD/Module_MathMLDTD.mk Mon Dec 5 04:46:49 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,MathMLDTD))
+
+$(eval $(call gb_Module_add_targets,MathMLDTD,\
+ Package_dtd \
+ Package_html \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/MathMLDTD/Package_dtd.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/MathMLDTD/Package_dtd.mk?rev=1772596&view=auto
==============================================================================
--- openoffice/trunk/main/MathMLDTD/Package_dtd.mk (added)
+++ openoffice/trunk/main/MathMLDTD/Package_dtd.mk Mon Dec 5 04:46:49 2016
@@ -0,0 +1,25 @@
+#**************************************************************
+#
+# 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,MathMLDTD_dtd,$(SRCDIR)/MathMLDTD))
+$(eval $(call gb_Package_add_file,MathMLDTD_dtd,bin/math.dtd,math.dtd))
Added: openoffice/trunk/main/MathMLDTD/Package_html.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/MathMLDTD/Package_html.mk?rev=1772596&view=auto
==============================================================================
--- openoffice/trunk/main/MathMLDTD/Package_html.mk (added)
+++ openoffice/trunk/main/MathMLDTD/Package_html.mk Mon Dec 5 04:46:49 2016
@@ -0,0 +1,25 @@
+#**************************************************************
+#
+# 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,MathMLDTD_html,$(SRCDIR)/MathMLDTD))
+$(eval $(call gb_Package_add_file,MathMLDTD_html,bin/w3c_ipr_software_notice.html,w3c_ipr_software_notice.html))
Modified: openoffice/trunk/main/MathMLDTD/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/MathMLDTD/prj/build.lst?rev=1772596&r1=1772595&r2=1772596&view=diff
==============================================================================
--- openoffice/trunk/main/MathMLDTD/prj/build.lst (original)
+++ openoffice/trunk/main/MathMLDTD/prj/build.lst Mon Dec 5 04:46:49 2016
@@ -1,3 +1,2 @@
md MathMLDTD : solenv NULL
-md MathMLDTD usr1 - all md_mkout NULL
-md MathMLDTD\prj get - all md_prj NULL
+md MathMLDTD\prj nmake - all md_prj NULL
Modified: openoffice/trunk/main/MathMLDTD/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/MathMLDTD/prj/d.lst?rev=1772596&r1=1772595&r2=1772596&view=diff
==============================================================================
--- openoffice/trunk/main/MathMLDTD/prj/d.lst (original)
+++ openoffice/trunk/main/MathMLDTD/prj/d.lst Mon Dec 5 04:46:49 2016
@@ -1,2 +0,0 @@
-..\math.dtd %_DEST%\bin%_EXT%\math.dtd
-..\w3c_ipr_software_notice.html %_DEST%\bin%_EXT%\w3c_ipr_software_notice.html
Added: openoffice/trunk/main/MathMLDTD/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/MathMLDTD/prj/makefile.mk?rev=1772596&view=auto
==============================================================================
--- openoffice/trunk/main/MathMLDTD/prj/makefile.mk (added)
+++ openoffice/trunk/main/MathMLDTD/prj/makefile.mk Mon Dec 5 04:46:49 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/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772596&r1=1772595&r2=1772596&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Dec 5 04:46:49 2016
@@ -24,6 +24,7 @@
$(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
+ MathMLDTD \
basebmp \
basegfx \
canvas \