Re: [Libreoffice] [PATCH] convert MathMLDTD to gbuild and add to tail_build
On 09/13/2011 01:00 AM, Norbert Thiebaud wrote: On Mon, Sep 12, 2011 at 4:53 PM, Michael Stahlm...@openoffice.org wrote: On 12.09.2011 23:26, Peter Foley wrote: --- a/MathMLDTD/prj/build.lst +++ b/MathMLDTD/prj/build.lst @@ -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 : NULL you remove the dependency on solenv; it seems that currently we don't have any module (except solenv of course, and testautomation which doesn't do anything) that does not directly or indirectly depend on solenv; i wonder why that is? is there perhaps some reason that modules must depend on solenv? isn't that for the basic setup of solver ? (mkdir od bin inc etc..) but I believe Deliver.mk do the mkdir by precaution anyways.. so that should no have any impact here.. But that might explain the strange tinderbox failure at http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERfull-log=1315879214.25561, a missing 350minor.mk early one, where xml2cmp is one of the first three modules being built (in parallel). -Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] convert MathMLDTD to gbuild and add to tail_build
On 13.09.2011 11:09, Stephan Bergmann wrote: On 09/13/2011 01:00 AM, Norbert Thiebaud wrote: On Mon, Sep 12, 2011 at 4:53 PM, Michael Stahlm...@openoffice.org wrote: On 12.09.2011 23:26, Peter Foley wrote: --- a/MathMLDTD/prj/build.lst +++ b/MathMLDTD/prj/build.lst @@ -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 : NULL you remove the dependency on solenv; it seems that currently we don't have any module (except solenv of course, and testautomation which doesn't do anything) that does not directly or indirectly depend on solenv; i wonder why that is? is there perhaps some reason that modules must depend on solenv? isn't that for the basic setup of solver ? (mkdir od bin inc etc..) but I believe Deliver.mk do the mkdir by precaution anyways.. so that should no have any impact here.. But that might explain the strange tinderbox failure at b, a missing 350minor.mk early one, where xml2cmp is one of the first three modules being built (in parallel). -Stephan thanks for reminding me, 3X0minor.mk was the thing that i only vaguely remembered. apparently it's still necessary in converted modules because we start gmake indirectly via dmake. guess somebody should put back the solenv deps :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] convert MathMLDTD to gbuild and add to tail_build
On 09/13/2011 11:18 AM, Michael Stahl wrote: On 13.09.2011 11:09, Stephan Bergmann wrote: On 09/13/2011 01:00 AM, Norbert Thiebaud wrote: On Mon, Sep 12, 2011 at 4:53 PM, Michael Stahlm...@openoffice.org wrote: On 12.09.2011 23:26, Peter Foley wrote: --- a/MathMLDTD/prj/build.lst +++ b/MathMLDTD/prj/build.lst @@ -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 : NULL you remove the dependency on solenv; it seems that currently we don't have any module (except solenv of course, and testautomation which doesn't do anything) that does not directly or indirectly depend on solenv; i wonder why that is? is there perhaps some reason that modules must depend on solenv? isn't that for the basic setup of solver ? (mkdir od bin inc etc..) but I believe Deliver.mk do the mkdir by precaution anyways.. so that should no have any impact here.. But that might explain the strange tinderbox failure at b, a missing 350minor.mk early one, where xml2cmp is one of the first three modules being built (in parallel). -Stephan thanks for reminding me, 3X0minor.mk was the thing that i only vaguely remembered. apparently it's still necessary in converted modules because we start gmake indirectly via dmake. guess somebody should put back the solenv deps :) doing it right now -Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] convert MathMLDTD to gbuild and add to tail_build
On 09/13/2011 11:20 AM, Stephan Bergmann wrote: On 09/13/2011 11:18 AM, Michael Stahl wrote: guess somebody should put back the solenv deps :) doing it right now http://cgit.freedesktop.org/libreoffice/core/commit/?id=9f78448b9423d0b33d8ef372dc67a1903b31 -Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] convert MathMLDTD to gbuild and add to tail_build
On 13.09.2011 11:33, Stephan Bergmann wrote: On 09/13/2011 11:20 AM, Stephan Bergmann wrote: On 09/13/2011 11:18 AM, Michael Stahl wrote: guess somebody should put back the solenv deps :) doing it right now http://cgit.freedesktop.org/libreoffice/core/commit/?id=9f78448b9423d0b33d8ef372dc67a1903b31 -Stephan looks like the Mesa module also has the problem, can you fix that as well? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] convert MathMLDTD to gbuild and add to tail_build
gbuild conversion. PeterFrom 6bc7b647d1f116df04fcf43ce42db1d25ff0 Mon Sep 17 00:00:00 2001 From: Peter Foley pefol...@verizon.net Date: Mon, 12 Sep 2011 17:19:42 -0400 Subject: [PATCH] convert MathMLDTD to gbuild and add to tail_build --- MathMLDTD/Makefile| 38 ++ MathMLDTD/Module_MathMLDTD.mk | 32 MathMLDTD/Package_bin.mk | 34 ++ MathMLDTD/prj/build.lst |5 ++--- MathMLDTD/prj/d.lst |2 -- MathMLDTD/prj/makefile.mk | 40 Module_tail_build.mk |1 + RepositoryModule_ooo.mk |1 + postprocess/prj/build.lst |2 +- 9 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 MathMLDTD/Makefile create mode 100644 MathMLDTD/Module_MathMLDTD.mk create mode 100644 MathMLDTD/Package_bin.mk create mode 100644 MathMLDTD/prj/makefile.mk diff --git a/MathMLDTD/Makefile b/MathMLDTD/Makefile new file mode 100644 index 000..90947b2 --- /dev/null +++ b/MathMLDTD/Makefile @@ -0,0 +1,38 @@ +#* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# http://www.openoffice.org/license.html +# for a copy of the LGPLv3 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: diff --git a/MathMLDTD/Module_MathMLDTD.mk b/MathMLDTD/Module_MathMLDTD.mk new file mode 100644 index 000..f60b555 --- /dev/null +++ b/MathMLDTD/Module_MathMLDTD.mk @@ -0,0 +1,32 @@ +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Peter Foley pefol...@verizon.net +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +# + +$(eval $(call gb_Module_Module,MathMLDTD)) + +$(eval $(call gb_Module_add_targets,MathMLDTD,Package_bin)) diff --git a/MathMLDTD/Package_bin.mk b/MathMLDTD/Package_bin.mk new file mode 100644 index 000..a1730cd --- /dev/null +++ b/MathMLDTD/Package_bin.mk @@ -0,0 +1,34 @@ +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Peter Foley pefol...@verizon.net +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All
Re: [Libreoffice] [PATCH] convert MathMLDTD to gbuild and add to tail_build
On 12.09.2011 23:26, Peter Foley wrote: gbuild conversion. Peter hi Peter, mostly looking good except: --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ formula \ hwpfilter \ lotuswordpro \ +MathMLDTD missing backslash at EOL Mesa \ oox \ padmin \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 3f09ba7..64093db 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ idl \ linguistic \ lotuswordpro \ +MathMLDTD same problem Mesa \ o3tl \ offapi \ --- a/MathMLDTD/prj/build.lst +++ b/MathMLDTD/prj/build.lst @@ -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 : NULL you remove the dependency on solenv; it seems that currently we don't have any module (except solenv of course, and testautomation which doesn't do anything) that does not directly or indirectly depend on solenv; i wonder why that is? is there perhaps some reason that modules must depend on solenv? regards, michael -- Do you not know, my son, with how little wisdom the world is governed? -- Axel Oxenstierna ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] convert MathMLDTD to gbuild and add to tail_build
On Mon, Sep 12, 2011 at 4:53 PM, Michael Stahl m...@openoffice.org wrote: On 12.09.2011 23:26, Peter Foley wrote: gbuild conversion. Peter hi Peter, mostly looking good except: --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ formula \ hwpfilter \ lotuswordpro \ + MathMLDTD missing backslash at EOL I got that one... Mesa \ oox \ padmin \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 3f09ba7..64093db 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ idl \ linguistic \ lotuswordpro \ + MathMLDTD same problem but I missed that one... fixed now Mesa \ o3tl \ offapi \ --- a/MathMLDTD/prj/build.lst +++ b/MathMLDTD/prj/build.lst @@ -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 : NULL you remove the dependency on solenv; it seems that currently we don't have any module (except solenv of course, and testautomation which doesn't do anything) that does not directly or indirectly depend on solenv; i wonder why that is? is there perhaps some reason that modules must depend on solenv? isn't that for the basic setup of solver ? (mkdir od bin inc etc..) but I believe Deliver.mk do the mkdir by precaution anyways.. so that should no have any impact here.. Norber ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
