[Libreoffice-commits] .: 2 commits - Module_ooo.mk RepositoryModule_ooo.mk

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Wed May 18 02:13:07 PDT 2011


 Module_ooo.mk           |   72 ------------------------------------------------
 RepositoryModule_ooo.mk |   71 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 72 deletions(-)

New commits:
commit 93f8de9b69abd71bcf3956a630e370e193011788
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed May 18 11:09:41 2011 +0200

    remove reportbuilder from gbuild modules
    
    * there is no gbuild in it

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index db01e39..7afc016 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     lotuswordpro \
     oox \
     padmin \
-    reportbuilder \
     sc \
     sd \
     sfx2 \
commit 99079f03d95d525e7e95a56569c37094618fb2ca
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed May 18 11:06:15 2011 +0200

    rename Module_ooo.mk to RepositoryModule_ooo.mk
    
    * also change GNUMakefile.mk to find the RepositoryModule_*.mk, instead of Module_*.mk
    * subsequenttests was broken by the introduction of tail_build, because there where two Module_*.mk in root

diff --git a/Module_ooo.mk b/Module_ooo.mk
deleted file mode 100644
index bc566ac..0000000
--- a/Module_ooo.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Module_Module,ooo))
-
-$(eval $(call gb_Module_add_moduledirs,ooo,\
-    chart2 \
-    comphelper \
-    cui \
-    dbaccess \
-    drawinglayer \
-    editeng \
-    fileaccess \
-    forms \
-    formula \
-    framework \
-    lotuswordpro \
-    oox \
-    padmin \
-    reportbuilder \
-    sc \
-    sd \
-    sfx2 \
-    slideshow \
-    sot \
-    svl \
-    svtools \
-    svx \
-    sw \
-    toolkit \
-    tools \
-    unotools \
-    unoxml \
-    xmloff \
-    vbahelper \
-    writerfilter \
-))
-
-# these have only migrated subsequentcheck for now
-$(eval $(call gb_Module_add_moduledirs,ooo,\
-    configmgr \
-    linguistic \
-    qadevOOo \
-    sal \
-    ucb \
-))
-
-# vim: set noet ts=4 sw=4:
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
new file mode 100644
index 0000000..db01e39
--- /dev/null
+++ b/RepositoryModule_ooo.mk
@@ -0,0 +1,72 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,ooo))
+
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    chart2 \
+    comphelper \
+    cui \
+    dbaccess \
+    drawinglayer \
+    editeng \
+    fileaccess \
+    forms \
+    formula \
+    framework \
+    lotuswordpro \
+    oox \
+    padmin \
+    reportbuilder \
+    sc \
+    sd \
+    sfx2 \
+    slideshow \
+    sot \
+    svl \
+    svtools \
+    svx \
+    sw \
+    toolkit \
+    tools \
+    unotools \
+    unoxml \
+    xmloff \
+    vbahelper \
+    writerfilter \
+))
+
+# these have only migrated subsequentcheck for now
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    configmgr \
+    linguistic \
+    qadevOOo \
+    sal \
+    ucb \
+))
+
+# vim: set noet ts=4 sw=4:


More information about the Libreoffice-commits mailing list