[Libreoffice-commits] .: Branch 'feature/gnumake4' - 5 commits - Module_tail_build.mk scp2/source scp2/util solenv/gbuild
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Wed Jun 22 05:36:35 PDT 2011
Module_tail_build.mk | 1
scp2/source/base/file_base.scp | 3 --
scp2/source/canvas/makefile.mk | 1
scp2/source/canvas/mtfrenderer.scp | 40 -----------------------------------
scp2/source/ooo/file_library_ooo.scp | 6 -----
scp2/util/makefile.mk | 1
solenv/gbuild/ComponentTarget.mk | 9 ++++---
solenv/gbuild/Jar.mk | 3 +-
solenv/gbuild/JavaClassSet.mk | 7 ++++--
solenv/gbuild/LinkTarget.mk | 2 -
10 files changed, 13 insertions(+), 60 deletions(-)
New commits:
commit 22d71ab5bbefdaff0f7951d3e994cb5eaa5d57d3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 14:34:51 2011 +0200
gnumake4: add wizards to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 1086afd..a1a7add 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
starmath \
sw \
unoxml \
+ wizards \
writerfilter \
))
commit 9b315ffe2bb26dac4c280dec6a197afe7350091c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 14:33:53 2011 +0200
gnumake4: adjust scp2 to gbuild
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 01e0b7f..f98231c 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -57,9 +57,6 @@ STD_RES_FILE( gid_File_Res_Dbp, dbp)
STD_LIB_FILE( gid_File_Lib_Dbu, dbui)
STD_RES_FILE( gid_File_Res_Dbu, dbui)
-STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
-STD_RES_FILE( gid_File_Res_Adabasui, adabasui)
-
STD_RES_FILE( gid_File_Res_Cnr, cnr)
STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 1e360be..4c38d16 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -41,7 +41,6 @@ SCP_PRODUCT_TYPE=osl
PARFILES= canvascommons.par \
vclcanvas.par \
- mtfrenderer.par
.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
PARFILES+= cairocanvas.par
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
deleted file mode 100644
index fa2a3f9..0000000
--- a/scp2/source/canvas/mtfrenderer.scp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2010 Novell, Inc.
- *
- * 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.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Lib_MtfRenderer
- TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
- RegistryID = gid_Starregistry_Services_Rdb;
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libmtfrenderer.uno,UNXSUFFIX));
- #else
- Name = "mtfrenderer.uno.dll";
- #endif
-End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 87891a2..9474eb4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -898,12 +898,6 @@ STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel)
-
-STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
-
-STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
-
#ifdef WNT
#if defined(_gcc3)
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index ea4793a..af4861d 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -205,7 +205,6 @@ SCP1FILES += \
SCP1FILES += \
vclcanvas.par \
- mtfrenderer.par
.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
SCP1FILES += cairocanvas.par
commit 7887e23834e58c1b8f83c638b9aec8e6dcd9182b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 14:30:32 2011 +0200
gnumake4: fixup the component foo
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 532a4ea..3a6b0f0 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -67,12 +67,13 @@ $(call gb_ComponentTarget_get_external_target,%) :
$(call gb_Deliver_deliver,$<,$@)
define gb_ComponentTarget_ComponentTarget
-$(call gb_ComponentTarget_get_target,$(4)) : LIBFILENAME := $(3)
+$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
+$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
+$(call gb_ComponentTarget_get_inbuild_target,$(1)) : COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
-$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(4))
-$(call gb_ComponentTarget_get_inbuild_target,$(1)) : \
- COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
+$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)))
endef
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 06ea44a..4b985a7 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -156,7 +156,8 @@ gb_Jar__get_componentprefix = \
# layer must be specified explicitly in this macro (different to libraries)
define gb_Jar_set_componentfile
$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Jar__get_componentprefix,$(3)),$(notdir $(call gb_Jar_get_target,$(1))))
-$(call gb_Jar_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Jar_get_target,$(1)) : \
+ $(call gb_ComponentTarget_get_outdir_target,$(2))
$(call gb_Jar_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
endef
commit 133a058b30a552d71e327a0d6666498c34ecf62b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 11:54:50 2011 +0200
gnumake4: fix JavaClassSet clean target
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 454caac..e2ce686 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -31,14 +31,17 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
define gb_JavaClassSet__command
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
- $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
+ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
+ -cp "$(CLASSPATH)" \
+ -d $(call gb_JavaClassSet_get_classdir,$(2)) \
+ $(if $(filter-out $(JARDEPS),$(3)),\
$(filter-out $(JARDEPS),$(3)),\
$(filter-out $(JARDEPS),$(4))) &&) \
touch $(1))
endef
-$(call gb_JavaClassSet_get_clean_target,%) :
+$(call gb_JavaClassSet_get_target,%) :
$(call gb_Output_announce,$*,$(true),JCS,3)
$(call gb_JavaClassSet__command,$@,$*,$?,$^)
commit 2961053324a58621572905948ce3cf1f367daaf3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jun 21 15:29:43 2011 +0200
gnumake4: remove debug output
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 20f99db..f1f696e 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -751,7 +751,6 @@ endef
define gb_LinkTarget_add_linktarget_objects
$(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget)))
-$(info gb_LinkTarget_add_linktarget_objects,$(1),$(2))
$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS += $(foreach linktarget,$(2),$(call gb_LinkTarget_get_objects_list,$(linktarget)))
endef
@@ -761,7 +760,6 @@ ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
$$(eval $$(call gb_Output_error,Cannot import objects library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
endif
-$(info gb_LinkTarget_add_library_objects,$(1),$(2))
$(call gb_LinkTarget_add_linktarget_objects,$(1),$(foreach lib,$(2),$(call gb_Library_get_linktargetname,$(lib))))
endef
More information about the Libreoffice-commits
mailing list