[Libreoffice-commits] .: idlc/Executable_idlc.mk rsc/Executable_rsc.mk solenv/gbuild

[Matus Kukan]

 idlc/Executable_idlc.mk |3 ---
 rsc/Executable_rsc.mk   |3 ---
 solenv/gbuild/LinkTarget.mk |   36 
 3 files changed, 16 insertions(+), 26 deletions(-)

New commits:
commit b5607764171b8364b5e89948a2a5c3ab9749a160
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Apr 14 22:48:55 2012 +0200

YaccTarget and headers cleaning

diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk
index 7e19722..4319857 100644
--- a/idlc/Executable_idlc.mk
+++ b/idlc/Executable_idlc.mk
@@ -27,7 +27,6 @@
 $(eval $(call gb_Executable_Executable,idlc))
 
 $(eval $(call gb_Executable_set_include,idlc,\
--I$(WORKDIR)/YaccTarget/idlc/source \
 -I$(SRCDIR)/idlc/inc \
 -I$(SRCDIR)/idlc/source \
 $$(INCLUDE) \
@@ -43,8 +42,6 @@ $(eval $(call gb_Executable_add_grammars,idlc,\
 idlc/source/parser \
 ))
 
-$(WORKDIR)/GenCxxObject/YaccTarget/idlc/source/parser.o: T_CXXFLAGS := 
$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
-
 $(eval $(call gb_Executable_use_custom_headers,idlc,idlc/scanner))
 
 $(eval $(call gb_Executable_add_exception_objects,idlc,\
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 9c0f1e3..c9a1360 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Executable_Executable,rsc))
 $(eval $(call gb_Executable_set_include,rsc,\
$$(INCLUDE) \
-I$(SRCDIR)/rsc/inc \
-   -I$(WORKDIR)/YaccTarget/rsc/source/parser \
 ))
 
 $(eval $(call gb_Executable_use_api,rsc,\
@@ -55,8 +54,6 @@ $(eval $(call gb_Executable_add_grammars,rsc,\
rsc/source/parser/rscyacc \
 ))
 
-$(WORKDIR)/GenCxxObject/YaccTarget/rsc/source/parser/rscyacc.o: T_CXXFLAGS := 
$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
-
 $(eval $(call gb_Executable_add_exception_objects,rsc,\
rsc/source/parser/erscerr \
rsc/source/parser/rscdb \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index dc75200..cde46b0 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -197,7 +197,7 @@ gb_YaccTarget_get_source = $(1)/$(2).y
 
 .PHONY : $(call gb_YaccTarget_get_clean_target,%)
 $(call gb_YaccTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$(2),$(false),YAC,3)
+   $(call gb_Output_announce,$*,$(false),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_YaccTarget_get_grammar_target,$*) $(call 
gb_YaccTarget_get_header_target,$*) $(call gb_YaccTarget_get_target,$*))
 
@@ -547,6 +547,15 @@ endif
 
 endef
 
+define gb_LinkTarget__add_include
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(2)
+endif
+
+endef
+
 define gb_LinkTarget_set_include
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
@@ -584,24 +593,14 @@ $$(call gb_Output_error,\
 endef
 
 define gb_LinkTarget_use_api
-$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
-   $$(foreach api,$(2),$$(call gb_Package_get_target,$$(api)_inc))
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += $$(foreach 
api,$(2),-I$(OUTDIR)/inc/$$(api))
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += $$(foreach 
api,$(2),-I$(OUTDIR)/inc/$$(api))
-endif
+$(foreach api,$(2),$(call gb_LinkTarget__use_internal_api_one,$(1),$(api)))
 
 endef
 
 define gb_LinkTarget__use_internal_api_one
 $(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
-   $(call gb_UnoApiHeadersTarget_get_$(3)target,$(api))
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call 
gb_UnoApiHeadersTarget_get_$(3)dir,$(api))
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call 
gb_UnoApiHeadersTarget_get_$(3)dir,$(api))
-endif
+   $(call gb_UnoApiHeadersTarget_get_$(3)target,$(2))
+$(call gb_LinkTarget__add_include,$(1),$(call 
gb_UnoApiHeadersTarget_get_$(3)dir,$(2)))
 
 endef
 
@@ -831,9 +830,10 @@ endef
 # gb_LinkTarget_add_grammar(component,grammar file)
 define gb_LinkTarget_add_grammar
 $(call gb_YaccTarget_YaccTarget,$(2))
-$(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccTarget/$(2))
+$(call gb_LinkTarget_add_generated_exception_object,$(1),YaccTarget/$(2))
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_YaccTarget_get_clean_target,$(2))
 $(call gb_LinkTarget__add_internal_headers,$(1),$(call 
gb_YaccTarget_get_header_target,$(2)))
+$(call gb_LinkTarget__add_include,$(1),$(dir $(call 
gb_YaccTarget_get_header_target,$(2
 
 endef
 
@@ -976,11 +976,7 @@ endef
 define gb_LinkTarget__use_custom_headers
 $(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
$(call gb_CustomTarget_get_target,$(2))
-$(call 

[Libreoffice-commits] .: sd/Library_sd.mk slideshow/Library_slideshow.mk

[Matus Kukan]

 sd/Library_sd.mk   |5 -
 slideshow/Library_slideshow.mk |5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit f0a5768f14cdb11e3f5904df7c4775bc4393648e
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Apr 16 14:54:44 2012 +0200

animations is not api, it should be animations_inc package

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 92c8531..1e5be7b 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -48,6 +48,10 @@ $(eval $(call gb_Library_add_sdi_headers,sd,\
 sd/sdi/sdslots \
 ))
 
+$(eval $(call gb_Library_use_packages,sd,\
+   animations_inc \
+))
+
 $(eval $(call gb_Library_set_include,sd,\
 $$(INCLUDE) \
 -I$(SRCDIR)/sd/inc \
@@ -68,7 +72,6 @@ $(eval $(call gb_Library_set_defs,sd,\
 endif
 
 $(eval $(call gb_Library_use_api,sd,\
-animations \
 offapi \
 udkapi \
 ))
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 38b3fe2..658456d 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,slideshow))
 
+$(eval $(call gb_Library_use_packages,slideshow,\
+   animations_inc \
+))
+
 $(eval $(call gb_Library_set_include,slideshow,\
 $$(INCLUDE) \
 -I$(SRCDIR)/slideshow/source/inc \
@@ -44,7 +48,6 @@ $(eval $(call gb_Library_add_defs,slideshow,\
 endif
 
 $(eval $(call gb_Library_use_api,slideshow,\
-animations \
 offapi \
 udkapi \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/Library_presenter.mk sdext/source unusedcode.easy

[Matus Kukan]

 sdext/Library_presenter.mk|2 
 sdext/source/presenter/PresenterAnimation.cxx |   75 ---
 sdext/source/presenter/PresenterAnimation.hxx |  110 -
 sdext/source/presenter/PresenterAnimator.cxx  |  139 --
 sdext/source/presenter/PresenterAnimator.hxx  |   69 --
 sdext/source/presenter/PresenterController.cxx|3 
 sdext/source/presenter/PresenterController.hxx|2 
 sdext/source/presenter/PresenterWindowManager.cxx |2 
 unusedcode.easy   |1 
 9 files changed, 403 deletions(-)

New commits:
commit 2d0e58e1fca4d098ecea1a3b0c0fe1447da99855
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Apr 14 16:21:40 2012 +0200

unusedcode: PresenterAnimation and PresenterAnimator

diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index 7cefb48..c6232de 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,PresenterScreen,\
 
 $(eval $(call gb_Library_add_exception_objects,PresenterScreen,\
 sdext/source/presenter/PresenterAccessibility \
-sdext/source/presenter/PresenterAnimation \
-sdext/source/presenter/PresenterAnimator \
 sdext/source/presenter/PresenterBitmapContainer \
 sdext/source/presenter/PresenterButton \
 sdext/source/presenter/PresenterCanvasHelper \
diff --git a/sdext/source/presenter/PresenterAnimation.cxx 
b/sdext/source/presenter/PresenterAnimation.cxx
deleted file mode 100644
index b5c30ec..000
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * 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.
- *
- /
-
-#include PresenterAnimation.hxx
-
-#include osl/time.h
-
-namespace sdext { namespace presenter {
-
-sal_uInt64 GetCurrentTime (void)
-{
-TimeValue aTimeValue;
-if (osl_getSystemTime(aTimeValue))
-return sal_uInt64(aTimeValue.Seconds * 1000.0 + aTimeValue.Nanosec / 
100.0);
-else
-return 0;
-}
-
-PresenterAnimation::PresenterAnimation (
-const sal_uInt64 nStartDelay,
-const sal_uInt64 nTotalDuration,
-const sal_uInt64 nStepDuration)
-: mnStartTime(GetCurrentTime()+nStartDelay),
-  mnTotalDuration(nTotalDuration),
-  mnStepDuration(nStepDuration)
-{
-}
-
-PresenterAnimation::~PresenterAnimation (void)
-{
-}
-
-sal_uInt64 PresenterAnimation::GetStartTime (void)
-{
-return mnStartTime;
-}
-
-sal_uInt64 PresenterAnimation::GetEndTime (void)
-{
-return mnStartTime + mnTotalDuration;
-}
-
-sal_uInt64 PresenterAnimation::GetStepDuration (void)
-{
-return mnStepDuration;
-}
-
-} } // end of namespace ::sdext::presenter
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterAnimation.hxx 
b/sdext/source/presenter/PresenterAnimation.hxx
deleted file mode 100644
index 8c2ce42..000
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * 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 

[Libreoffice-commits] .: solenv/gbuild

[Matus Kukan]

 solenv/gbuild/Helper.mk |   17 -
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |7 +--
 solenv/gbuild/platform/com_GCC_defs.mk  |8 ++--
 3 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit 8fd5ba3749aa740b3c060db775b42f15a5ce50a7
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Apr 13 11:18:26 2012 +0200

gbuild: improve handling of paths

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 3d41f77..e5106db 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -43,13 +43,28 @@ $(gb_Helper_MISCDUMMY) :
 define gb_Helper_abbreviate_dirs
 S=$(SRCDIR)  \
 $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR))  \
-$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR)  $(subst 
$(WORKDIR)/,$$W/,$(1
+$(subst $(SRCDIR)/,$$S/,W=$(WORKDIR))  \
+$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,\
+$(call gb_Helper_unix_path,$(1)
 endef
 
 define gb_Helper_abbreviate_dirs_native
 $(call gb_Helper_native_path,$(call gb_Helper_abbreviate_dirs,$(1)))
 endef
 
+# Convert path to native notation
+# First convert to unix style to avoid problems when
+# $(SRCDIR) is substring of $(gb_Helper_SRCDIR_NATIVE)
+# and $(1) already contains $(gb_Helper_SRCDIR_NATIVE)
+define gb_Helper_native_path
+$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE),$(call gb_Helper_unix_path,$(1)))
+endef
+
+# $(gb_Helper_SRCDIR_NATIVE) can't be substring of $(SRCDIR)
+define gb_Helper_unix_path
+$(subst $(gb_Helper_SRCDIR_NATIVE),$(SRCDIR),$(1))
+endef
+
 define gb_Helper_make_clean_target
 gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index fff0b8a..a6d88ff 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -244,15 +244,10 @@ endif
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
+gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
 
 gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
 
-gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
-# Convert path to native notation
-define gb_Helper_native_path
-$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE),$(1))
-endef
-
 # Convert path to file URL.
 define gb_Helper_make_url
 file:///$(strip $(1))
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 8287624..cf4dcab 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -115,7 +115,7 @@ gb_COMPILERNOOPTFLAGS := -O0
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
-
+# Helper class
 
 ifeq ($(OS_FOR_BUILD),MACOSX)
 gb_Helper_LIBRARY_PATH_VAR := DYLD_LIBRARY_PATH
@@ -134,11 +134,6 @@ define gb_Helper_extend_ld_path
 $(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir))
 endef
 
-# Convert path to native notation
-define gb_Helper_native_path
-$(1)
-endef
-
 # Convert path to file URL.
 define gb_Helper_make_url
 file://$(strip $(1))
@@ -146,5 +141,6 @@ endef
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
+gb_Helper_SRCDIR_NATIVE := $(SRCDIR)
 
 gb_Helper_get_rcfile = $(1)rc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - idlc/CustomTarget_scanner.mk idlc/Executable_idlc.mk idlc/Executable_idlcpp.mk idlc/inc idlc/Makefile idlc/Module_idlc.mk idlc/prj idlc/source Makefile Repository.

[Matus Kukan]

 Makefile|2 
 Repository.mk   |5 +
 RepositoryModule_ooo.mk |1 
 idlc/CustomTarget_scanner.mk|   39 
 idlc/Executable_idlc.mk |   75 
 idlc/Executable_idlcpp.mk   |   46 ++
 idlc/Makefile   |7 ++
 idlc/Module_idlc.mk |   35 +++
 idlc/inc/makefile.mk|   39 
 idlc/prj/build.lst  |4 -
 idlc/prj/d.lst  |7 --
 idlc/prj/makefile.mk|1 
 idlc/source/makefile.mk |  124 
 idlc/source/preproc/eval.c  |   24 +++
 idlc/source/preproc/makefile.mk |   77 
 15 files changed, 223 insertions(+), 263 deletions(-)

New commits:
commit 99b04ed2be3023bec874fce529d453123f48ac99
Author: David Ostrovsky david.ostrov...@gmx.de
Date:   Fri Apr 13 13:13:42 2012 +0200

WaE: declaration of 'rand' shadows a global declaration

diff --git a/idlc/source/preproc/eval.c b/idlc/source/preproc/eval.c
index 9a1a620..41cc2e3 100644
--- a/idlc/source/preproc/eval.c
+++ b/idlc/source/preproc/eval.c
@@ -262,7 +262,7 @@ long
 {
 Token *tp;
 Nlist *np;
-int ntok, rand;
+int ntok, local_rand;
 
 trp-tp++;
 if (kw == KIFDEF || kw == KIFNDEF)
@@ -283,7 +283,7 @@ long
 vp = vals;
 op = ops;
 *op++ = END;
-for (rand = 0, tp = trp-bp + ntok; tp  trp-lp; tp++)
+for (local_rand = 0, tp = trp-bp + ntok; tp  trp-lp; tp++)
 {
 switch (tp-type)
 {
@@ -298,17 +298,17 @@ long
 case NUMBER:
 case CCON:
 case STRING:
-if (rand)
+if (local_rand)
 goto syntax;
 *vp++ = tokval(tp);
-rand = 1;
+local_rand = 1;
 continue;
 
 /* unary */
 case DEFINED:
 case TILDE:
 case NOT:
-if (rand)
+if (local_rand)
 goto syntax;
 *op++ = tp-type;
 continue;
@@ -318,7 +318,7 @@ long
 case MINUS:
 case STAR:
 case AND:
-if (rand == 0)
+if (local_rand == 0)
 {
 if (tp-type == MINUS)
 *op++ = UMINUS;
@@ -349,22 +349,22 @@ long
 case QUEST:
 case COLON:
 case COMMA:
-if (rand == 0)
+if (local_rand == 0)
 goto syntax;
 if (evalop(priority[tp-type]) != 0)
 return 0;
 *op++ = tp-type;
-rand = 0;
+local_rand = 0;
 continue;
 
 case LP:
-if (rand)
+if (local_rand)
 goto syntax;
 *op++ = LP;
 continue;
 
 case RP:
-if (!rand)
+if (!local_rand)
 goto syntax;
 if (evalop(priority[RP]) != 0)
 return 0;
@@ -382,7 +382,7 @@ long
 if (np  (np-val == KMACHINE))
 {
 tp++;
-if (rand)
+if (local_rand)
 goto syntax;
 *op++ = ARCHITECTURE;
 continue;
@@ -395,7 +395,7 @@ long
 return 0;
 }
 }
-if (rand == 0)
+if (local_rand == 0)
 goto syntax;
 if (evalop(priority[END]) != 0)
 return 0;
commit bed6580ec330fea6bc7ee015adf1baf6298ed3fb
Author: David Ostrovsky david.ostrov...@gmx.de
Date:   Fri Apr 6 01:51:05 2012 +0200

gbuild conversion: idlc module

diff --git a/Makefile b/Makefile
index 865a324..338e620 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ hwpfilter\
 i18npool\
 i18nutil\
 idl\
+idlc\
 io\
 javaunohelper\
 jurt\
@@ -176,7 +177,6 @@ hunspell\
 hyphen\
 icc\
 icu\
-idlc\
 instsetoo_native\
 jfreereport\
 jpeg\
diff --git a/Repository.mk b/Repository.mk
index 1a3851e..2bf19b6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -53,6 +53,11 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 xpdfimport \
 ))
 
+$(eval $(call gb_Helper_register_executables,SDK, \
+idlc \
+idlcpp \
+))
+
 $(eval $(call gb_Helper_register_executables,OOO, \
 spadmin.bin \
$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index a79028c..ea5d5ab 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 i18npool \
 i18nutil \
 idl \
+idlc \
 javaunohelper \
 jvmaccess \
 jvmfwk \
diff --git 

[Libreoffice-commits] .: solenv/bin

[Matus Kukan]

 solenv/bin/macosx-change-install-names.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c80ad06fd96a4fec062a7edfff12bb65ef204b4
Author: David Ostrovsky david.ostrov...@gmx.de
Date:   Fri Apr 13 15:50:38 2012 +0200

fix macosx build

diff --git a/solenv/bin/macosx-change-install-names.pl 
b/solenv/bin/macosx-change-install-names.pl
index 91bea7e..ad0318a 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -53,7 +53,7 @@ sub action($$$)
 ('app/UREBIN/URELIB' = '@executable_path/../lib',
  'app/OOO/URELIB' = '@executable_path/../ure-link/lib',
  'app/OOO/OOO' = '@executable_path',
- 'app/SDK/URELIB' = '@executable_path/../../ure-link/lib',
+ 'app/SDKBIN/URELIB' = '@executable_path/../../ure-link/lib',
  'app/NONE/URELIB' = '@__VIA_LIBRARY_PATH__',
  'app/NONE/OOO' = '@__VIA_LIBRARY_PATH__',
  'app/NONE/NONE' = '@__VIA_LIBRARY_PATH__',
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - Makefile.post scripting/Jar_ScriptProviderForBeanShell.mk solenv/gbuild

[Matus Kukan]

 Makefile.post   |6 +-
 scripting/Jar_ScriptProviderForBeanShell.mk |3 +--
 solenv/gbuild/LinkTarget.mk |   11 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit a4f4e51304e9c26b58d4ab5ee4f0a63e3cd4ec91
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Apr 11 17:24:06 2012 +0200

use gb_Helper_make_url here

diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk 
b/scripting/Jar_ScriptProviderForBeanShell.mk
index abe6125..7ef9af6 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -42,10 +42,9 @@ $(eval $(call 
gb_Jar_use_externals,ScriptProviderForBeanShell,\
 
 $(eval $(call 
gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF))
 
-#TODO: Ensure file://$(BSH_JAR) is a proper file URL:
 ifeq ($(SYSTEM_BSH),YES)
 $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
-ScriptFramework.jar file://$(BSH_JAR)))
+ScriptFramework.jar $(call gb_Helper_make_url,$(BSH_JAR
 else
 $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
 ScriptFramework.jar bsh.jar))
commit 803b1840c860be843e370108febbf7b89e71
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Apr 10 12:12:40 2012 +0200

include environment also here

diff --git a/Makefile.post b/Makefile.post
index bfa8b34..76ea25b 100644
--- a/Makefile.post
+++ b/Makefile.post
@@ -1,7 +1,11 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LISTconfig_host.mk
+endif
+
 include $(SOLARENV)/gbuild/gbuild.mk
+
 $(eval $(call gb_Module_make_global_targets,$(wildcard 
$(SRCDIR)/RepositoryModule_*.mk)))
 
 # vim: set noet sw=4 ts=4:
commit 5a248896bee2a20685ec32f85b3992a1b747355d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Apr 10 03:04:49 2012 +0200

gbuild: use = external headers

This fixes circular dependencies.

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 37e2025..8d886c6 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -617,7 +617,8 @@ endif
 endef
 
 define gb_LinkTarget__use_internal_api_one
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call 
gb_UnoApiHeadersTarget_get_$(3)target,$(api)))
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+   $(call gb_UnoApiHeadersTarget_get_$(3)target,$(api))
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call 
gb_UnoApiHeadersTarget_get_$(3)dir,$(api))
 ifeq ($(gb_FULLDEPS),$(true))
@@ -995,13 +996,13 @@ $$(call gb_Output_error,\
 endef
 
 define gb_LinkTarget__use_custom_headers
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+   $(call gb_CustomTarget_get_target,$(2))
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call 
gb_CustomTarget_get_workdir,$(2))
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call 
gb_CustomTarget_get_workdir,$(2))
 endif
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call 
gb_CustomTarget_get_target,$(2)))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_CustomTarget_get_clean_target,$(2))
 
 endef
 
@@ -1028,8 +1029,8 @@ endef
 
 # use a header package, possibly from another module (i.e. via OUTDIR)
 define gb_LinkTarget_use_package
-$(call gb_LinkTarget_get_headers_target,$(1) : | \
-   $(call gb_Package_get_target,$(strip $(2
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+   $(call gb_Package_get_target,$(strip $(2)))
 
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/CppunitTest_dbaccess_macros_test.mk i18npool/Library_i18npool.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_databa

[Matus Kukan]

 dbaccess/CppunitTest_dbaccess_macros_test.mk |5 +
 i18npool/Library_i18npool.mk |9 +
 sc/CppunitTest_sc_cellrangeobj.mk|5 +
 sc/CppunitTest_sc_chart_regression_test.mk   |5 +
 sc/CppunitTest_sc_databaserangeobj.mk|5 +
 sc/CppunitTest_sc_datapilotfieldobj.mk   |5 +
 sc/CppunitTest_sc_datapilottableobj.mk   |5 +
 sc/CppunitTest_sc_filters_test.mk|5 +
 sc/CppunitTest_sc_macros_test.mk |5 +
 sc/CppunitTest_sc_namedrangeobj.mk   |5 +
 sc/CppunitTest_sc_namedrangesobj.mk  |5 +
 sc/CppunitTest_sc_subsequent_filters_test.mk |5 +
 sc/CppunitTest_sc_tableautoformatfield.mk|5 +
 sc/CppunitTest_sc_ucalc.mk   |2 --
 sw/CppunitTest_sw_filters_test.mk|5 -
 sw/CppunitTest_sw_layout_test.mk |7 ---
 sw/CppunitTest_sw_macros_test.mk |7 ---
 sw/CppunitTest_sw_regression_test.mk |7 ---
 sw/CppunitTest_sw_swdoc_test.mk  |1 -
 19 files changed, 21 insertions(+), 77 deletions(-)

New commits:
commit 5dce272584cc79da727bdd4887d60cec04cbce11
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Apr 11 16:24:35 2012 +0200

move dependency on localedata_en to i18npool

diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk 
b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 2d48691..0f6e9de 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -127,11 +127,8 @@ $(eval $(call 
gb_CppunitTest_use_extra_configuration,dbaccess_macros_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
-#relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
+# - explicitly depend on the dbaccess resource files needed at unit-test 
runtime
 $(call gb_CppunitTest_get_target,dbaccess_macros_test) : \
 $(WORKDIR)/AllLangRes/dbaccess \
-$(call gb_Library_get_target,localedata_en) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 5ba850b..96ac0c8 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -148,4 +148,13 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
CustomTarget/i18npool/breakiterator/$(notdir $(basename 
$(txt)))_brk) \
 ))
 
+# i18npool dlopens localedata_* libraries.
+# This is runtime dependency to prevent tests
+# to be run sooner then localedata_* exists.
+$(call gb_Library_get_target,i18npool) : \
+   $(call gb_Library_get_target,localedata_en) \
+   $(call gb_Library_get_target,localedata_es) \
+   $(call gb_Library_get_target,localedata_euro) \
+   $(call gb_Library_get_target,localedata_others) \
+
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk 
b/sc/CppunitTest_sc_cellrangeobj.mk
index 5a66fd0..78e4aa0 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -128,11 +128,8 @@ $(eval $(call 
gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\
 ))
 
 # we need to
-# a) explicitly depend on library localedata_en because it is not implied by a 
link
-#relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
+# - explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_cellrangesbase) : \
 $(WORKDIR)/AllLangRes/sc \
-$(call gb_Library_get_target,localedata_en) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk 
b/sc/CppunitTest_sc_chart_regression_test.mk
index 2c28e5a..603c2d9 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -135,11 +135,8 @@ $(eval $(call 
gb_CppunitTest_use_extra_configuration,sc_chart_regression_test,\
 ))
 
 # we need to
-# a) explicitly depend on library localedata_en because it is not implied by a 
link
-#relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
+# - explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_chart_regression_test) : \
 $(WORKDIR)/AllLangRes/sc \
-$(call gb_Library_get_target,localedata_en) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk 
b/sc/CppunitTest_sc_databaserangeobj.mk
index a519a39..2374d97 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -127,11 +127,8 @@ $(eval $(call 
gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\
 ))
 
 # we need to
-# a) explicitly depend on library localedata_en because it is not implied by a 
link
-#relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
+# - explicitly depend on the sc 

[Libreoffice-commits] .: tools/bootstrp tools/Executable_rscdep.mk

[Matus Kukan]

 tools/Executable_rscdep.mk |6 --
 tools/bootstrp/rscdep.cxx  |4 
 2 files changed, 10 deletions(-)

New commits:
commit 40775ce183ac29e9598cbca59e995c7e77327a1a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Apr 12 22:07:11 2012 +0200

HAVE_GETOPT is always NO for windows

diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 2117162..a353b8d 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -57,15 +57,9 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\
 ))
 
 ifeq ($(OS),WNT)
-ifeq ($(HAVE_GETOPT),YES)
-$(eval $(call gb_Executable_add_defs,rscdep,\
--DHAVE_GETOPT \
-))
-else
 $(eval $(call gb_Executable_use_libraries,rscdep,\
 gnu_getopt \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index f10448d..269086b 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -44,13 +44,9 @@
 #include cppdep.hxx
 
 #if defined WNT
-#if !defined HAVE_GETOPT
 #define __STDC__ 1
 #define __GNU_LIBRARY__
 #include external/glibc/getopt.h
-#else
-#include getopt.h
-#endif
 #endif
 
 class RscHrcDep : public CppDep
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Matus Kukan]

 solenv/gbuild/platform/com_GCC_class.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1a41f2730da3b9aa2c89d9420209a4b4d2ecb9aa
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Apr 9 23:45:15 2012 +0200

this was accidentally removed

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 9b302d3..8014915 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -28,6 +28,7 @@ gb_AsmObject_get_source = $(1)/$(2).s
 define gb_AsmObject__command
 $(call gb_Output_announce,$(2),$(true),ASM,3)
 $(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $(1)) $(dir $(4))  \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 6 commits - jurt/CustomTarget_test_urp.mk jurt/JunitTest_urp.mk jurt/Module_jurt.mk jurt/Package_jnilib.mk jurt/Package_test_urp.mk jurt/test jurt/util ridljar/CustomTarget_ja

[Matus Kukan]

 jurt/CustomTarget_test_urp.mk |   52 +
 jurt/JunitTest_urp.mk |4 -
 jurt/Module_jurt.mk   |8 --
 jurt/Package_jnilib.mk|   38 -
 jurt/Package_test_urp.mk  |   43 --
 jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile |   48 
 jurt/util/Makefile|   38 -
 ridljar/CustomTarget_javamaker.mk |   40 ++
 ridljar/Jar_ridl.mk   |4 -
 ridljar/Module_ridljar.mk |2 
 ridljar/Package_javamaker.mk  |   37 -
 ridljar/javamaker/Makefile|   39 -
 solenv/gbuild/Jar.mk  |   12 ++-
 solenv/gbuild/JavaClassSet.mk |9 +-
 solenv/gbuild/JunitTest.mk|   15 +++
 solenv/gbuild/LinkTarget.mk   |7 +
 unoil/CustomTarget_climaker.mk|   71 ++
 unoil/CustomTarget_javamaker.mk   |   41 ++
 unoil/Jar_unoil.mk|4 -
 unoil/Module_unoil.mk |3 
 unoil/Package_climaker.mk |   15 ---
 unoil/Package_javamaker.mk|   38 -
 unoil/climaker/Makefile   |   64 
 unoil/javamaker/Makefile  |   40 --
 unusedcode.easy   |3 
 vcl/inc/vcl/slider.hxx|3 
 vcl/source/control/slider.cxx |   28 ---
 27 files changed, 250 insertions(+), 456 deletions(-)

New commits:
commit 0168b4e6ec645ab3706a1c6104b2aba4a7002536
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Apr 6 11:48:57 2012 +0200

make add_custom_headers better

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 996ef9c..cda3f46 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -907,7 +907,7 @@ $(2) :| $(call 
gb_LinkTarget_get_external_headers_target,$(1))
 
 endef
 
-define gb_LinkTarget_add_custom_headers
+define gb_LinkTarget__add_custom_headers
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call 
gb_CustomTarget_get_workdir,$(2))
 ifeq ($(gb_FULLDEPS),$(true))
@@ -918,6 +918,11 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_CustomTarget_get_clean_t
 
 endef
 
+define gb_LinkTarget_add_custom_headers
+$(foreach customtarget,$(2),$(call 
gb_LinkTarget__add_custom_headers,$(1),$(customtarget)))
+
+endef
+
 define gb_LinkTarget_add_package_headers
 $(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call 
gb_Package_get_target,$(package
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call 
gb_Package_get_clean_target,$(package)))
commit 9f92346e7c711786243d41bcd952b61cc922a21f
Author: Thomas Collerton tom.col...@gmail.com
Date:   Wed Apr 4 17:10:01 2012 +0200

Remove unused code (vcl)

diff --git a/unusedcode.easy b/unusedcode.easy
index 19586de..91368d3 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -123,9 +123,6 @@ SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, 
unsigned short)
 SfxNavigatorWrapper::GetChildWindowId()
 SfxPartChildWnd_Impl::GetChildWindowId()
 SfxRecordingFloatWrapper_Impl::GetChildWindowId()
-Slider::SetRangeMax(long)
-Slider::SetRangeMin(long)
-Slider::Slider(Window*, ResId const)
 SotStorage::GetProperty(String const, String const, 
com::sun::star::uno::Any)
 SpanStyleManager::get(WPXString const) const
 SpinButton::SpinButton(Window*, ResId const)
diff --git a/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx
index 15f0495..c29959c 100644
--- a/vcl/inc/vcl/slider.hxx
+++ b/vcl/inc/vcl/slider.hxx
@@ -88,7 +88,6 @@ private:
 
 public:
 Slider( Window* pParent, WinBits nStyle = WB_HORZ );
-Slider( Window* pParent, const ResId rResId );
 
 virtual voidMouseButtonDown( const MouseEvent rMEvt );
 virtual voidMouseButtonUp( const MouseEvent rMEvt );
@@ -107,9 +106,7 @@ public:
 { mbFullDrag = bEnable; }
 sal_BoolIsDragEnabled() const { return mbFullDrag; }
 
-voidSetRangeMin( long nNewRange );
 longGetRangeMin() const { return mnMinRange; }
-voidSetRangeMax( long nNewRange );
 longGetRangeMax() const { return mnMaxRange; }
 voidSetRange( const Range rRange );
 Range   GetRange() const { return Range( GetRangeMin(), 
GetRangeMax() ); }
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx

[Libreoffice-commits] .: jurt/CustomTarget_jnilib.mk jurt/Module_jurt.mk jurt/Package_jnilib.mk

[Matus Kukan]

 jurt/CustomTarget_jnilib.mk |   38 ++
 jurt/Module_jurt.mk |7 +++
 jurt/Package_jnilib.mk  |   32 
 3 files changed, 77 insertions(+)

New commits:
commit 12b3707ed2ccd77a8fd8b8f341ea035c22d87f40
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Apr 6 13:05:53 2012 +0200

ops, this should not be deleted

diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk
new file mode 100644
index 000..71d90f6
--- /dev/null
+++ b/jurt/CustomTarget_jnilib.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_CustomTarget_CustomTarget,jurt/util,new_style))
+
+JUJL := $(call gb_CustomTarget_get_workdir,jurt/util)
+
+$(call gb_CustomTarget_get_target,jurt/util) : $(JUJL)/libjpipe.jnilib
+
+$(JUJL)/libjpipe.jnilib : $(call gb_Library_get_target,jpipe) | $(JUJL)/.dir
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MCB,1)
+   cd $(dir $@)  $(SOLARENV)/bin/macosx-create-bundle $
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
index 0501603..2026de2 100644
--- a/jurt/Module_jurt.mk
+++ b/jurt/Module_jurt.mk
@@ -35,6 +35,13 @@ $(eval $(call gb_Module_add_targets,jurt,\
 Zip_jurt \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,jurt,\
+CustomTarget_jnilib \
+Package_jnilib \
+))
+endif
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,jurt,\
 Library_jpipx \
diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk
new file mode 100644
index 000..a728e71
--- /dev/null
+++ b/jurt/Package_jnilib.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_Package_Package,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util))
+
+$(eval $(call gb_Package_add_file,lib/$(patsubst %.dylib,%.jnilib,$(call 
gb_Library_get_filename,jpipe)),,$(patsubst %.dylib,%.jnilib,$(call 
gb_Library_get_filename,jpipe
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: unoil/CustomTarget_climaker.mk

[Matus Kukan]

 unoil/CustomTarget_climaker.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 501e290b8eb86a31e936e210aeb76d0b8c1a12b3
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Apr 6 13:15:14 2012 +0200

include variable before it's used

diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk
index 462a2b8..0e529d0 100644
--- a/unoil/CustomTarget_climaker.mk
+++ b/unoil/CustomTarget_climaker.mk
@@ -25,6 +25,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+include $(SRCDIR)/unoil/climaker/version.txt
+
 $(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker,new_style))
 
 UICM := $(call gb_CustomTarget_get_workdir,unoil/climaker)
@@ -34,8 +36,6 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \
$(UICM)/cli_oootypes.config \
$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
 
-include $(SRCDIR)/unoil/climaker/version.txt
-
 $(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
$(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
$(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: jurt/CustomTarget_test_urp.mk

[Matus Kukan]

 jurt/CustomTarget_test_urp.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b33134d246a49cab13bbeb6c95f862faf0a69268
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Apr 6 19:18:45 2012 +0200

fix build of jurt_urp

diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk
index 725cae6..73f6fad 100644
--- a/jurt/CustomTarget_test_urp.mk
+++ b/jurt/CustomTarget_test_urp.mk
@@ -47,6 +47,6 @@ $(JUTU)/registry.rdb : $(JUTU)/interfaces.urd \
 $(JUTU)/interfaces.urd : 
$(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \
$(call gb_Executable_get_target_for_build,idlc) | 
$(JUTU)/urd/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1)
-   $(call gb_Helper_execute,idlc -O$(JUTU)/urd -I$(OUTDIR)/idl -cid -we $)
+   $(call gb_Helper_execute,idlc -O$(JUTU) -I$(OUTDIR)/idl -cid -we $)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: stoc/Library_javaloader.mk

[Matus Kukan]

 stoc/Library_javaloader.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ff496d9124b44c763cae2d45fe337e75781b743c
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Apr 6 20:02:04 2012 +0200

javaloader: add_linked_lib salhelper

diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index e0f1a13..8c672d2 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,javaloader,\
 cppuhelper \
 jvmaccess \
 sal \
+salhelper \
 $(gb_STDLIBS) \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/Module_extensions.mk

[Matus Kukan]

 extensions/Module_extensions.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1e7fd91514940520c33f14898c2298d1251ac34d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Apr 4 14:14:33 2012 +0200

fix so_activex_idl, part two

The order seems to be important here.
However it has worked for me and I am not sure this will fix tinderboxes.

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index f7e7180..00b7d7c 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -69,9 +69,9 @@ ifeq ($(OS),WNT)
 ifeq ($(COM),MSC)
 ifneq ($(DISABLE_ACTIVEX),TRUE)
 $(eval $(call gb_Module_add_targets,extensions,\
-   CustomTarget_so_activex_idl \
WinResTarget_activex \
Library_so_activex \
+   CustomTarget_so_activex_idl \
 ))
 
 ifeq ($(BUILD_X64),TRUE)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - postprocess/packcomponents Repository.mk scp2/source vcl/CustomTarget_kde_moc.mk vcl/Executable_kdefilepicker.mk vcl/Module_vcl.mk vcl/Package_kde_moc.mk vcl/unx

[Matus Kukan]

 Repository.mk  |6 
 postprocess/packcomponents/makefile.mk |4 ---
 scp2/source/ooo/file_library_ooo.scp   |   16 -
 vcl/CustomTarget_kde_moc.mk|   40 +
 vcl/Executable_kdefilepicker.mk|4 ---
 vcl/Module_vcl.mk  |2 +
 vcl/Package_kde_moc.mk |   36 -
 vcl/unx/kde/fpicker/Makefile   |   35 
 8 files changed, 42 insertions(+), 101 deletions(-)

New commits:
commit 19b7edb9c65793821bee984d2da43fbfbd605e74
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Apr 3 02:06:48 2012 +0200

fps_kde and fps_kde4 are no more

diff --git a/Repository.mk b/Repository.mk
index 74452fd..a112669 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -489,12 +489,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 $(if $(filter $(OS),WNT), \
 fps_odma \
 ) \
-$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
-fps_kde \
-) \
-$(if $(filter $(GUIBASE)$(ENABLE_KDE4),unxTRUE), \
-fps_kde4 \
-) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 47a7d7c..488e322 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -375,10 +375,6 @@ my_components += mozbootstrap
 .END
 .ENDIF
 
-.IF $(OS) != MACOSX  $(OS) != WNT  $(ENABLE_KDE4) != 
-my_components += component/fpicker/source/unx/kde4/fps_kde4
-.END
-
 .IF $(OS) != WNT  $(OS) != ANDROID  $(OS) != IOS  $(OS) != 
headless
 my_components += cmdmail
 .END
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 1b464cf..689a71b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -502,24 +502,8 @@ File gid_File_Lib_Desktopbe
 Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
 End
 
-#ifdef ENABLE_KDE4
-#ifndef MACOSX
-File gid_File_Lib_Fps_Kde4
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
-End
-#endif
-#endif
 #ifdef ENABLE_KDE
 #ifndef MACOSX
-File gid_File_Lib_Fps_Kde
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
-End
 File gid_File_Bin_KdeFilePicker
 BIN_FILE_BODY;
 Styles = (PACKED);
commit 8464e311309ca918ac3a7d111c0f6927bfe825f8
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Apr 3 01:40:29 2012 +0200

vcl: use CustomTarget makefile for kde_moc

diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk
new file mode 100644
index 000..7d54c0b
--- /dev/null
+++ b/vcl/CustomTarget_kde_moc.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_CustomTarget_CustomTarget,vcl/unx/kde/fpicker,new_style))
+
+VCKF := $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)
+
+$(call gb_CustomTarget_get_target,vcl/unx/kde/fpicker) : \
+   $(VCKF)/kdefilepicker.moc.cxx
+
+$(VCKF)/kdefilepicker.moc.cxx : \
+   $(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx | $(VCKF)/.dir
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
+   $(MOC) -o $@ $
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk
index 7820efc..2bfa978 100644
--- a/vcl/Executable_kdefilepicker.mk
+++ b/vcl/Executable_kdefilepicker.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Executable_Executable,kdefilepicker))
 
-$(eval $(call gb_Executable_add_package_headers,kdefilepicker,\
-   vcl_kde_moc \
-))
-
 $(eval $(call gb_Executable_add_defs,kdefilepicker,\
$(KDE_CFLAGS) \
 ))
diff --git a/vcl/Module_vcl.mk 

[Libreoffice-commits] .: solenv/gbuild

[Matus Kukan]

 solenv/gbuild/LinkTarget.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 41f74a4c6a4a88b675a443436df7f409754d34f8
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Mar 31 23:19:58 2012 +0200

Revert gbuild: do not let generated source files depend on headers

There is a reason for that dependency. I will have to come up with
something better later.

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index ba3ea56..11eeb02 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -745,7 +745,7 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2)
 
 $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCObject_get_target,$(2))
-$(call gb_GenCObject_get_target,$(2)) : | $(call 
gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCObject_get_source,$(2)) : | $(call 
gb_LinkTarget_get_headers_target,$(1))
 $(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(3)
 $(call gb_GenCObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
@@ -762,7 +762,7 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += 
$(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2)
 
 $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2))
-$(call gb_GenCxxObject_get_target,$(2)) : | $(call 
gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCxxObject_get_source,$(2)) : | $(call 
gb_LinkTarget_get_headers_target,$(1))
 $(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
 $(call gb_GenCxxObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: clucene/CustomTarget_source.mk

[Matus Kukan]

 clucene/CustomTarget_source.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d3cc4b95e4a7dfaefd5538b491534d6690f7d5b
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Mar 31 23:34:47 2012 +0200

clucene: do not use mixed path here

diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk
index f36f997..c1d8586 100644
--- a/clucene/CustomTarget_source.mk
+++ b/clucene/CustomTarget_source.mk
@@ -58,7 +58,7 @@ endif
 $(CLSO)/done : $(cl_FIXED_TARFILE_LOCATION) \
$(_CLUCENE_CONFIG_H) $(CLUCENE_CONFIG_H)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TAR,1)
-   $(call gb_Helper_abbreviate_dirs_native, \
+   $(call gb_Helper_abbreviate_dirs, \
mkdir -p $(dir $@)  cd $(dir $@)  \
$(GNUTAR) -x -z $(STRIP_COMPONENTS)=1 -f $  \
$(GNUPATCH) -p0  $(SRCDIR)/clucene/patches/clucene-internal-zlib.patch 
 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/CustomTarget_generated.mk

[Matus Kukan]

 sal/CustomTarget_generated.mk |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 033cd1d41f0862f5c2798646359e8993c6f38fff
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Apr 1 00:49:46 2012 +0200

sal: rtlbootstrap.mk was empty on cygwin

This needs proper fix. It wasn't noticed because it was created by pipe
before afd5eb1f04971edb083e47a2f9c2e9d77c9737c9 and last command
succeeded, so make continued even if compilation failed.

diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk
index a70acd3..b968acc 100644
--- a/sal/CustomTarget_generated.mk
+++ b/sal/CustomTarget_generated.mk
@@ -33,7 +33,12 @@ $(call gb_CustomTarget_get_target,sal/generated) : \
$(SAUT)/rtlbootstrap.mk $(SAUT)/sal/udkversion.h \
$(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h)
 
-$(SAUT)/rtlbootstrap.mk : $(if $(filter-out 
$(COM),MSC),$(SAUT)/sal/typesizes.h) | $(SAUT)/.dir
+# FIXME: rtlbootstrap.mk is empty on cygwin
+ifeq ($(COM),MSC)
+$(SAUT)/rtlbootstrap.mk :| $(SAUT)/.dir
+   touch $@
+else
+$(SAUT)/rtlbootstrap.mk : $(SAUT)/sal/typesizes.h | $(SAUT)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1)
$(call gb_Helper_abbreviate_dirs_native, \
(echo '#include macro.hxx'; echo RTL_OS:=THIS_OS; echo 
RTL_ARCH:=THIS_ARCH)  $(SAUT)/bootstrap.cxx  \
@@ -41,6 +46,7 @@ $(SAUT)/rtlbootstrap.mk : $(if $(filter-out 
$(COM),MSC),$(SAUT)/sal/typesizes.h)
-I$(SRCDIR)/sal/inc $(SAUT)/bootstrap.cxx  $@.tmp  \
cat $@.tmp | grep '^RTL_' | sed -e 's///g'  $@  \
rm $(SAUT)/bootstrap.cxx $@.tmp)
+endif
 
 $(SAUT)/sal/typesizes.h :| $(SAUT)/sal/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/CppunitTest_sal_osl_process.mk sal/Executable_osl_process_child.mk

[Matus Kukan]

 sal/CppunitTest_sal_osl_process.mk  |4 
 sal/Executable_osl_process_child.mk |4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 2fc2a3542988e0dbf71163b40d5fe495a6789d40
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Mar 28 09:43:48 2012 +0200

sal: add dependency for unit test, fix typo in comment

diff --git a/sal/CppunitTest_sal_osl_process.mk 
b/sal/CppunitTest_sal_osl_process.mk
index 257d065..aad9405 100644
--- a/sal/CppunitTest_sal_osl_process.mk
+++ b/sal/CppunitTest_sal_osl_process.mk
@@ -36,4 +36,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_process,\
 $(gb_STDLIBS) \
 ))
 
+# Depend on to be tested executable
+$(call gb_CppunitTest_get_target,sal_osl_process) : \
+   $(call gb_Executable_get_target,osl_process_child)
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/Executable_osl_process_child.mk 
b/sal/Executable_osl_process_child.mk
index 3e538ff..fb348fa 100644
--- a/sal/Executable_osl_process_child.mk
+++ b/sal/Executable_osl_process_child.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-# This executable is only required by unit-test sal_osl_profile.
+# This executable is required only by sal_osl_process test.
 # See qa/osl/process/osl_process.cxx:411
 $(eval $(call gb_Executable_Executable,osl_process_child))
 
@@ -38,7 +38,7 @@ $(eval $(call 
gb_Executable_add_exception_objects,osl_process_child,\
sal/qa/osl/process/osl_process_child \
 ))
 
-# Also this batch file is required by sal_osl_profile.
+# Also this batch file is required by sal_osl_process.
 # See qa/osl/process/osl_process.cxx:675
 ifeq ($(OS),WNT)
 BATCH_FILE:=batch.bat
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - basctl/AllLangResTarget_basctl.mk formula/AllLangResTarget_for.mk solenv/gbuild

[Matus Kukan]

 basctl/AllLangResTarget_basctl.mk |4 +++-
 formula/AllLangResTarget_for.mk   |1 +
 solenv/gbuild/Module.mk   |2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f64d58e3e1c65589163a1255b36fde4cbd84b3a0
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Mar 26 23:01:46 2012 +0200

more dependencies and include paths

diff --git a/basctl/AllLangResTarget_basctl.mk 
b/basctl/AllLangResTarget_basctl.mk
index e4dffd1..d238350 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -54,6 +54,8 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\
basctl/source/dlged/managelang.src \
 ))
 
-$(call gb_SrsTemplateTarget_get_target,basctl/res) : $(call 
gb_Package_get_target,svx_globlmn_hrc)
+$(call gb_SrsTemplateTarget_get_target,basctl/res) : \
+   $(call gb_Package_get_target,svx_globlmn_hrc) \
+   $(call gb_Package_get_target,svx_inc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
index 7eb72e3..0cc451e 100644
--- a/formula/AllLangResTarget_for.mk
+++ b/formula/AllLangResTarget_for.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,formula/res))
 
 $(eval $(call gb_SrsTarget_set_include,formula/res,\
 $$(INCLUDE) \
+-I$(SRCDIR)/formula/inc \
 -I$(SRCDIR)/formula/source/core/inc \
 ))
 
commit 5686fe0ad1ecd09dbe05dd1a36064f8be96321d6
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Mar 25 18:46:08 2012 +0200

be consistent

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 64d7d13..15237eb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -145,7 +145,7 @@ unitcheck :
$(call gb_Output_announce_bell)
 
 slowcheck :
-   $(call gb_Output_announce,loaded modules: $(sort 
$(gb_Module_ALLMODULES)),$(true),SCHK,6)
+   $(call gb_Output_announce,loaded modules: $(sort 
$(gb_Module_ALLMODULES)),$(true),SLC,6)
$(call gb_Output_announce_title,all slowtests checked.)
$(call gb_Output_announce_bell)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - solenv/gbuild svl/AllLangResTarget_svl.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk

[Matus Kukan]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |3 +++
 solenv/gbuild/platform/windows.mk   |3 ---
 svl/AllLangResTarget_svl.mk |1 +
 svl/Library_fsstorage.mk|4 ++--
 svl/Library_passwordcontainer.mk|4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit c59beae71273d6c8894f7d6eaff25131d6c124a4
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Mar 25 12:18:32 2012 +0200

svl: add include path and more add_package_headers

diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
index d47b973..40bb46f 100644
--- a/svl/AllLangResTarget_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res))
 
 $(eval $(call gb_SrsTarget_set_include,svl/res,\
 $$(INCLUDE) \
+-I$(SRCDIR)/svl/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svl/res,\
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 4e88d31..77d826c 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -28,11 +28,11 @@
 
 $(eval $(call gb_Library_Library,fsstorage))
 
+$(eval $(call gb_Library_add_package_headers,fsstorage,svl_inc))
+
 $(eval $(call 
gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
 
 $(eval $(call gb_Library_set_include,fsstorage,\
--I$(SRCDIR)/svl/inc \
--I$(SRCDIR)/svl/inc/svl \
 -I$(SRCDIR)/svl/source/inc \
 $$(INCLUDE) \
 ))
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index bb54153..6ece5a3 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -28,11 +28,11 @@
 
 $(eval $(call gb_Library_Library,passwordcontainer))
 
+$(eval $(call gb_Library_add_package_headers,passwordcontainer,svl_inc))
+
 $(eval $(call 
gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
 
 $(eval $(call gb_Library_set_include,passwordcontainer,\
--I$(SRCDIR)/svl/inc \
--I$(SRCDIR)/svl/inc/svl \
 -I$(SRCDIR)/svl/source/inc \
 $$(INCLUDE) \
 ))
commit bee6510c0884a939ebb3f167b0c29f911403cd2f
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Mar 25 11:33:03 2012 +0200

fix mingw build, properly set LO_LIB_DIR

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5f4751c..4ec9a80 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -242,6 +242,9 @@ endif
 
 # Helper class
 
+gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
+gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
+
 gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ 
print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ 
print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ 
print tolower(substr($$0,1,1)) substr($$0,2) }')
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index b09e4be..7cfe7d8 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -27,9 +27,6 @@
 
 GUI := WNT
 
-gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
-gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
-
 gb_Helper_get_rcfile = $(1).ini
 
 gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XX
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: packimages/CustomTarget_images.mk

[Matus Kukan]

 packimages/CustomTarget_images.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aaa4dcd65ba05dca07ca79408bd227959242
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Mar 25 13:08:24 2012 +0200

packimages: missing dependency

diff --git a/packimages/CustomTarget_images.mk 
b/packimages/CustomTarget_images.mk
index de43fb3..d602137 100644
--- a/packimages/CustomTarget_images.mk
+++ b/packimages/CustomTarget_images.mk
@@ -56,7 +56,7 @@ $(PIIM)/images_%.zip : $(PIIM)/sorted.lst 
$(PIIM)/commandimagelist.ilst
$(if $(findstring s,$(MAKEFLAGS)), /dev/null))
 
 # make sure to have one to keep packing happy
-$(PIIM)/images_brand.zip :
+$(PIIM)/images_brand.zip :| $(PIIM)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TCH,2)
touch $@
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/CustomTarget_localedata.mk solenv/gbuild

[Matus Kukan]

 i18npool/CustomTarget_localedata.mk|2 +-
 solenv/gbuild/platform/com_GCC_defs.mk |1 +
 solenv/gbuild/platform/windows.mk  |1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4352326b6bd54805649961073ffea6dc41a66ed8
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Mar 25 00:18:13 2012 +0100

fix windows build, properly set LO_LIB_DIR

diff --git a/i18npool/CustomTarget_localedata.mk 
b/i18npool/CustomTarget_localedata.mk
index bd52876..48b611e 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -44,7 +44,7 @@ $(IPLD)/localedata_%.cxx : 
$(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,saxparser) $* $ $@.tmp \
$(my_file)$(IPLD)/saxparser.rdb 
$(OUTDIR_FOR_BUILD)/bin/types.rdb \
-   -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib \
+   
-env:LO_LIB_DIR=$(my_file)$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \
$(if $(findstring s,$(MAKEFLAGS)), /dev/null 21)  \
sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp  $@ 
 \
rm $@.tmp)
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index e760d9e..4018ebc 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -175,6 +175,7 @@ $(1)
 endef
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
+gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
 
 gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 59c23be..b09e4be 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -28,6 +28,7 @@
 GUI := WNT
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
+gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
 
 gb_Helper_get_rcfile = $(1).ini
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild solenv/inc

[Matus Kukan]

 solenv/gbuild/templates/makefile.mk |   41 
 solenv/inc/gbuildbridge.mk  |4 +--
 2 files changed, 3 insertions(+), 42 deletions(-)

New commits:
commit 323a936e23e27d7691eb115d3d1a696acad94d9a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Mar 18 12:01:25 2012 +0100

gbuildbridge: gb_MAKETARGET is empty, gb_PARTIALBUILD defined in 
partial_build

diff --git a/solenv/gbuild/templates/makefile.mk 
b/solenv/gbuild/templates/makefile.mk
index d4cf94e..0997622 100644
--- a/solenv/gbuild/templates/makefile.mk
+++ b/solenv/gbuild/templates/makefile.mk
@@ -1,40 +1 @@
-#*
-#
-# 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.
-#
-#*
-
-PRJ=..
-TARGET=prj
-
-.INCLUDE : settings.mk
-
-.IF $(VERBOSE)!=
-VERBOSEFLAG :=
-.ELSE
-VERBOSEFLAG := -s
-.ENDIF
-
-all:
-   cd $(PRJ)  $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) 
$(gb_MAKETARGET)  $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+.INCLUDE : gbuildbridge.mk
diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk
index de43800..b9b1264 100644
--- a/solenv/inc/gbuildbridge.mk
+++ b/solenv/inc/gbuildbridge.mk
@@ -34,8 +34,8 @@ TARGET=prj
 all:
 .ELIF $(VERBOSE)!=
 all:
-   cd $(PRJ)  $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) 
$(gb_MAKETARGET) gb_PARTIALBUILD=T
+   cd $(PRJ)  $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM)
 .ELSE
 all:
-   @cd $(PRJ)  $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) 
$(gb_MAKETARGET) gb_PARTIALBUILD=T
+   @cd $(PRJ)  $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM)
 .END
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Repository.mk

[Matus Kukan]

 Repository.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46dbbe4bc1d53f1e38fc7c407f6d5b5ebb2ae708
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Mar 19 00:08:01 2012 +0100

emser belongs to OOOLIBS

diff --git a/Repository.mk b/Repository.mk
index 6f1b12c..8e9b6d9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -205,6 +205,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 editeng \
 egi \
 eme \
+emser \
 epb \
 epg \
 epp \
@@ -408,7 +409,6 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 dnd \
 dtrans \
-emser \
 fop \
 fps \
 ftransl \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_sweb.mk deskt

[Matus Kukan]

 desktop/Executable_sbase.mk|7 +--
 desktop/Executable_scalc.mk|7 +--
 desktop/Executable_sdraw.mk|7 +--
 desktop/Executable_simpress.mk |7 +--
 desktop/Executable_smath.mk|7 +--
 desktop/Executable_sweb.mk |7 +--
 desktop/Executable_swriter.mk  |7 +--
 7 files changed, 35 insertions(+), 14 deletions(-)

New commits:
commit 45504f9ba8de2a4372193910b2cb9405f1ea896a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Mar 16 01:16:34 2012 +0100

fix windows build

No idea if this is proper fix or it needs to be done otherwise.

diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index f3caf5b..098f8c2 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sbase,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,sbase,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,sbase,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,sbase) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,sbase,\
 desktop/win32/source/applauncher/sbase \
 ))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 3c9990b..290e880 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,scalc,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,scalc,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,scalc,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,scalc) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,scalc,\
 desktop/win32/source/applauncher/scalc \
 ))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index dcea97d..2e57495 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sdraw,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,sdraw,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,sdraw,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,sdraw) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,sdraw,\
 desktop/win32/source/applauncher/sdraw \
 ))
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index ab0cbc0..926ad57 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,simpress,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,simpress,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,simpress,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,simpress) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,simpress,\
 desktop/win32/source/applauncher/simpress \
 ))
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index fe1607b..ed1b460 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,smath,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,smath,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,smath,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,smath) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,smath,\
 desktop/win32/source/applauncher/smath \
 ))
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index a8810b1..858bc7a 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sweb,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,sweb,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,sweb,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,sweb) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,sweb,\
 desktop/win32/source/applauncher/sweb \
 ))
diff --git a/desktop/Executable_swriter.mk 

[Libreoffice-commits] .: solenv/gbuild

[Matus Kukan]

 solenv/gbuild/Extension.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 794f4e23290c8346b8e0ba2a2267a0eb2e745885
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Mar 13 01:55:12 2012 +0100

missing $: announce only if something is happening

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 3bfc6b5..8011227 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -187,7 +187,7 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := 
$(gb_SDFLOCATION)$(subst $(S
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
-   $(call gb_Output_announce,$(2),$(true),XHP,3)
+   $$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)  \
$(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$) -o 
$$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/branding

[Matus Kukan]

 desktop/branding/Makefile |   50 --
 1 file changed, 50 deletions(-)

New commits:
commit ac26f6871061554db77a393cb1886a71b668a580
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Mar 9 10:47:39 2012 +0100

remove unused Makefile

diff --git a/desktop/branding/Makefile b/desktop/branding/Makefile
deleted file mode 100644
index 85d5769..000
--- a/desktop/branding/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Red Hat, Inc., David Tardon dtar...@redhat.com
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# 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.
-
-SRCDIR := $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/../..)
-
-ifeq ($(strip $(ABOUT_BITMAP)),)
-ABOUT_BITMAP := $(SRCDIR)/icon-themes/galaxy/brand/about.png
-endif
-
-ifeq ($(strip $(INTRO_BITMAP)),)
-INTRO_BITMAP := $(SRCDIR)/icon-themes/galaxy/brand/intro.png
-endif
-
-$(WORKDIR)/CustomTarget/desktop/branding/about.png : $(ABOUT_BITMAP)
-   mkdir -p $(dir $@)  cp -p $ $@
-
-$(WORKDIR)/CustomTarget/desktop/branding/intro.png : $(INTRO_BITMAP)
-   mkdir -p $(dir $@)  cp -p $ $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : \
-   $(WORKDIR)/CustomTarget/desktop/branding/about.png \
-   $(WORKDIR)/CustomTarget/desktop/branding/intro.png
-
-# vim: set ts=4 sw=4 et:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile

[Matus Kukan]

 Makefile |2 --
 1 file changed, 2 deletions(-)

New commits:
commit fa97b8ac234c34618d8dca4329bc13e8454b47b4
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Mar 9 11:21:39 2012 +0100

Do not remove the whole  workdir/* on 'make clean'

Also solver/$INPATH is subset of */$INPATH.

diff --git a/Makefile b/Makefile
index 84d8c46..df5b638 100644
--- a/Makefile
+++ b/Makefile
@@ -300,8 +300,6 @@ clean: clean-host clean-build
 
 clean-host:
rm -fr $(SRCDIR)/*/$(INPATH)
-   rm -fr $(SRCDIR)/workdir/*
-   rm -fr $(SRCDIR)/solver/$(INPATH)
rm -fr install
 
 clean-build:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

[Matus Kukan]

 scp2/source/onlineupdate/file_onlineupdate.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0138d85a6f9cb33a943d43e715fd2a34edb6011d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Mar 7 13:53:39 2012 +0100

fix library name

diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp 
b/scp2/source/onlineupdate/file_onlineupdate.scp
index 7c60bcc..63d1968 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -31,7 +31,7 @@ File gid_File_Lib_Updchk
 BIN_FILE_BODY;
 Styles = (PACKED);
 Dir = gid_Brand_Dir_Program;
-Name = updchk.dll;
+Name = SPECIAL_NAME(updchk);
 ComponentCondition=ISCHECKFORPRODUCTUPDATES=1;
 End
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/Executable_osl_process_child.mk

[Matus Kukan]

 sal/Executable_osl_process_child.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cb83035cd248348c0301a765dfe80c8d95859b4a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Mar 6 10:16:07 2012 +0100

sal: add mkdir -p

diff --git a/sal/Executable_osl_process_child.mk 
b/sal/Executable_osl_process_child.mk
index c6fa16e..3e538ff 100644
--- a/sal/Executable_osl_process_child.mk
+++ b/sal/Executable_osl_process_child.mk
@@ -49,6 +49,7 @@ endif
 $(call gb_Executable_get_target,osl_process_child): 
$(WORKDIR)/LinkTarget/Executable/$(BATCH_FILE)
 
 $(WORKDIR)/LinkTarget/Executable/$(BATCH_FILE): 
$(SRCDIR)/sal/qa/osl/process/$(BATCH_FILE)
+   mkdir -p $(dir $@)  \
$(call gb_Deliver_deliver,$,$@)
 
 $(call gb_Executable_get_clean_target,osl_process_child): 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Matus Kukan]

 solenv/gbuild/AllLangResTarget.mk |1 +
 solenv/gbuild/ComponentTarget.mk  |6 +-
 solenv/gbuild/Configuration.mk|   24 
 solenv/gbuild/Deliver.mk  |4 ++--
 solenv/gbuild/Executable.mk   |3 ++-
 solenv/gbuild/Package.mk  |5 -
 solenv/gbuild/Rdb.mk  |6 +-
 solenv/gbuild/UnoApiTarget.mk |8 ++--
 solenv/gbuild/Zip.mk  |3 ++-
 9 files changed, 47 insertions(+), 13 deletions(-)

New commits:
commit 90491a073c5b5faee782ad5eab63276fda2342e6
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Mar 4 18:59:59 2012 +0100

gbuild: do not call mkdir -p in gb_Deliver__deliver

Rather create new order-only dependencies on directories where
targets should be delivered.

On cygwin this is much faster.

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 70151aa..344f6d8 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -356,6 +356,7 @@ $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call 
gb_ResTarget_get_target,
 
 $(call gb_ResTarget_get_outdir_target,$(1)) : $(call 
gb_ResTarget_get_target,$(1)) 
 $(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call 
gb_ResTarget_get_outdir_imagelist_target,$(1))
+$(call gb_ResTarget_get_outdir_imagelist_target,$(1)) :| $(dir $(call 
gb_ResTarget_get_outdir_imagelist_target,$(1)))
 $(call gb_Deliver_add_deliverable,$(call 
gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
 $(call gb_Deliver_add_deliverable,$(call 
gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call 
gb_ResTarget_get_imagelist_target,$(1)),$(1))
 
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index efe4819..adec783 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -52,6 +52,9 @@ $(call gb_ComponentTarget_get_target,%) : $(call 
gb_ComponentTarget_get_source,$
 $(call gb_ComponentTarget_get_target,%) :
$(eval $(call gb_Outpt_error,Unable to find component file $(call 
gb_ComponentTarget_get_source,,$*) in the repositories: 
$(gb_ComponentTarget_REPOS) or xsltproc is missing.))
 
+$(call gb_ComponentTarget_get_outdir_target,%/) :
+   mkdir -p $@
+
 $(call gb_ComponentTarget_get_outdir_target,%) :
$(call gb_Deliver_deliver,$,$@)
 
@@ -59,7 +62,8 @@ define gb_ComponentTarget_ComponentTarget
 $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
 $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
 $(call gb_ComponentTarget_get_outdir_target,$(1)) : \
-   $(call gb_ComponentTarget_get_target,$(1))
+   $(call gb_ComponentTarget_get_target,$(1)) \
+   | $(dir $(call gb_ComponentTarget_get_outdir_target,$(1)))
 $(call gb_Deliver_add_deliverable,$(call 
gb_ComponentTarget_get_outdir_target,$(1)),$(call 
gb_ComponentTarget_get_target,$(1)),$(1))
 
 endef
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 0a9c54c..c16bc13 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -101,6 +101,9 @@ $(call gb_XcsTarget_get_clean_target,%) :
rm -f $(call gb_XcsTarget_get_target,$*) \
  $(call gb_XcsTarget_get_outdir_target,$(XCSFILE)))
 
+$(call gb_XcsTarget_get_outdir_target,%/) :
+   mkdir -p $@
+
 $(call gb_XcsTarget_get_outdir_target,%) :
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Deliver_deliver,$,$@))
@@ -142,6 +145,9 @@ $(call gb_XcuDataTarget_get_clean_target,%) :
rm -f $(call gb_XcuDataTarget_get_target,$*) \
  $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE)))
 
+$(call gb_XcuDataTarget_get_outdir_target,%/) :
+   mkdir -p $@
+
 $(call gb_XcuDataTarget_get_outdir_target,%) :
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Deliver_deliver,$,$@))
@@ -179,6 +185,9 @@ $(call gb_XcuModuleTarget_get_clean_target,%) :
rm -f $(call gb_XcuModuleTarget_get_target,$*) \
  $(call 
gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
 
+$(call gb_XcuModuleTarget_get_outdir_target,%/) :
+   mkdir -p $@
+
 $(call gb_XcuModuleTarget_get_outdir_target,%) :
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Deliver_deliver,$,$@))
@@ -214,6 +223,9 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) :
  $(call 
gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \
  $(call 
gb_XcuLangpackTarget__get_outdir_target_with_lang,$(XCUFILE),$(lang
 
+$(call gb_XcuLangpackTarget_get_outdir_target,%/) :
+   mkdir -p $@
+
 $(call gb_XcuLangpackTarget_get_outdir_target,%) :
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Deliver_deliver,$,$@))
@@ -343,7 +355,8 @@ $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE 
:= 

[Libreoffice-commits] .: solenv/gbuild

[Matus Kukan]

 solenv/gbuild/UnoApiTarget.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a5d28eaa69827ea3efe12f36517bb3e6915b1c8d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Mar 6 01:13:36 2012 +0100

UnoApiTarget: add missing dependency

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index faee295..9d0cfc6 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -55,7 +55,8 @@ endef
 
 define gb_UnoApiTarget_UnoApiTarget
 $$(eval $$(call gb_Module_register_target,$(call 
gb_UnoApiOutTarget_get_target,$(1)),$(call 
gb_UnoApiOutTarget_get_clean_target,$(1
-$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(1)) \
+   | $(dir $(call gb_UnoApiOutTarget_get_target,$(1)))
 $(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call 
gb_UnoApiTarget_get_clean_target,$(1))
 $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE :=
 $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS :=
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/Module_extensions.mk extensions/source np_sdk/Module_np_sdk.mk Repository.mk

[Matus Kukan]

 Repository.mk|   15 ---
 extensions/Module_extensions.mk  |   16 
 extensions/source/nsplugin/source/nsplugin_oo.rc |   46 +++
 np_sdk/Module_np_sdk.mk  |2 -
 4 files changed, 63 insertions(+), 16 deletions(-)

New commits:
commit 8829b7c91d2798bc91061ab81b32a08555785482
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Mar 3 16:35:52 2012 +0100

build nsplugin also without mozilla as in 3-5 branch

diff --git a/Repository.mk b/Repository.mk
index a18cff9..9d6ed21 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -124,13 +124,6 @@ $(eval $(call gb_Helper_register_executables,UREBIN,\
 
 endif
 
-ifeq ($(WITH_MOZILLA),YES)
-$(eval $(call gb_Helper_register_executables,OOO,\
-pluginapp.bin \
-))
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-pl \
-))
 ifeq ($(ENABLE_NSPLUGIN),YES)
 $(eval $(call gb_Helper_register_executables,OOO,\
 nsplugin \
@@ -139,6 +132,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 npsoplugin \
 ))
 endif
+
+ifeq ($(WITH_MOZILLA),YES)
+$(eval $(call gb_Helper_register_executables,OOO,\
+pluginapp.bin \
+))
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+pl \
+))
 endif # WITH_MOZILLA
 
 
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index d0490ea..97ad06d 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -90,6 +90,14 @@ endif # DISABLE_ATL
 
 endif # WNT
 
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Module_add_targets,extensions,\
+   Executable_nsplugin \
+   Library_npsoplugin \
+   WinResTarget_npsoplugin \
+))
+endif
+
 ifeq ($(WITH_MOZILLA),YES)
 
 $(eval $(call gb_Module_add_targets,extensions,\
@@ -104,14 +112,6 @@ $(eval $(call gb_Module_add_targets,extensions,\
 endif
 endif
 
-ifeq ($(ENABLE_NSPLUGIN),YES)
-$(eval $(call gb_Module_add_targets,extensions,\
-   Executable_nsplugin \
-   Library_npsoplugin \
-   WinResTarget_npsoplugin \
-))
-endif
-
 endif # WITH_MOZILLA=YES
 
 ifeq ($(OS),MACOSX)
diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc 
b/extensions/source/nsplugin/source/nsplugin_oo.rc
index 1fc8285..ba09335 100644
--- a/extensions/source/nsplugin/source/nsplugin_oo.rc
+++ b/extensions/source/nsplugin/source/nsplugin_oo.rc
@@ -28,3 +28,49 @@
 VALUE FileOpenName, StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 
- 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 
5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 
5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet 
Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 
6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 
Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master 
Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument 
Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument 
Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument 
Drawing Template|OpenDocument Presentation|OpenDocument Presentation 
Template|OpenDocument Formula\0
 #define ADDITIONAL_VERINFO2VALUE FileDescription, LibreOffice Plug-in 
handles all its documents VALUE ProductName, LibreOffice Plug-in  VALUE 
MIMEType,   
application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|
 #define ADDITIONAL_VERINFO3 
application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0
+#define VERVARIANT 3
+#define ORG_NAME npsoplugin.dll
+#define RES_APP_VENDOR
+#define INTERNAL_NAME npsoplugin
+
+#include windows.h
+#include version.hrc
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSIONVERSION, SUBVERSION, MICROVERSION, VERVARIANT
+PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+

[Libreoffice-commits] .: l10ntools/scripts Makefile RepositoryModule_ooo.mk solenv/gbuild solenv/inc

[Matus Kukan]

 Makefile  |2 +-
 RepositoryModule_ooo.mk   |3 ++-
 l10ntools/scripts/po2lo   |2 +-
 solenv/gbuild/AllLangResTarget.mk |5 ++---
 solenv/gbuild/Configuration.mk|5 ++---
 solenv/gbuild/Extension.mk|7 +++
 solenv/gbuild/TargetLocations.mk  |4 
 solenv/inc/settings.mk|4 ++--
 8 files changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 811180e9dd983e1166139ea27c256055763af477
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Feb 24 23:35:56 2012 +0100

translations converted to gbuild

diff --git a/Makefile b/Makefile
index bad1cee..cd1d27f 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ tail_build\
 test\
 toolkit\
 tools\
+translations\
 twain\
 ucb\
 ucbhelper\
@@ -231,7 +232,6 @@ store\
 sysui\
 testtools\
 tomcat\
-translations\
 udm\
 unodevtools\
 vigra\
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index cca8623..433e806 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -109,9 +109,10 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 sw \
 swext \
 test \
-twain \
 toolkit \
 tools \
+translations \
+twain \
 ucb \
 ucbhelper \
 udkapi \
diff --git a/l10ntools/scripts/po2lo b/l10ntools/scripts/po2lo
index 9fc93d6..4bcfb8b 100755
--- a/l10ntools/scripts/po2lo
+++ b/l10ntools/scripts/po2lo
@@ -186,7 +186,7 @@ def main():
 if opt in (-s, --skipsource):
 pass
 elif opt in (-i, --input):
-options.input = arg.strip('/')
+options.input = arg
 elif opt in (-o, --output):
 options.output = arg
 elif opt in (-l, --language):
diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 635778d..70151aa 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -50,7 +50,6 @@
 gb_SrsPartMergeTarget_TRANSEXTARGET := $(call 
gb_Executable_get_target_for_build,transex3)
 gb_SrsPartMergeTarget_TRANSEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 
 define gb_SrsPartMergeTarget__command
 $(call gb_Output_announce,$(3),$(true),srs,1)
@@ -113,7 +112,7 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE :=
 else
 $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call 
gb_SrsPartMergeTarget_get_target,$(1))
 $(call gb_SrsPartTarget_get_target,$(1)) : $(call 
gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath 
$(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath 
$(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
 endif
 
 endef
@@ -126,7 +125,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call 
gb_SrsPartMergeTarget_
mkdir -p $$(dir $$@)  \
cp $$ $$@)
 ifneq ($(strip $(WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath 
$(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath 
$(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
 $(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF)
 endif
 
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 1743be4..0a9c54c 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -223,7 +223,6 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
 
 gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
 gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) 
$(gb_XcuMergeTarget_CFGEXTARGET)
-gb_XcuMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 
 # PRJNAME is computed from the stem (parameter $(2))
 define gb_XcuMergeTarget__command
@@ -250,9 +249,9 @@ $(call gb_XcuMergeTarget_get_clean_target,%) :
 define gb_XcuMergeTarget_XcuMergeTarget
 $(call gb_XcuMergeTarget_get_target,$(1)) : \
$(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
-   $(realpath $(gb_XcuMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+   $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
 $(call gb_XcuMergeTarget_get_target,$(1)) : \
-   SDF := $(realpath $(gb_XcuMergeTarget_SDFLOCATION)$(dir 
$(1))localize.sdf)
+   SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
 endef
 
 
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index f59392d..0d3044b 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -42,7 +42,6 @@ gb_Extension_PROPMERGECOMMAND := \
 gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)
 gb_Extension_HELPEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_HELPEXTARGET)
-gb_Extension_SDFLOCATION := $(L10N_MODULE)/$(INPATH)/misc/sdf/
 # does not contain en-US because it 

[Libreoffice-commits] .: RepositoryModule_ooo.mk

[Matus Kukan]

 RepositoryModule_ooo.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8d7321c8eb658c409122feaef4960cc88aa63459
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Mar 2 21:10:44 2012 +0100

remove translations from here

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 433e806..f06b8b0 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -111,7 +111,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 test \
 toolkit \
 tools \
-translations \
 twain \
 ucb \
 ucbhelper \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: embeddedobj/inc embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embeddedobj/Makefile embeddedobj/Module_embeddedobj.mk embeddedobj/prj embeddedobj/source embedd

[Matus Kukan]

 Makefile   |2 
 Repository.mk  |2 
 RepositoryModule_ooo.mk|1 
 embeddedobj/Library_embobj.mk  |   65 +++
 embeddedobj/Library_emboleobj.mk   |   89 
 embeddedobj/Makefile   |7 +
 embeddedobj/Module_embeddedobj.mk  |   35 ++
 embeddedobj/inc/makefile.mk|   39 ---
 embeddedobj/prj/build.lst  |7 -
 embeddedobj/prj/d.lst  |8 -
 embeddedobj/prj/l10n   |1 
 embeddedobj/prj/makefile.mk|1 
 embeddedobj/source/commonembedding/makefile.mk |   56 --
 embeddedobj/source/general/makefile.mk |   60 ---
 embeddedobj/source/msole/exports.dxp   |1 
 embeddedobj/source/msole/makefile.mk   |  136 -
 embeddedobj/util/exports.dxp   |1 
 embeddedobj/util/makefile.mk   |   95 -
 postprocess/packcomponents/makefile.mk |8 +
 sc/CppunitTest_sc_filters_test.mk  |5 
 sc/CppunitTest_sc_subsequent_filters_test.mk   |5 
 sd/CppunitTest_sd_filters_test.mk  |5 
 sd/CppunitTest_sd_regression_test.mk   |5 
 23 files changed, 212 insertions(+), 422 deletions(-)

New commits:
commit d76e2d1cc396d0f1f57a0ba774be4194d8bf3459
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Feb 29 11:39:38 2012 +0100

embeddedobj: convert to gbuild

diff --git a/Makefile b/Makefile
index e9a1880..1739a10 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,7 @@ desktop\
 drawinglayer\
 dtrans\
 editeng\
+embeddedobj\
 eventattacher\
 extensions\
 fileaccess\
@@ -152,7 +153,6 @@ crashrep\
 ct2n\
 curl\
 dictionaries \
-embeddedobj\
 embedserv\
 epm\
 expat\
diff --git a/Repository.mk b/Repository.mk
index 9e7907a..a18cff9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -354,6 +354,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 deploymentgui \
 dict_ja \
 dict_zh \
+embobj \
+emboleobj \
 fileacc \
 index_data \
 java_uno_accessbridge \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 28378aa..cca8623 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 drawinglayer \
 dtrans \
 editeng \
+embeddedobj \
 eventattacher \
 extensions \
 fileaccess \
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
new file mode 100644
index 000..b820eb6
--- /dev/null
+++ b/embeddedobj/Library_embobj.mk
@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan matus.ku...@gmail.com (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_Library_Library,embobj))
+
+$(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj))
+
+$(eval $(call gb_Library_set_include,embobj,\
+   -I$(SRCDIR)/embeddedobj/source/inc \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,embobj,\
+   offapi \
+   udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,embobj,\
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+   $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,embobj,\
+   embeddedobj/source/commonembedding/embedobj \
+   embeddedobj/source/commonembedding/inplaceobj \
+   embeddedobj/source/commonembedding/miscobj \
+   embeddedobj/source/commonembedding/persistence \
+   embeddedobj/source/commonembedding/register \
+   embeddedobj/source/commonembedding/specialobject \
+   embeddedobj/source/commonembedding/visobj \
+   embeddedobj/source/commonembedding/xfactory \
+   embeddedobj/source/general/docholder \
+   

[Libreoffice-commits] .: clucene/Library_clucene.mk

[Matus Kukan]

 clucene/Library_clucene.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 654a5bdd6cdd594d9268deabb5629fc8720d7514
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Feb 24 21:50:45 2012 +0100

filter out not needed uwinapi which is not yet built

diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 29f0854..2fe7c5f 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -54,8 +54,9 @@ $(eval $(call gb_Library_add_defs,clucene,\
 ))
 endif
 
+# clucene does not depend on sal nor needs uwinapi here
 $(eval $(call gb_Library_add_linked_libs,clucene,\
-$(gb_STDLIBS) \
+$(filter-out uwinapi,$(gb_STDLIBS)) \
 ))
 
 ifeq ($(OS),LINUX)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: packimages/Package_images.mk

[Matus Kukan]

 packimages/Package_images.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit aa2456ecb15a0f14b3e0a6470124a82f1460596f
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Feb 25 00:29:20 2012 +0100

use gb_Helper_PHONY here

diff --git a/packimages/Package_images.mk b/packimages/Package_images.mk
index 157a9e5..21be311 100644
--- a/packimages/Package_images.mk
+++ b/packimages/Package_images.mk
@@ -29,11 +29,9 @@ $(eval $(call 
gb_Package_Package,packimages_images,$(WORKDIR)/CustomTarget/packi
 
 $(eval $(call gb_Package_add_customtarget,packimages_images,packimages/pack))
 
-# hack to rerun custom target's makefile every time
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,packimages/pack,\
-   packimages_rerun \
+   $(gb_Helper_PHONY) \
 ))
-packimages_rerun:
 
 $(eval $(call gb_Package_add_file,packimages_images,bin/images.zip,images.zip))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy

[Matus Kukan]

 oox/inc/oox/helper/attributelist.hxx |   14 ---
 oox/inc/oox/helper/propertymap.hxx   |5 ---
 oox/inc/oox/xls/commentsbuffer.hxx   |2 -
 oox/inc/oox/xls/drawingbase.hxx  |2 -
 oox/inc/oox/xls/formulaparser.hxx|6 
 oox/inc/oox/xls/sheetdatabuffer.hxx  |   14 ---
 oox/inc/oox/xls/stylesbuffer.hxx |4 ---
 oox/source/helper/attributelist.cxx  |   24 ---
 oox/source/helper/propertymap.cxx|   35 ---
 oox/source/xls/commentsbuffer.cxx|   44 ---
 oox/source/xls/drawingbase.cxx   |9 ---
 oox/source/xls/formulaparser.cxx |   27 -
 oox/source/xls/sheetdatabuffer.cxx   |   41 
 oox/source/xls/stylesbuffer.cxx  |   12 -
 unusedcode.easy  |   15 ---
 15 files changed, 254 deletions(-)

New commits:
commit 660cb78cd6900ffebe215ad4b3913bbe35ac9883
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Feb 23 21:22:21 2012 +0100

unusedcode: remove something from oox

diff --git a/oox/inc/oox/helper/attributelist.hxx 
b/oox/inc/oox/helper/attributelist.hxx
index bf6524c..d0a0600 100644
--- a/oox/inc/oox/helper/attributelist.hxx
+++ b/oox/inc/oox/helper/attributelist.hxx
@@ -122,12 +122,6 @@ public:
 /** Returns the 32-bit signed integer value of the specified attribute 
(hexadecimal). */
 OptValue sal_Int32  getIntegerHex( sal_Int32 nAttrToken ) const;
 
-/** Returns the 32-bit unsigned integer value of the specified attribute 
(hexadecimal). */
-OptValue sal_uInt32  getUnsignedHex( sal_Int32 nAttrToken ) const;
-
-/** Returns the 64-bit signed integer value of the specified attribute 
(hexadecimal). */
-OptValue sal_Int64  getHyperHex( sal_Int32 nAttrToken ) const;
-
 /** Returns the boolean value of the specified attribute. */
 OptValue bool getBool( sal_Int32 nAttrToken ) const;
 
@@ -168,14 +162,6 @@ public:
 or the passed default value if the attribute is missing or not 
convertible. */
 sal_Int32   getIntegerHex( sal_Int32 nAttrToken, sal_Int32 
nDefault ) const;
 
-/** Returns the 32-bit unsigned integer value of the specified attribute 
(hexadecimal),
-or the passed default value if the attribute is missing or not 
convertible. */
-sal_uInt32  getUnsignedHex( sal_Int32 nAttrToken, sal_uInt32 
nDefault ) const;
-
-/** Returns the 64-bit signed integer value of the specified attribute 
(hexadecimal),
-or the passed default value if the attribute is missing or not 
convertible. */
-sal_Int64   getHyperHex( sal_Int32 nAttrToken, sal_Int64 nDefault 
) const;
-
 /** Returns the boolean value of the specified attribute, or the passed
 default value if the attribute is missing or not convertible to bool. 
*/
 boolgetBool( sal_Int32 nAttrToken, bool bDefault ) const;
diff --git a/oox/inc/oox/helper/propertymap.hxx 
b/oox/inc/oox/helper/propertymap.hxx
index 37b723e..0542de6 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -68,9 +68,6 @@ public:
 inline bool hasProperty( sal_Int32 nPropId ) const
 { return find( nPropId ) != end(); }
 
-/** Returns the property value of the specified property, or 0 if not 
found. */
-const ::com::sun::star::uno::Any* getProperty( sal_Int32 nPropId ) const;
-
 /** Sets the specified property to the passed value. Does nothing, if the
 identifier is invalid. */
 inline bool setAnyProperty( sal_Int32 nPropId, const 
::com::sun::star::uno::Any rValue )
@@ -103,8 +100,6 @@ public:
 makePropertySet() const;
 
 #if OSL_DEBUG_LEVEL  0
-  static void dump( ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySet  rXPropSet);
-  void dump();
   static void dumpCode( ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySet  rXPropSet);
   void dumpCode();
 #endif
diff --git a/oox/inc/oox/xls/commentsbuffer.hxx 
b/oox/inc/oox/xls/commentsbuffer.hxx
index a0017ef..b873193 100644
--- a/oox/inc/oox/xls/commentsbuffer.hxx
+++ b/oox/inc/oox/xls/commentsbuffer.hxx
@@ -71,8 +71,6 @@ public:
 voidimportComment( const AttributeList rAttribs );
 /** Imports a cell comment Properties from the passed attributes of the 
comment element. */
 voidimportCommentPr( const AttributeList rAttribs );
-/** Imports the anchor points in CommentPr */
-voidimportAnchor( bool bFrom, sal_Int32 nWhich, const 
::rtl::OUString rChars );
 /** Imports a cell comment from the passed stream of a COMMENT record. */
 voidimportComment( SequenceInputStream rStrm );
 /** Imports a cell comment from the passed stream of a NOTE record. */
diff --git a/oox/inc/oox/xls/drawingbase.hxx 

[Libreoffice-commits] .: Makefile

[Matus Kukan]

 Makefile |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit a2ba4dcbd232c071bd69011a735bf9cd3001a15d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Feb 20 12:17:22 2012 +0100

It's safer to run one job at a time in instsetoo_native on Windows

diff --git a/Makefile b/Makefile
index 8ebbe46..346e91c 100644
--- a/Makefile
+++ b/Makefile
@@ -378,8 +378,14 @@ bootstrap: $(WORKDIR_BOOTSTRAP)
 # Build
 #
 build: bootstrap fetch $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+   cd packimages  unset MAKEFLAGS  \
+$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- 
-P$(GMAKE_PARALLELISM)
+ifeq ($(OS_FOR_BUILD),WNT)
+   cd instsetoo_native  unset MAKEFLAGS  $(SOLARENV)/bin/build.pl
+else
cd instsetoo_native  unset MAKEFLAGS  \
-   $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- 
-P$(GMAKE_PARALLELISM)
+$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
+endif
 
 cross-toolset: bootstrap fetch
cd cross_toolset  $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in desktop/Library_sofficeapp.mk solenv/gbuild vcl/Library_vcl.mk

[Matus Kukan]

 config_host.mk.in |1 +
 configure.in  |2 --
 desktop/Library_sofficeapp.mk |4 
 solenv/gbuild/gbuild.mk   |4 
 vcl/Library_vcl.mk|1 -
 5 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit f8a120b0e4843139b3d739725ce54269cfd96bd1
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date:   Mon Feb 20 18:39:14 2012 +0100

headless: cleanup HEADLESS definition

Define HEADLESS globally as it is meant to be.

diff --git a/config_host.mk.in b/config_host.mk.in
index 1abf218..0385fa4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -102,6 +102,7 @@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
 export ENABLE_GTK3=@ENABLE_GTK3@
 export ENABLE_GTK=@ENABLE_GTK@
 export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
+export ENABLE_HEADLESS=@ENABLE_HEADLESS@
 export ENABLE_KAB=@ENABLE_KAB@
 export ENABLE_KDE4=@ENABLE_KDE4@
 export ENABLE_KDE=@ENABLE_KDE@
diff --git a/configure.in b/configure.in
index 39fe207..0d320e7 100644
--- a/configure.in
+++ b/configure.in
@@ -8108,8 +8108,6 @@ if test x$enable_headless = xyes; then
 ENABLE_HEADLESS=TRUE
 SCPDEFS=$SCPDEFS -DHEADLESS
 R=headless
-# this does not work see hack in Library_vcl.mk
-AC_DEFINE(HEADLESS)
 fi
 AC_SUBST(ENABLE_HEADLESS)
 
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b544f74..26eecbc 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -237,6 +237,10 @@ ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE)
 gb_GLOBALDEFS += -DENABLE_GRAPHITE
 endif
 
+ifeq ($(strip $(ENABLE_HEADLESS)),TRUE)
+gb_GLOBALDEFS += -DHEADLESS
+endif
+
 ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
 gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
 endif
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 3420f7d..843dceb 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -456,7 +456,6 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\
 $$(FREETYPE_CFLAGS) \
 ))
 $(eval $(call gb_Library_add_defs,vcl,\
--DHEADLESS \
 -DSAL_DLLPREFIX=\$(gb_Library_SYSPRE)\ \
 -DSAL_DLLPOSTFIX=\$(gb_Library_OOOEXT)\ \
 -D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \
commit 3c177b96b80b9f506a6a93542cea870b3f8e1f51
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date:   Mon Feb 20 11:38:15 2012 +0100

desktop: remove duplicated gb_Library_set_include call

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index ae078a7..6880eec 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -46,10 +46,6 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\
 $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
 ))
 
-$(eval $(call gb_Library_set_include,sofficeapp,\
-$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,sofficeapp,\
 comphelper \
 cppu \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

[Matus Kukan]

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee7f6aaa95c39ce062cc6c2aff6416442f5ebd90
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Feb 19 20:31:56 2012 +0100

Add missing $

diff --git a/configure.in b/configure.in
index d9a75ca..50a9b97 100644
--- a/configure.in
+++ b/configure.in
@@ -1977,7 +1977,7 @@ pathmunge ()
 else
 new_path=$1
 fi
-if ! echo LO_PATH | $EGREP -q (^|:)$1($|:) ; then
+if ! echo $LO_PATH | $EGREP -q (^|:)$1($|:) ; then
 if test $2 = after ; then
 LO_PATH=$LO_PATH:$new_path
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: smoketest/Library_smoketest.mk smoketest/Module_smoketest.mk

[Matus Kukan]

 smoketest/Library_smoketest.mk |   48 +
 smoketest/Module_smoketest.mk  |1 
 2 files changed, 49 insertions(+)

New commits:
commit cfae02e4c4f018ed9761fff7930a845b3b06114a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Feb 20 02:37:42 2012 +0100

we do want also create library for smoketest and deliver it

diff --git a/smoketest/Library_smoketest.mk b/smoketest/Library_smoketest.mk
new file mode 100644
index 000..80b7de0
--- /dev/null
+++ b/smoketest/Library_smoketest.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan matus.ku...@gmail.com (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_Library_Library,smoketest))
+
+$(eval $(call gb_Library_add_api,smoketest,\
+   offapi \
+   udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,smoketest,\
+   cppu \
+   cppuhelper \
+   sal \
+   unotest \
+))
+
+$(eval $(call gb_Library_use_external,smoketest,cppunit))
+
+$(eval $(call gb_Library_add_exception_objects,smoketest,\
+   smoketest/smoketest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 0ef1c52..9de8a44 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,smoketest))
 ifeq ($(CROSS_COMPILING),)
 
 $(eval $(call gb_Module_add_targets,smoketest,\
+   Library_smoketest \
Package_losmoketest \
Zip_smoketestdoc \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile

[Matus Kukan]

 Makefile |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5b773eb58222109843814e48ace35fe9740a7d72
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Feb 17 11:26:15 2012 +0100

update Makefile

diff --git a/Makefile b/Makefile
index 7ef0842..d4dd3d9 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,10 @@ hwpfilter\
 i18npool\
 i18nutil\
 idl\
+javaunohelper\
+jurt\
+jvmaccess\
+jvmfwk\
 lingucomponent\
 linguistic\
 lotuswordpro\
@@ -78,6 +82,7 @@ psprint_config\
 qadevOOo\
 regexp\
 reportdesign\
+ridljar\
 rsc\
 sal\
 salhelper\
@@ -106,6 +111,7 @@ ucb\
 ucbhelper\
 udkapi\
 unixODBC\
+unoil\
 unotest\
 unotools\
 unoxml\
@@ -164,12 +170,8 @@ icu\
 idlc\
 instsetoo_native\
 io\
-javaunohelper\
 jfreereport\
 jpeg\
-jurt\
-jvmaccess\
-jvmfwk\
 l10ntools\
 languagetool\
 libcdr\
@@ -212,7 +214,6 @@ registry\
 remotebridges\
 reportbuilder\
 rhino\
-ridljar\
 saxon\
 scp2\
 sdext\
@@ -232,7 +233,6 @@ tomcat\
 translations\
 udm\
 unodevtools\
-unoil\
 vigra\
 x11_extensions\
 xmlhelp\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in icon-themes/README Makefile packimages/Makefile packimages/Module_packimages.mk packimages/pack packimages/Package_images.mk packima

[Matus Kukan]

 Makefile|2 -
 config_host.mk.in   |1 
 configure.in|   11 --
 icon-themes/README  |2 -
 packimages/Makefile |7 
 packimages/Module_packimages.mk |   34 +++
 packimages/Package_images.mk|   43 
 packimages/pack/Makefile|   70 
 packimages/pack/makefile.mk |   68 --
 packimages/prj/build.lst|3 -
 packimages/prj/d.lst|2 -
 packimages/prj/makefile.mk  |1 
 12 files changed, 158 insertions(+), 86 deletions(-)

New commits:
commit 7f267db9b30fb90fe53844f659d4efa599034b5c
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Feb 17 14:40:04 2012 +0100

SOLAREXTRALIB unused

diff --git a/config_host.mk.in b/config_host.mk.in
index 8d38959..1abf218 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -367,7 +367,6 @@ export SIZEOF_LONGLONG=@SIZEOF_LONGLONG@
 export SIZEOF_POINTER=@SIZEOF_POINTER@
 export SIZEOF_SHORT=@SIZEOF_SHORT@
 export SOLARENV=@SRC_ROOT@/solenv
-export SOLAREXTRALIB=@SOLAREXTRALIB@
 export SOLARINC=@SOLARINC@
 export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
 export SOLARLIB=@SOLARLIB@
diff --git a/configure.in b/configure.in
index 0f45e09..e424560 100644
--- a/configure.in
+++ b/configure.in
@@ -2721,7 +2721,6 @@ aix*)
 OS=AIX
 OUTPATH=unxaigppc
 P_SEP=:
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -2810,7 +2809,6 @@ dragonfly*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -2838,7 +2836,6 @@ freebsd*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -2867,7 +2864,6 @@ kfreebsd*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -2975,7 +2971,6 @@ linux-gnu*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -3061,7 +3056,6 @@ mingw*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -3088,7 +3082,6 @@ openbsd*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARINC=$SOLARINC -I/usr/local/include
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
@@ -3120,9 +3113,6 @@ solaris*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB -L$SRC_ROOT/solenv/$OUTPATH/lib.solaris.2.6
-SOLAREXTRALIB=$SOLAREXTRALIB -L/lib -L/usr/lib
-SOLAREXTRALIB=$SOLAREXTRALIB -L/usr/local/bin -L/usr/dt/lib 
-L/usr/openwin/lib
 SOLARINC=$SOLARINC -I/usr/local/include
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
@@ -3155,7 +3145,6 @@ AC_SUBST(OS)
 AC_SUBST(OUTDIR)
 AC_SUBST(OUTPATH)
 AC_SUBST(P_SEP)
-AC_SUBST(SOLAREXTRALIB)
 AC_SUBST(WORKDIR)
 
 dnl ===
commit 5a4e4d5543edd47f4b411c0f2fa43d1a0e6a1ff7
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Feb 16 20:18:13 2012 +0100

packimages: convert to gbuild

diff --git a/Makefile b/Makefile
index d4dd3d9..cb99243 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ officecfg\
 oovbaapi\
 oox\
 package\
+packimages\
 padmin\
 psprint_config\
 qadevOOo\
@@ -201,7 +202,6 @@ neon\
 nss\
 odk\
 openssl\
-packimages\
 pango\
 postgresql\
 postprocess\
diff --git a/icon-themes/README b/icon-themes/README
index 7655710..120c3ab 100644
--- 

[Libreoffice-commits] .: Makefile

[Matus Kukan]

 Makefile |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit ca9801809249dbc98b28d3a24325fa54f2e91724
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Feb 16 17:39:26 2012 +0100

let src.downloaded not depend on phony target to avoid re-creating each time

diff --git a/Makefile b/Makefile
index 99cae26..7ef0842 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 
-.PHONY : all autogen bootstrap build check clean clean-build clean-host 
dev-install dev-install-link distclean distro-pack-install docs fetch 
findunusedcode id install subsequenttest tags
+.PHONY : all bootstrap build check clean clean-build clean-host dev-install 
dev-install-link distclean distro-pack-install docs fetch findunusedcode id 
install subsequenttest tags
 
 ifeq ($(MAKECMDGOALS),)
 MAKECMDGOALS:=all
@@ -332,9 +332,8 @@ endif
 
 ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),)
 #
-# autogen
+# Makefile
 #
-autogen: Makefile
 
 # I don't like to touch stuff that are supposed to be
 # in the source tree, hence read-only
@@ -354,7 +353,7 @@ config_host.mk : config_host.mk.in bin/repo-list.in 
ooo.lst.in configure.in auto
 #
 fetch: src.downloaded
 
-src.downloaded : autogen ooo.lst download
+src.downloaded : Makefile ooo.lst download
 ifeq ($(DO_FETCH_TARBALLS),YES)
@./download $(SRCDIR)/ooo.lst  touch $@
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/source

[Matus Kukan]

 svx/source/svdraw/svdpagv.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d5f9722e198cc8cc9e658207c73e465390c60c99
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Feb 11 20:07:01 2012 +0100

fix dbgutil build: put back DbgName_SdrPageView

diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 399d7f0..fef1b10 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -66,6 +66,8 @@ using namespace ::com::sun::star;
 #include svx/sdrpagewindow.hxx
 #include svx/sdrpaintwindow.hxx
 
+DBG_NAME(SdrPageView);
+
 

 // interface to SdrPageWindow
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryModule_ooo.mk

[Matus Kukan]

 RepositoryModule_ooo.mk |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f7eae4c89c76ba3ae219e9f0869d9a07a2fb4889
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Feb 10 21:59:39 2012 +0100

add missing modules

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index e39ba85..8020878 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -31,11 +31,14 @@ $(eval $(call gb_Module_Module,ooo))
 $(eval $(call gb_Module_add_moduledirs,ooo,\
 accessibility \
 animations \
+apple_remote \
+avmedia \
 basctl \
 basebmp \
 basegfx \
 basic \
 bean \
+binaryurp \
 canvas \
 chart2 \
 comphelper \
@@ -50,7 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 dtrans \
 editeng \
 eventattacher \
-   extensions \
+extensions \
 fileaccess \
 filter \
 forms \
@@ -70,6 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 np_sdk \
 o3tl \
 offapi \
+officecfg \
 oovbaapi \
 oox \
 package \
@@ -77,6 +81,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 psprint_config \
 regexp \
 reportdesign \
+rsc \
 sal \
 salhelper \
 sane \
@@ -95,6 +100,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 svx \
 sw \
 swext \
+test \
 twain \
 toolkit \
 tools \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - Repository.mk sal/CppunitTest_Module_DLL.mk sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_module.mk sal/CppunitTest_sal_osl_old_test_file.mk sal/CppunitT

[Matus Kukan]

 Repository.mk|1 
 sal/CppunitTest_Module_DLL.mk|   42 ++
 sal/CppunitTest_sal_osl_file.mk  |1 
 sal/CppunitTest_sal_osl_module.mk|   13 ---
 sal/CppunitTest_sal_osl_old_test_file.mk |1 
 sal/CppunitTest_sal_osl_process.mk   |   13 ---
 sal/CppunitTest_sal_osl_thread.mk|   39 +
 sal/Executable_osl_process_child.mk  |   57 +++
 sal/Module_sal.mk|   17 ++---
 sal/qa/osl/module/osl_Module.cxx |4 +-
 sal/qa/osl/process/osl_process.cxx   |5 +-
 11 files changed, 155 insertions(+), 38 deletions(-)

New commits:
commit 67cf29bb36587f03ec19c789657da4236553c5fd
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Jan 21 18:51:16 2012 +0100

sal: make more tests running

diff --git a/Repository.mk b/Repository.mk
index c9a8dfb..2f54f98 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 gendict \
 genindex_data \
 mkunroll \
+osl_process_child \
 rsc \
 rscdep \
 saxparser \
diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk
new file mode 100644
index 000..048bd2b
--- /dev/null
+++ b/sal/CppunitTest_Module_DLL.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan matus.ku...@gmail.com (initial developer)
+#
+# All Rights Reserved.
+#
+# 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.
+
+# This is not really a test. Only a dynamic library which is loaded by
+# sal_osl_module unit test library.
+
+$(eval $(call gb_CppunitTest_CppunitTest,Module_DLL))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\
+sal/qa/osl/module/osl_Module_DLL \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,Module_DLL,\
+sal \
+$(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_module_dll.mk 
b/sal/CppunitTest_sal_osl_module_dll.mk
deleted file mode 100644
index ca3d559..000
--- a/sal/CppunitTest_sal_osl_module_dll.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan matus.ku...@gmail.com (initial developer)
-#
-# All Rights Reserved.
-#
-# 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_CppunitTest_CppunitTest,sal_osl_module_dll))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module_dll,\
-sal/qa/osl/module/osl_Module_DLL \
-))
-
-$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_module_dll,\
-sal \
-$(gb_STDLIBS) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sal/Executable_osl_process_child.mk 
b/sal/Executable_osl_process_child.mk
new file mode 100644
index 000..c6fa16e
--- /dev/null
+++ b/sal/Executable_osl_process_child.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the 

[Libreoffice-commits] .: solenv/gbuild

[Matus Kukan]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9847c3ec4dc276f52fd06b59dd8101506fe84cd9
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Jan 16 12:40:02 2012 +0100

gbuild: WNT_INTEL_MSC: replace also // with / in the path

Motivation behind this is to fix processing of idl files.
When LibO directory is toplevel disk directory, there are
two // in the path which could be the reason idlc fails.

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index e0d6f12..af59807 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -247,11 +247,12 @@ gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
+$(subst //,/, \
 $(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1)
+$(1))
 endef
 
 # YaccTarget class
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - solenv/gbuild

[Matus Kukan]

 solenv/gbuild/Helper.mk |4 
 solenv/gbuild/UnoApiTarget.mk   |   11 ---
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |   13 -
 solenv/gbuild/platform/com_GCC_defs.mk  |2 --
 solenv/gbuild/platform/solaris.mk   |4 +---
 5 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit 82633cdad36083e537886b832483f4e73263735a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Jan 15 15:04:07 2012 +0100

gbuild: simplify gb_Helper_abbreviate_dirs*

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 84e6cd9..9655424 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -47,6 +47,10 @@ $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR))  \
 $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR)  $(subst 
$(WORKDIR)/,$$W/,$(1)
 endef
 
+define gb_Helper_abbreviate_dirs_native
+$(call gb_Helper_convert_native,$(call gb_Helper_abbreviate_dirs,$(1)))
+endef
+
 define gb_Helper_make_clean_target
 gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 4aa2a91..e0d6f12 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -241,11 +241,6 @@ gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) 
| $(gb_AWK) -- '{ prin
 gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ 
print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ 
print tolower(substr($$0,1,1)) substr($$0,2) }')
 
-define gb_Helper_abbreviate_dirs_native
-R=$(gb_Helper_REPODIR_NATIVE)  $(subst $(REPODIR)/,$$R/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE)  
W=$(gb_Helper_WORKDIR_NATIVE)  S=$(gb_Helper_SRCDIR_NATIVE)))  \
-$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst 
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst 
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst 
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst 
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
-endef
-
 gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
 
 # convert parameters filesystem root to native notation
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 33aa936..9e055ed 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -160,5 +160,3 @@ $(1)
 endef
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
-
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index afb9629..c826bea 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -139,8 +139,6 @@ gb_COMPILERNOOPTFLAGS :=
 
 # Helper class
 
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
-
 gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
 # $(1): list of directory pathnames to append at the end of the ld path
@@ -382,7 +380,7 @@ endef
 # Sun cc/CC support -xM1/-xMF flags, but unfortunately refuse input files that
 # do not have the right suffix, so use makedepend here...
 define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs_native,\
+$(call gb_Helper_abbreviate_dirs,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(INCLUDE) \
$(DEFS) \
commit 39c347b2d9ffe285160e13207a4df79d0972cbce
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Jan 15 14:38:37 2012 +0100

gbuild: platform/WNT_INTEL_MSC: use subst in gb_Helper_convert_native

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 0c953f1..4aa2a91 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -252,10 +252,10 @@ gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
-$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
-$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
+$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
+$(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
+$(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
 $(1)
 endef
 
commit 6cd9c42eb69202bb16b975e227f8870729465fbc
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Jan 15 14:33:10 2012 +0100

gbuild: UnoApiTarget: refactor slightly

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 426d967..704659b 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -225,15 +225,12 @@ define gb_UnoApiTarget__command
 endef
 
 define 

[Libreoffice-commits] .: editeng/source oox/source sd/source

[Matus Kukan]

 editeng/source/editeng/editdbg.cxx   |2 +-
 oox/source/helper/propertymap.cxx|   30 +++---
 sd/source/filter/eppt/pptx-epptooxml.cxx |   12 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit fcc8db1d2be9a25f79cbcc14043b495d240bb8bf
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Jan 14 11:30:26 2012 +0100

fix for gcc 4.7: unable to find string literal operator

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index 9389001..fc9c562 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -454,7 +454,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool 
bInfoBox )
 fprintf( fp, 
\n\n
 );
 fprintf( fp, \n==   EditEngine  Views   
== );
 fprintf( fp, 
\n
 );
-fprintf( fp, \nControl: %SAL_PRIxUINT32, pEE-GetControlWord() );
+fprintf( fp, \nControl: % SAL_PRIxUINT32, pEE-GetControlWord() );
 fprintf( fp, \nRefMapMode: %i, 
pEE-pImpEditEngine-pRefDev-GetMapMode().GetMapUnit() );
 fprintf( fp, \nPaperSize: %li x %li, pEE-GetPaperSize().Width(), 
pEE-GetPaperSize().Height() );
 fprintf( fp, \nMaxAutoPaperSize: %li x %li, 
pEE-GetMaxAutoPaperSize().Width(), pEE-GetMaxAutoPaperSize().Height() );
diff --git a/oox/source/helper/propertymap.cxx 
b/oox/source/helper/propertymap.cxx
index b4094eb..af0d374 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -355,9 +355,9 @@ static void lclDumpAnyValue( Any value)
 } else if( value = aMatrix ) {
 fprintf (stderr,Matrix\n%f %f %f\n%f %f %f\n%f %f %f\n, 
aMatrix.Line1.Column1, aMatrix.Line1.Column2, aMatrix.Line1.Column3, 
aMatrix.Line2.Column1, aMatrix.Line2.Column2, aMatrix.Line2.Column3, 
aMatrix.Line3.Column1, aMatrix.Line3.Column2, aMatrix.Line3.Column3);
 } else if( value = intValue )
-fprintf (stderr,%SAL_PRIdINT32(hex: 
%SAL_PRIxUINT32)\n, intValue, intValue);
+fprintf (stderr,% SAL_PRIdINT32 (hex: % 
SAL_PRIxUINT32 )\n, intValue, intValue);
 else if( value = uintValue )
-fprintf (stderr,%SAL_PRIdINT32(hex: 
%SAL_PRIxUINT32)\n, uintValue, uintValue);
+fprintf (stderr,% SAL_PRIdINT32 (hex: % 
SAL_PRIxUINT32 )\n, uintValue, uintValue);
 else if( value = int16Value )
 fprintf (stderr,%d(hex: %x)\n, int16Value, 
int16Value);
 else if( value = uint16Value )
@@ -502,7 +502,7 @@ static const char* lclDumpAnyValueCode( Any value, int 
level = 0)
 return Any (str);
 } else if( value = strArray ) {
 printLevel (level);
-fprintf (stderr,Sequence OUString  aStringSequence 
(%SAL_PRIdINT32);\n, strArray.getLength());
+fprintf (stderr,Sequence OUString  aStringSequence (% 
SAL_PRIdINT32 );\n, strArray.getLength());
 for( int i=0; istrArray.getLength(); i++ ) {
 printLevel (level);
 fprintf (stderr,aStringSequence[%d] = CREATE_OUSTRING 
(\%s\);\n, i, USS( strArray[i] ) );
@@ -510,7 +510,7 @@ static const char* lclDumpAnyValueCode( Any value, int 
level = 0)
 return aStringSequence;
 } else if( value = propArray ) {
 printLevel (level);
-fprintf (stderr,Sequence PropertyValue  aPropSequence 
(%SAL_PRIdINT32);\n, propArray.getLength());
+fprintf (stderr,Sequence PropertyValue  aPropSequence (% 
SAL_PRIdINT32 );\n, propArray.getLength());
 for( int i=0; ipropArray.getLength(); i++ ) {
 printLevel (level);
 fprintf (stderr, {\n);
@@ -525,7 +525,7 @@ static const char* lclDumpAnyValueCode( Any value, int 
level = 0)
 return aPropSequence;
 } else if( value = propArrayArray ) {
 printLevel (level);
-fprintf (stderr,Sequence Sequence  PropertyValue   
aPropSequenceSequence (%SAL_PRIdINT32);\n, propArrayArray.getLength());
+fprintf (stderr,Sequence Sequence  PropertyValue   
aPropSequenceSequence (% SAL_PRIdINT32 );\n, propArrayArray.getLength());
 for( int i=0; ipropArrayArray.getLength(); i++ ) {
 printLevel (level);
 fprintf (stderr, {\n);
@@ -544,7 +544,7 @@ static const char* lclDumpAnyValueCode( Any value, int 
level = 0)
 }
 } else if( value = adjArray ) {
 printLevel (level);
-fprintf (stderr,Sequence EnhancedCustomShapeAdjustmentValue  
aAdjSequence (%SAL_PRIdINT32);\n, adjArray.getLength());
+fprintf (stderr,Sequence EnhancedCustomShapeAdjustmentValue  
aAdjSequence (% SAL_PRIdINT32 );\n, adjArray.getLength());

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source

[Matus Kukan]

 scp2/source/ooo/file_font_ooo.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1d257c38e0ea60d94241e1d397bc8b477b4a94fe
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Jan 14 17:31:56 2012 +0100

scp2: typo: Serif - Sans

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index fef7b3b..104f32c 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -101,7 +101,7 @@ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, 
LiberationMono-BoldItalic
 #ifndef WITHOUT_FONTS 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, 
LiberationSans-Regular.ttf, Liberation Sans Regular) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, 
Liberation Sans Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, 
Liberation Serif Bold) 
+STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, 
Liberation Sans Bold) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, 
LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) 
 #endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

[Matus Kukan]

 scp2/source/ooo/file_font_ooo.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 966a5340e08b68f4ff00633f8de075654feb9c13
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Jan 14 17:31:56 2012 +0100

scp2: typo: Serif - Sans

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index fef7b3b..104f32c 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -101,7 +101,7 @@ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, 
LiberationMono-BoldItalic
 #ifndef WITHOUT_FONTS 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, 
LiberationSans-Regular.ttf, Liberation Sans Regular) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, 
Liberation Sans Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, 
Liberation Serif Bold) 
+STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, 
Liberation Sans Bold) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, 
LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) 
 #endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk Repository.mk

[Matus Kukan]

 Repository.mk   |   16 
 extensions/Module_extensions.mk |   21 ++---
 np_sdk/Module_np_sdk.mk |3 +++
 3 files changed, 21 insertions(+), 19 deletions(-)

New commits:
commit ab84770bb61ffb2675548e11a6a45059cb4f6c8e
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Jan 13 15:14:57 2012 +0100

Build nsplugin only in with mozilla case.

This replaces commits 830a2b923528323e0f39259234dfee26d9d44d21
and 68b08a11babb7274048ef836a078959d126c97b7 with,
hopefully, proper one.

diff --git a/Repository.mk b/Repository.mk
index ac24a61..d781001 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -101,13 +101,6 @@ endif
 
 endif
 
-ifeq ($(ENABLE_NSPLUGIN),YES)
-$(eval $(call gb_Helper_register_executables,OOO,\
-nsplugin \
-))
-
-endif
-
 ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Helper_register_executables,OOO,\
 pluginapp.bin \
@@ -115,6 +108,14 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 pl \
 ))
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Helper_register_executables,OOO,\
+nsplugin \
+))
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+npsoplugin \
+))
+endif
 endif # WITH_MOZILLA
 
 
@@ -324,7 +325,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 log_uno \
 mcnttype \
 neon \
-npsoplugin \
 package2 \
 reg \
 scriptframe \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index a94eee6..1010e63 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -76,16 +76,8 @@ endif # DISABLE_ATL
 
 endif # WNT
 
-ifeq ($(ENABLE_NSPLUGIN),YES)
-$(eval $(call gb_Module_add_targets,extensions,\
-   Executable_nsplugin \
-   Library_npsoplugin \
-   WinResTarget_npsoplugin \
-))
-
-endif
-
 ifeq ($(WITH_MOZILLA),YES)
+
 $(eval $(call gb_Module_add_targets,extensions,\
Library_pl \
 ))
@@ -95,9 +87,16 @@ ifneq ($(GUIBASE),aqua)
 $(eval $(call gb_Module_add_targets,extensions,\
Executable_pluginapp.bin \
 ))
+endif
+endif
 
-endif # GUIBASE!=aqua
-endif # GUI=UNX
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Module_add_targets,extensions,\
+   Executable_nsplugin \
+   Library_npsoplugin \
+   WinResTarget_npsoplugin \
+))
+endif
 
 endif # WITH_MOZILLA=YES
 
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index 6c658d2..63393d5 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Module_Module,np_sdk))
 
+ifeq ($(WITH_MOZILLA),YES)
+
 $(eval $(call gb_Module_add_targets,np_sdk,\
Package_inc \
 ))
@@ -35,6 +37,7 @@ ifeq ($(ENABLE_NSPLUGIN),YES)
 $(eval $(call gb_Module_add_targets,np_sdk,\
StaticLibrary_nputils \
 ))
+endif
 
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

[Matus Kukan]

 scp2/source/ooo/common_brand.scp |2 +-
 scp2/source/ooo/file_ooo.scp |2 +-
 scp2/source/ooo/makefile.mk  |4 
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit aa7e105677017059ab84c4f3bd38b6a511637395
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Jan 13 16:02:03 2012 +0100

scp2: install nsplugin only in case it's build

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 04131ec..ed8f3b6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -643,7 +643,7 @@ File gid_Brand_File_Bin_Libxml2
 End
 #endif
 
-#if !defined WITHOUT_MOZILLA  (!defined UNX || defined ENABLE_GTK)
+#if !defined WITHOUT_MOZILLA  defined ENABLE_NSPLUGIN
 File gid_Brand_File_Lib_Npsoplugin
 BIN_FILE_BODY;
 Name = SPECIAL_NAME(npsoplugin);
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 4876614..5263c11 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -110,7 +110,7 @@ End
 
 #ifndef WITHOUT_MOZILLA
 
-#if !defined(UNX) || defined(ENABLE_GTK)
+#ifdef ENABLE_NSPLUGIN
 File gid_File_Exe_Nsplugin
 BIN_FILE_BODY;
 Styles  = (PACKED);
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 96bcb5f..87cc67c 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -66,6 +66,10 @@ SCPDEFS+=-DENABLE_GTK3
 .ENDIF
 .ENDIF # $(GUI)==UNX
 
+.IF $(ENABLE_NSPLUGIN) == YES
+SCPDEFS+=-DENABLE_NSPLUGIN
+.ENDIF
+
 .IF $(MERGELIBS) == TRUE
 SCPDEFS+=-DMERGELIBS
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: np_sdk/StaticLibrary_nputils.mk

[Matus Kukan]

 np_sdk/StaticLibrary_nputils.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 842523e46f347680ad2648c628c63374524135cd
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 12 09:43:26 2012 +0100

np_sdk: add missing dependency

diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index b0c9764..ff63293 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/np_sdk/StaticLibrary_nputils.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,nputils))
 
+$(eval $(call gb_StaticLibrary_add_package_headers,nputils,np_sdk_inc))
+
 $(eval $(call gb_StaticLibrary_use_externals,nputils,\
mozilla_headers \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk

[Matus Kukan]

 extensions/Module_extensions.mk |   23 +++
 np_sdk/Module_np_sdk.mk |5 -
 2 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 830a2b923528323e0f39259234dfee26d9d44d21
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 12 09:08:13 2012 +0100

use ENABLE_NSPLUGIN again

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 9719f2b..a94eee6 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -76,36 +76,27 @@ endif # DISABLE_ATL
 
 endif # WNT
 
-ifneq ($(WITH_MOZILLA),NO)
-
+ifeq ($(ENABLE_NSPLUGIN),YES)
 $(eval $(call gb_Module_add_targets,extensions,\
-   Library_pl \
Executable_nsplugin \
+   Library_npsoplugin \
+   WinResTarget_npsoplugin \
 ))
 
-ifeq ($(GUI),WNT)
+endif
+
+ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Module_add_targets,extensions,\
-   Library_npsoplugin \
-   WinResTarget_npsoplugin \
+   Library_pl \
 ))
-endif # GUI=WNT
 
 ifeq ($(GUI),UNX)
-
 ifneq ($(GUIBASE),aqua)
-
 $(eval $(call gb_Module_add_targets,extensions,\
Executable_pluginapp.bin \
 ))
 
 endif # GUIBASE!=aqua
-
-ifneq ($(ENABLE_GTK),)
-$(eval $(call gb_Module_add_targets,extensions,\
-   Library_npsoplugin \
-))
-endif # ENABLE_GTK
-
 endif # GUI=UNX
 
 endif # WITH_MOZILLA=YES
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index bda8126..6c658d2 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -27,9 +27,12 @@
 
 $(eval $(call gb_Module_Module,np_sdk))
 
-ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Module_add_targets,np_sdk,\
Package_inc \
+))
+
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Module_add_targets,np_sdk,\
StaticLibrary_nputils \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Repository.mk

[Matus Kukan]

 Repository.mk |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 68b08a11babb7274048ef836a078959d126c97b7
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 12 18:33:33 2012 +0100

ops, also adapt registering of the executable

diff --git a/Repository.mk b/Repository.mk
index 38a52d5..ac24a61 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -101,9 +101,15 @@ endif
 
 endif
 
-ifneq ($(WITH_MOZILLA),NO)
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Helper_register_executables,OOO,\
+nsplugin \
+))
+
+endif
+
+ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Helper_register_executables,OOO,\
-   nsplugin \
 pluginapp.bin \
 ))
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryExternal.mk

[Matus Kukan]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b951e82748eb25aeb3976043c530b8f5debc0a3
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 12 08:23:06 2012 +0100

trying to fix windows build: include proper npapi.h

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 514a5b7..f37cc10 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -909,8 +909,8 @@ ifeq ($(SYSTEM_MOZILLA_HEADERS),YES)
 
 define gb_LinkTarget__use_mozilla_headers
 $(eval $(call gb_LinkTarget_set_include,$(1),\
-   $$(INCLUDE) \
$(MOZILLA_HEADERS_CFLAGS)
+   $$(INCLUDE) \
 ))
 endef
 
@@ -918,8 +918,8 @@ else #!SYSTEM_MOZILLA_HEADERS
 
 define gb_LinkTarget__use_mozilla_headers
 $(eval $(call gb_LinkTarget_set_include,$(1),\
-   $$(INCLUDE) \
-I$(OUTDIR)/inc/npsdk \
+   $$(INCLUDE) \
 ))
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryExternal.mk

[Matus Kukan]

 RepositoryExternal.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 66458f367ac045c5e263271b58ed4b0068644ac9
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 12 08:53:20 2012 +0100

typo: missing \

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f37cc10..c2efb60 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -909,9 +909,10 @@ ifeq ($(SYSTEM_MOZILLA_HEADERS),YES)
 
 define gb_LinkTarget__use_mozilla_headers
 $(eval $(call gb_LinkTarget_set_include,$(1),\
-   $(MOZILLA_HEADERS_CFLAGS)
+   $(MOZILLA_HEADERS_CFLAGS) \
$$(INCLUDE) \
 ))
+
 endef
 
 else #!SYSTEM_MOZILLA_HEADERS
@@ -921,6 +922,7 @@ $(eval $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/npsdk \
$$(INCLUDE) \
 ))
+
 endef
 
 endif #SYSTEM_MOZILLA_HEADERS
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Library_merged.mk solenv/gbuild

[Matus Kukan]

 Library_merged.mk  |   32 ++--
 solenv/gbuild/Library.mk   |2 -
 solenv/gbuild/LinkTarget.mk|   23 +++
 solenv/gbuild/extensions/pre_MergedLibsList.mk |   50 +
 4 files changed, 62 insertions(+), 45 deletions(-)

New commits:
commit a74627d53eea219ceb26ce0d341cdf218ed0dd0a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Jan 6 10:48:43 2012 +0100

improve support for merging libraries

diff --git a/Library_merged.mk b/Library_merged.mk
index 4a8ccaf..9fe9c2d 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -21,26 +21,16 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-
 $(eval $(call gb_Library_Library,merged))
 
-$(eval $(call gb_Library_add_linked_libs,merged,$(filter-out 
$(gb_MERGED_LIBS),\
-   avmedia \
+$(eval $(call gb_Library_add_linked_libs,merged,\
basegfx \
-   canvastools \
comphelper \
-   cppcanvas \
cppu \
cppuhelper \
-   drawinglayer \
-   editeng \
fwe \
i18nisolang1 \
i18npaper \
-   i18nutil \
-   jvmfwk \
-   lng \
-   fwe \
sal \
salhelper \
sax \
@@ -49,28 +39,24 @@ $(eval $(call 
gb_Library_add_linked_libs,merged,$(filter-out $(gb_MERGED_LIBS),\
sot \
svl \
svt \
-   svx \
-   svxcore \
tk \
tl \
ucbhelper \
utl \
vcl \
-   xo \
xcr \
$(gb_STDLIBS) \
-)))
+))
 
 $(eval $(call gb_Library_use_externals,merged,\
-   icui18n \
+   berkeleydb \
icuuc \
-   jpeg \
-   libxml2 \
zlib \
 ))
 
+# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
 $(eval $(call gb_Library_add_library_objects,merged,\
-   $(gb_CORE_LIBS) \
+   $(gb_MERGEDLIBS) \
 ))
 
 ifeq ($(OS),WNT)
@@ -85,12 +71,4 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 ))
 endif
 
-# something is missing here for sure
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_add_linked_libs,merged,\
-   objc \
-   Cocoa \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index b9173ea..13258b8 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -106,7 +106,7 @@ endef
 # gb_Library__get_final_target has been invented for that purpose...
 define gb_Library_set_componentfile
 $(call gb_ComponentTarget_ComponentTarget,$(2),$(call 
gb_Library__get_componentprefix,$(1)),\
-   $(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter 
$(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1
+   $(call gb_Library_get_runtime_filename,$(if $(filter 
$(1),$(gb_MERGEDLIBS)),merged,$(1
 $(call gb_Library__get_final_target,$(1)) : \
$(call gb_ComponentTarget_get_outdir_target,$(2))
 $(call gb_ComponentTarget_get_target,$(2)) :| $(call 
gb_Library_get_target,$(1))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e4dbd46..e8f9bab 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -46,17 +46,6 @@ CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
 OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
 endif
 
-# if enabled we link all of these libraries into one larger, merged library
-# for which we can do a lot more optimisation, and which is faster to read
-# from disk.
-ifeq ($(MERGELIBS),TRUE)
-# list of libraries which are always loaded, thus we can merge them into one
-# they have to be from tail_build, so we could link against merged library
-gb_CORE_LIBS := \
-   uui \
-
-endif
-
 # Overview of dependencies and tasks of LinkTarget
 #
 # target  task depends on
@@ -357,8 +346,10 @@ mv $${TEMPFILE} $(call gb_LinkTarget_get_objects_list,$(2))
 
 endef
 
+# If object files from this library are merged, create just empty file
 $(call gb_LinkTarget_get_target,%) : $(call 
gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
-   $(call gb_LinkTarget__command,$@,$*)
+   $(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS),$(call 
gb_Library_get_linktargetname,$(lib, \
+   touch $@, $(call gb_LinkTarget__command,$@,$*))
$(call gb_LinkTarget__command_objectlist,$@,$*)
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -639,11 +630,9 @@ $$(eval $$(call gb_Output_info,currently known libraries 
are: $(sort $(gb_Librar
 $$(eval $$(call gb_Output_error,Cannot link against library/libraries 
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in 
Repository.mk))
 endif
 
-ifeq ($(MERGELIBS),TRUE)
-gb_LINKED_LIBS := $(if $(filter $(gb_CORE_LIBS),$(2)),merged $(filter-out 
$(gb_CORE_LIBS),$(2)),$(2))
-else
-gb_LINKED_LIBS := $(2)
-endif
+gb_LINKED_LIBS := $(if $(filter $(gb_MERGEDLIBS),$(2)), \
+   $(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call 

[Libreoffice-commits] .: extensions/Executable_nsplugin.mk extensions/Library_npsoplugin.mk

[Matus Kukan]

 extensions/Executable_nsplugin.mk |8 
 extensions/Library_npsoplugin.mk  |5 -
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 9af656af19eb465b3d45b43fb281ad541fa9b32c
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Jan 10 18:28:11 2012 +0100

pathutils-obj is in static library ooopathutils

diff --git a/extensions/Executable_nsplugin.mk 
b/extensions/Executable_nsplugin.mk
index 6bc58fb..383db00 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -56,14 +56,14 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
 ))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Executable_add_ldflags,nsplugin,\
-   $(OUTDIR)/lib/pathutils-obj.obj \
-))
-
 $(eval $(call gb_Executable_add_exception_objects,nsplugin,\
extensions/source/nsplugin/source/nsp_windows \
 ))
 
+$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\
+   ooopathutils \
+))
+
 $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
ws2_32 \
shell32 \
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index f542f59..1a30d13 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -59,10 +59,13 @@ endif # GUI=UNX
 ifeq ($(GUI),WNT)
 
 $(eval $(call gb_Library_add_ldflags,npsoplugin,\
-   $(OUTDIR)/lib/pathutils-obj.obj \
$(OUTDIR)/lib/npwin.obj \
 ))
 
+$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\
+   ooopathutils \
+))
+
 $(eval $(call gb_Library_add_linked_libs,npsoplugin,\
ws2_32 \
shell32 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/Library_pl.mk extensions/source

[Matus Kukan]

 extensions/Library_pl.mk |4 
 extensions/source/plugin/aqua/macmgr.cxx |  654 ---
 extensions/source/plugin/aqua/macmgr.mm  |  654 +++
 3 files changed, 655 insertions(+), 657 deletions(-)

New commits:
commit 29f897054d472746ce0cf59a39142ec5ec3114c1
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Jan 9 12:41:51 2012 +0100

extensions/Library_pl: move macmgr.cxx - macmgr.mm

diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index cf74ce8..b6a3700 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -93,10 +93,8 @@ ifeq ($(GUI),UNX)
 
 ifeq ($(GUIBASE),aqua)
 
-$(eval $(call gb_Library_add_exception_objects,pl,\
-   extensions/source/plugin/aqua/macmgr \
-))
 $(eval $(call gb_Library_add_objcxxobjects,pl,\
+   extensions/source/plugin/aqua/macmgr \
extensions/source/plugin/aqua/sysplug \
 ))
 
diff --git a/extensions/source/plugin/aqua/macmgr.cxx 
b/extensions/source/plugin/aqua/macmgr.cxx
deleted file mode 100644
index 3b69845..000
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ /dev/null
@@ -1,654 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * 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.
- *
- /
-
-#include rtl/ustrbuf.hxx
-#include rtl/strbuf.hxx
-
-#include plugin/impl.hxx
-#include osl/file.h
-#include osl/module.hxx
-
-using namespace std;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::plugin;
-
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OStringBuffer;
-using ::rtl::OUStringToOString;
-using ::rtl::OStringToOUString;
-
-namespace plugstringhelper
-{
-
-rtl::OUString getString( CFStringRef i_xString )
-{
-rtl::OUStringBuffer aBuf;
-if( i_xString )
-{
-CFIndex nChars = CFStringGetLength( i_xString );
-CFRange aRange = { 0, nChars };
-aBuf.setLength( nChars );
-CFStringGetCharacters( i_xString, aRange, static_cast UniChar* 
(const_castsal_Unicode*(aBuf.getStr())) );
-}
-return aBuf.makeStringAndClear();
-}
-
-rtl::OUString getString( CFURLRef i_xURL )
-{
-CFStringRef xString = CFURLGetString( i_xURL );
-return getString( xString );
-}
-
-CFMutableStringRef createString( const rtl::OUString i_rString )
-{
-CFMutableStringRef xString = CFStringCreateMutable( NULL, 0 );
-if( xString )
-CFStringAppendCharacters( xString, i_rString.getStr(), 
i_rString.getLength() );
-return xString;
-}
-
-CFURLRef createURL( const rtl::OUString i_rString )
-{
-
-CFMutableStringRef xMutableString = createString( i_rString );
-CFURLRef xURL = CFURLCreateWithString( NULL, xMutableString, NULL );
-CFRelease( xMutableString );
-return xURL;
-}
-
-rtl::OUString getURLFromPath( const rtl::OUString i_rPath )
-{
-CFMutableStringRef xMutableString = createString( i_rPath );
-CFURLRef xURL = CFURLCreateWithFileSystemPath( NULL, xMutableString, 
kCFURLPOSIXPathStyle, true );
-CFRelease( xMutableString );
-CFStringRef xString = CFURLGetString( xURL );
-rtl::OUString aRet = getString( xString );
-CFRelease( xURL );
-return aRet;
-}
-
-CFURLRef createURLFromPath( const rtl::OUString i_rPath )
-{
-CFMutableStringRef xMutableString = createString( i_rPath );
-CFURLRef xURL = CFURLCreateWithFileSystemPath( NULL, xMutableString, 
kCFURLPOSIXPathStyle, true );
-return xURL;
-}
-
-rtl::OUString CFURLtoOSLURL( CFURLRef i_xURL )
-{
-// make URL absolute
-CFURLRef xAbsURL = CFURLCopyAbsoluteURL( i_xURL );
-// copy system path
-CFStringRef xSysPath = CFURLCopyFileSystemPath( xAbsURL ? xAbsURL : 
i_xURL, kCFURLPOSIXPathStyle );
-if( xAbsURL )
-CFRelease( xAbsURL );
-rtl::OUString aSysPath( getString( xSysPath ) );
-CFRelease( 

[Libreoffice-commits] .: extensions/Executable_pluginapp.bin.mk

[Matus Kukan]

 extensions/Executable_pluginapp.bin.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c3fdb4973bae6a169f7b4f745f613320b18ea2b4
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Jan 7 12:54:16 2012 +0100

add gthread external here

diff --git a/extensions/Executable_pluginapp.bin.mk 
b/extensions/Executable_pluginapp.bin.mk
index 1c3b4fc..50b606c 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/extensions/Executable_pluginapp.bin.mk
@@ -85,7 +85,10 @@ endif
 
 
 ifeq ($(ENABLE_GTK),TRUE)
-$(eval $(call gb_Executable_use_external,pluginapp.bin,gtk))
+$(eval $(call gb_Executable_use_externals,pluginapp.bin,\
+gthread \
+gtk \
+))
 
 # the orignal dmakefile said: don't ask, it's ugly
 ifeq ($(OS),SOLARIS)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basegfx/CppunitTest_basegfx.mk basegfx/Executable_basegfx_cppunittester_all.mk basegfx/test unusedcode.easy

[Matus Kukan]

 basegfx/CppunitTest_basegfx.mk  |6 
 basegfx/Executable_basegfx_cppunittester_all.mk |1 
 basegfx/test/testtools.cxx  |  235 
 basegfx/test/testtools.hxx  |  101 --
 unusedcode.easy |4 
 5 files changed, 347 deletions(-)

New commits:
commit ef41022c112924b339b8c9a426b161d81aa8a947
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Jan 6 11:28:01 2012 +0100

unusedcode: remove Plotter

diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 2c3da08..3acabef 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -36,7 +36,6 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,basegfx_test, \
basegfx/test/basegfxtools \
basegfx/test/clipstate \
basegfx/test/genericclipper \
-   basegfx/test/testtools \
 ))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
@@ -47,11 +46,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,basegfx_test,\
-   $$(INCLUDE) \
-   -I$(OUTDIR)/inc/offuh \
-))
-
 $(eval $(call gb_CppunitTest_add_api,basegfx_test,\
 offapi \
 udkapi \
diff --git a/basegfx/Executable_basegfx_cppunittester_all.mk 
b/basegfx/Executable_basegfx_cppunittester_all.mk
index 0a6e80b..3c09e85 100644
--- a/basegfx/Executable_basegfx_cppunittester_all.mk
+++ b/basegfx/Executable_basegfx_cppunittester_all.mk
@@ -61,7 +61,6 @@ $(eval $(call 
gb_Executable_add_exception_objects,basegfx_cppunittester_all, \
basegfx/test/basegfxtools \
basegfx/test/clipstate \
basegfx/test/genericclipper \
-   basegfx/test/testtools \
 ))
 
 $(eval $(call gb_Executable_add_api,basegfx_cppunittester_all, \
diff --git a/basegfx/test/testtools.cxx b/basegfx/test/testtools.cxx
deleted file mode 100644
index f467c2d..000
--- a/basegfx/test/testtools.cxx
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * 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.
- *
- /
-
-#include testtools.hxx
-
-#include basegfx/point/b2dpoint.hxx
-#include basegfx/vector/b2dvector.hxx
-#include basegfx/range/b2drange.hxx
-#include basegfx/curve/b2dcubicbezier.hxx
-#include basegfx/polygon/b2dpolygon.hxx
-#include basegfx/polygon/b2dpolypolygon.hxx
-
-#include algorithm
-
-
-namespace basegfx
-{
-namespace testtools
-{
-Plotter::Plotter( ::std::ostream rOutputStream ) :
-mrOutputStream(rOutputStream),
-maPoints(),
-mbFirstElement( true )
-{
-// output gnuplot setup. We switch gnuplot to parametric
-// mode, therefore every plot has at least _two_
-// functions: one for the x and one for the y value, both
-// depending on t.
-mrOutputStream  #!/usr/bin/gnuplot -persist  ::std::endl
-#  ::std::endl
-# automatically generated by 
basegfx::testtools::Plotter, don't change!  ::std::endl
-#  ::std::endl
-set parametric  ::std::endl
-// This function plots a cubic bezier curve. P,q,r,s
-// are the control point elements of the corresponding
-// output coordinate component (i.e. x components for
-// the x plot, and y components for the y plot)
-cubicBezier(p,q,r,s,t) = 
p*(1-t)**3+q*3*(1-t)**2*t+r*3*(1-t)*t**2+s*t**3  ::std::endl
-
-// This function plots the derivative of a cubic
-// bezier curve. P,q,r,s are the control point
-// components of the _original_ curve
-

[Libreoffice-commits] .: extensions/Executable_nsplugin.mk

[Matus Kukan]

 extensions/Executable_nsplugin.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 259e51677bde56dbfc45e41b28ae3bdfd08a0e82
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Jan 6 23:34:35 2012 +0100

extensions: nsplugin: dl is for linux

diff --git a/extensions/Executable_nsplugin.mk 
b/extensions/Executable_nsplugin.mk
index e328a5c..6bc58fb 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
cppu \
cppuhelper \
sal \
-   $(if $(filter $(GUI),UNX), \
+   $(if $(filter $(OS),LINUX), \
dl \
) \
$(if $(filter $(OS),SOLARIS), \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/qa

[Matus Kukan]

 sal/qa/osl/mutex/osl_Mutex.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f823b7d39154d2044e08174a858f8ef357a151a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 5 17:32:21 2012 +0100

gcc-trunk: fix: unable to find string literal operator 'operator FOO'

diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 10a95c1..f4f34d6 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -754,7 +754,7 @@ namespace osl_ClearableGuard
 TimeValue aTimeVal_after;
 osl_getSystemTime( aTimeVal_after );
 sal_Int32 nSec = aTimeVal_after.Seconds - aTimeVal_befor.Seconds;
-printf(nSec is %SAL_PRIdINT32\n, nSec);
+printf(nSec is % SAL_PRIdINT32 \n, nSec);
 
 myThread.join();
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source svx/source

[Matus Kukan]

 framework/source/uielement/controlmenucontroller.cxx |4 ++--
 svx/source/form/fmshimp.cxx  |   12 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 5f2355014375adb66dd8e986068abc8429e0ad0d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Jan 4 21:58:46 2012 +0100

make these variables static

diff --git a/framework/source/uielement/controlmenucontroller.cxx 
b/framework/source/uielement/controlmenucontroller.cxx
index a946858..1f5e64e 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -115,7 +115,7 @@
 #define SID_FM_IMAGEBUTTON  (SID_FMSLOTS_START + 12)
 #define SID_FM_FILECONTROL  (SID_FMSLOTS_START + 13)
 
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
 {
 SID_FM_CONVERTTO_EDIT,
 SID_FM_CONVERTTO_BUTTON,
@@ -139,7 +139,7 @@ sal_Int16 nConvertSlots[] =
 SID_FM_CONVERTTO_SPINBUTTON
 };
 
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
 {
 SID_FM_EDIT,
 SID_FM_PUSHBUTTON,
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e261c21..04751bb 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -117,7 +117,7 @@
 #include vector
 
 // wird fuer Invalidate verwendet - mitpflegen
-sal_uInt16 DatabaseSlotMap[] =
+static sal_uInt16 DatabaseSlotMap[] =
 {
 SID_FM_RECORD_FIRST,
 SID_FM_RECORD_NEXT,
@@ -145,7 +145,7 @@ sal_uInt16 DatabaseSlotMap[] =
 
 // wird fuer Invalidate verwendet - mitpflegen
 // aufsteigend sortieren !!
-sal_Int16 DlgSlotMap[] =// slots des Controllers
+static sal_Int16 DlgSlotMap[] =// slots des Controllers
 {
 SID_FM_CTL_PROPERTIES,
 SID_FM_PROPERTIES,
@@ -161,7 +161,7 @@ sal_Int16 DlgSlotMap[] =// slots des Controllers
 0
 };
 
-sal_Int16 SelObjectSlotMap[] =  // vom SelObject abhaengige Slots
+static sal_Int16 SelObjectSlotMap[] =  // vom SelObject abhaengige Slots
 {
 SID_FM_CONVERTTO_EDIT,
 SID_FM_CONVERTTO_BUTTON,
@@ -192,7 +192,7 @@ sal_Int16 SelObjectSlotMap[] =  // vom SelObject abhaengige 
Slots
 
 // die folgenden Arrays muessen kosistent sein, also einander entsprechende 
Eintraege an der selben relativen Position
 // innerhalb ihres jeweiligen Arrays stehen
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
 {
 SID_FM_CONVERTTO_EDIT,
 SID_FM_CONVERTTO_BUTTON,
@@ -216,7 +216,7 @@ sal_Int16 nConvertSlots[] =
 SID_FM_CONVERTTO_NAVIGATIONBAR
 };
 
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
 {
 SID_FM_EDIT,
 SID_FM_PUSHBUTTON,
@@ -240,7 +240,7 @@ sal_Int16 nCreateSlots[] =
 SID_FM_NAVIGATIONBAR
 };
 
-sal_Int16 nObjectTypes[] =
+static sal_Int16 nObjectTypes[] =
 {
 OBJ_FM_EDIT,
 OBJ_FM_BUTTON,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sax/prj

[Matus Kukan]

 sax/prj/build.lst |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 4572e00ec358f507e64cbab9d9f3430ea6f97d51
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Jan 4 23:06:57 2012 +0100

sax: this had to be accidentally added when merging

diff --git a/sax/prj/build.lst b/sax/prj/build.lst
index 940ef70..34e520f 100644
--- a/sax/prj/build.lst
+++ b/sax/prj/build.lst
@@ -1,4 +1,2 @@
 ax sax :   offapi cppuhelper EXPAT:expat comphelper 
LIBXSLT:libxslt NULL
 ax sax\prj 
nmake   -   all ax_prj NULL
-
-ax  sax\test   nmake   -   
all ax_test NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Matus Kukan]

 solenv/gbuild/Rdb.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5436f578ee7c7e4fe840cb243c2797f52b8b461d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Jan 2 23:19:49 2012 +0100

gbuild: Rdb: blind fix for Windows, use gb_Helper_abbreviate_dirs_native

diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index c7f9d0d..bea289f 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -38,7 +38,7 @@ $(strip $(if $(call 
gb_Rdb__is_old_component_target,$(component))\
 endef
 
 define gb_Rdb__command
-$(call gb_Helper_abbreviate_dirs,\
+$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $@)  \
(\
echo 'list'  \
@@ -56,7 +56,7 @@ $(call gb_Rdb_get_target,%) :
 .PHONY : $(call gb_Rdb_get_clean_target,%)
 $(call gb_Rdb_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RDB,1)
-   $(call gb_Helper_abbreviate_dirs,\
+   $(call gb_Helper_abbreviate_dirs_native,\
rm -f $(call gb_Rdb_get_outdir_target,$*) $(call 
gb_Rdb_get_target,$*))
 
 $(call gb_Rdb_get_outdir_target,%) :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Library_spl.mk

[Matus Kukan]

 desktop/Library_spl.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5cc45ed66d44aec84dcaf3f3cd58a4fb26efe4ba
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Dec 28 21:53:31 2011 +0100

desktop: spl: do not pointlessly include object file

diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index be7de6d..69f96b2 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Library_add_linked_libs,spl,\
 $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl))
 
 $(eval $(call gb_Library_add_exception_objects,spl,\
-desktop/source/migration/migration \
 desktop/source/splash/services_spl \
 desktop/source/splash/splash \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: fpicker/source

[Matus Kukan]

 fpicker/source/aqua/CFStringUtilities.hxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 693f266d810904945950fa72251df9c35bd6d9aa
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Dec 27 13:36:45 2011 +0100

WaE: unused variables

diff --git a/fpicker/source/aqua/CFStringUtilities.hxx 
b/fpicker/source/aqua/CFStringUtilities.hxx
index 578782b..6974899 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -71,6 +71,8 @@ inline void DBG_PRINT_ENTRY(const char * classname, const 
char * methodname, con
 OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
 #if OSL_DEBUG_LEVEL  1
 CFShow(value1);
+#else
+(void)value1;
 #endif
 }
 
@@ -78,6 +80,8 @@ inline void DBG_PRINT_ENTRY(const char * classname, const 
char * methodname, con
 OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
 #if OSL_DEBUG_LEVEL  1
 NSLog(value1);
+#else
+(void)value1;
 #endif
 }
 
@@ -145,6 +149,8 @@ inline void DBG_PRINT_EXIT(const char * classname, const 
char * methodname, cons
 OSL_TRACE( %s::%s%sreturnValue = , classname, methodname, 
PARAMFILLER);
 #if OSL_DEBUG_LEVEL  1
 CFShow(retVal);
+#else
+(void)retVal;
 #endif
 }
 
@@ -152,6 +158,8 @@ inline void DBG_PRINT_EXIT(const char * classname, const 
char * methodname, cons
 OSL_TRACE( %s::%s%sreturnValue = , classname, methodname, 
PARAMFILLER);
 #if OSL_DEBUG_LEVEL  1
 NSLog(retVal);
+#else
+(void)retVal;
 #endif
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_cppuhelper' - scp2/source

[Matus Kukan]

 scp2/source/ooo/ure.scp |4 
 1 file changed, 4 deletions(-)

New commits:
commit 9275d6abf6e76a02d5c45d4a1da070a524263493
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Dec 26 14:19:08 2011 +0100

scp2: cppuhelper is now gbuild'ified

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 09d27aa..aece726 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -191,11 +191,7 @@ End
 File gid_File_Dl_Cppuhelper
 LIB_FILE_BODY;
 Dir = SCP2_URE_DL_DIR;
-#if defined WNT  !defined _MSC // Hack for not gbuild'ified cppuhelper on 
MinGW:
-Name = uno_cppuhelpergcc33.dll
-#else
 Name = SCP2_URE_DL_UNO_COMID_VER(cppuhelper, 3);
-#endif
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 // CompID = D2A191E6-2023-41F5-9032-B98C50C37964;
 End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryExternal.mk

[Matus Kukan]

 RepositoryExternal.mk |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 472a7db1ef118147d949b13c66bb86411dbc7a75
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Dec 27 00:16:36 2011 +0100

register hunspell as static library

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6b9ebc0..ac2a95b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -192,6 +192,10 @@ endef
 
 else # !SYSTEM_HUNSPELL
 
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+   $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \
+))
+
 define gb_LinkTarget__use_hunspell
 $(call gb_LinkTarget_add_defs,$(1),\
-DHUNSPELL_STATIC \
@@ -200,8 +204,8 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-I$(OUTDIR)/inc/hunspell \
 )
-$(call gb_LinkTarget_add_libs,$(1),\
-   $(if $(filter WNT,$(OS)),libhunspell.lib,-lhunspell-1.3) \
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+   $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \
 )
 
 endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryExternal.mk RepositoryFixes.mk

[Matus Kukan]

 RepositoryExternal.mk |4 ++--
 RepositoryFixes.mk|2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4258f0260d6e99edf5db44720b85db9f1d78ca91
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Dec 23 13:26:56 2011 +0100

Repository: fix Windows name for internal libexttextcat

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 11896cd..6b9ebc0 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -224,7 +224,7 @@ else # !SYSTEM_LIBEXTTEXTCAT
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-   exttextcat \
+   libexttextcat \
 ))
 else
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
@@ -235,7 +235,7 @@ endif
 define gb_LinkTarget__use_libexttextcat
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-   exttextcat \
+   libexttextcat \
 )
 else
 $(call gb_LinkTarget_add_linked_static_libs,$(1),\
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index ff1eb34..cb80f45 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -56,7 +56,6 @@ gb_Library_DLLFILENAMES := $(patsubst 
ucpfile:libucpfile%,ucpfile:libucpfile1%,$
 gb_Library_DLLFILENAMES := $(patsubst 
unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
-gb_Library_FILENAMES := $(patsubst 
exttextcat:libexttextcat%,exttextcat:libilibexttextcat%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
@@ -68,6 +67,7 @@ gb_StaticLibrary_FILENAMES := $(patsubst 
graphite:graphite%,graphite:graphite_dl
 ifeq ($(COM),GCC)
 gb_Library_FILENAMES := $(patsubst 
crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst 
libexttextcat:liblibext%,libexttextcat:libilibext%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - 3 commits - extensions/inc extensions/Library_updchk.mk extensions/source extensions/util sal/systools solenv/gbuild

[Matus Kukan]

 extensions/Library_updchk.mk |5 
 extensions/inc/appsettings.hxx   |   45 -
 extensions/source/unoactivex/main/initwindowpeer.cxx |   87 ---
 extensions/source/update/check/onlinecheck.cxx   |   69 +++
 extensions/source/update/check/updatecheck.cxx   |   33 -
 extensions/util/hidother.src |  428 ---
 sal/systools/win32/onlineupdate/makefile.mk  |   78 ---
 sal/systools/win32/onlineupdate/onlinecheck.cxx  |   69 ---
 sal/systools/win32/onlineupdate/onlinecheck.dxp  |   28 -
 solenv/gbuild/platform/WNT_INTEL_GCC.mk  |1 
 solenv/gbuild/platform/WNT_INTEL_MSC.mk  |1 
 11 files changed, 81 insertions(+), 763 deletions(-)

New commits:
commit ba507c41ba991b72da34da58b6a5d61bc1a7822e
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Dec 21 13:22:52 2011 +0100

gbuild: WNT: register wininet library

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index e8fe616..ac7e4be 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -284,6 +284,7 @@ gb_Library_PLAINLIBS_NONE += \
uwinapi \
winmm \
version \
+   wininet \
winspool \
ws2_32 \
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index de562a7..638aade 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -424,6 +424,7 @@ gb_Library_PLAINLIBS_NONE += \
uuid \
uwinapi \
version \
+   wininet \
winmm \
winspool \
ws2_32 \
commit 6c6055750dd4c0ddcff06fcf5b6d93d576245633
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Dec 19 16:37:06 2011 +0100

move onlinecheck.cxx from sal to extensions

diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index a16f2a2..c5286de 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -51,6 +51,11 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,updchk,\
ole32 \
shell32 \
+   wininet \
+))
+
+$(eval $(call gb_Library_add_exception_objects,updchk,\
+   extensions/source/update/check/onlinecheck \
 ))
 endif # OS WNT
 
diff --git a/extensions/source/update/check/onlinecheck.cxx 
b/extensions/source/update/check/onlinecheck.cxx
new file mode 100644
index 000..0a76539
--- /dev/null
+++ b/extensions/source/update/check/onlinecheck.cxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * 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.
+ *
+ /
+
+#ifdef _MSC_VER
+#pragma warning( disable: 4668 )
+#endif
+
+#include sal/types.h
+#include sal/macros.h
+
+#define WIN32_LEAN_AND_MEAN
+#include windows.h
+#include wininet.h
+
+#ifdef UNICODE
+#define _UNICODE
+#endif
+#include tchar.h
+
+// #i71984
+extern C bool SAL_CALL WNT_hasInternetConnection()
+{
+DWORD   dwFlags;
+TCHAR   szConnectionName[1024];
+
+#ifndef __MINGW32__
+__try {
+#endif
+BOOL fIsConnected = InternetGetConnectedStateEx(
+dwFlags,
+szConnectionName,
+SAL_N_ELEMENTS(szConnectionName),
+0 );
+
+return fIsConnected ? true : false;
+
+#ifndef __MINGW32__
+} __except( EXCEPTION_EXECUTE_HANDLER ) {
+return false;
+}
+#endif
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/updatecheck.cxx 
b/extensions/source/update/check/updatecheck.cxx
index 66acb88..d0b204a 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -85,6 +85,7 @@ namespace uno = com::sun::star::uno ;
 #define PROPERTY_DEFAULT_TEXT   UNISTRING(DefaultText)
 #define 

[Libreoffice-commits] .: sal/Library_sal.mk solenv/gbuild

[Matus Kukan]

 sal/Library_sal.mk   |4 +++-
 solenv/gbuild/platform/macosx.mk |1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 683e471f3559b3dc40dc697576baf0be9612b1fc
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Dec 21 15:26:55 2011 +0100

gbuild, sal: dl is linux only

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 93bc646..6f940db 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -56,10 +56,12 @@ $(eval $(call gb_Library_add_defs,sal,\
 $(eval $(call gb_Library_add_linked_libs,sal,\
$(if $(filter $(GUI),UNX), \
$(if $(filter $(OS),ANDROID),, \
-   dl \
pthread \
) \
) \
+   $(if $(filter $(OS),LINUX), \
+   dl \
+   ) \
$(if $(filter $(OS),SOLARIS), \
nsl \
socket \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f7f3440..ef82a82 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -265,7 +265,6 @@ gb_Library_PLAINLIBS_NONE += \
Cocoa \
objc \
OpenGL \
-   dl \
m \
pthread \
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - 15 commits - basctl/AllLangResTarget_basctl.mk Module_tail_build.mk postprocess/prj reportdesign/AllLangResTarget_rpt.mk reportdesign/AllL

[Matus Kukan]

 Module_tail_build.mk |   12 
 basctl/AllLangResTarget_basctl.mk|2 ++
 postprocess/prj/build.lst|2 +-
 reportdesign/AllLangResTarget_rpt.mk |2 ++
 reportdesign/AllLangResTarget_rptui.mk   |2 ++
 reportdesign/source/ui/dlg/CondFormat.cxx|3 ---
 reportdesign/source/ui/dlg/DateTime.cxx  |2 --
 reportdesign/source/ui/dlg/GroupsSorting.cxx |6 +-
 reportdesign/source/ui/dlg/Navigator.cxx |2 --
 reportdesign/source/ui/dlg/PageNumber.cxx|2 --
 sc/AllLangResTarget_sc.mk|2 ++
 sd/AllLangResTarget_sd.mk|2 ++
 starmath/AllLangResTarget_sm.mk  |2 ++
 svx/AllLangResTarget_svx.mk  |   20 
 sw/AllLangResTarget_sw.mk|2 ++
 tail_build/prj/build.lst |2 +-
 16 files changed, 41 insertions(+), 24 deletions(-)

New commits:
commit a029a486868d936d5d4609f6c5b9875406f83536
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Dec 20 20:01:23 2011 +0100

add basic to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ef026fd..764b9fc 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 animations \
 avmedia \
 basctl \
+basic \
 bean \
 canvas \
 chart2 \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 5c4e3b8..87ca96d 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell 
HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr 
LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt 
LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve 
MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python 
REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain 
XPDF:xpdf ZLIB:zlib basegfx basic bridges comphelper connectivity cppu 
cppuhelper DESKTOP:fpicker framework javaunohelper jurt jvmaccess jvmfwk np_sdk 
offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino 
ridljar sal sax shell solenv soltools sot stoc svl svtools sysui test toolkit 
tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
+tb  tail_build : APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell 
HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr 
LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt 
LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve 
MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python 
REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain 
XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper 
DESKTOP:fpicker framework javaunohelper jurt jvmaccess jvmfwk np_sdk offapi 
officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal 
salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit 
tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 032df7e9bfafeb93925959626b793cec17a4
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Dec 20 19:38:30 2011 +0100

gbuild: these targets depend on svx/globlmn.hrc

diff --git a/basctl/AllLangResTarget_basctl.mk 
b/basctl/AllLangResTarget_basctl.mk
index 1611f9a..7e588d1 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -54,4 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\
basctl/source/dlged/managelang.src \
 ))
 
+$(call gb_SrsTarget_get_target,basctl/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/AllLangResTarget_rpt.mk 
b/reportdesign/AllLangResTarget_rpt.mk
index 55aeeb0..76baa19 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -45,4 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
 reportdesign/source/core/resource/strings.src \
 ))
 
+$(call gb_SrsTarget_get_target,reportdesign/res) :| 
$(OUTDIR)/inc/svx/globlmn.hrc
+
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/AllLangResTarget_rptui.mk 
b/reportdesign/AllLangResTarget_rptui.mk
index c41b5b8..23edf34 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -54,4 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\
reportdesign/source/ui/report/report.src \
 ))
 
+$(call gb_SrsTarget_get_target,reportdesign/rptui) :| 
$(OUTDIR)/inc/svx/globlmn.hrc
+
 # vim: set noet sw=4 ts=4:
diff --git 

[Libreoffice-commits] .: svx/inc svx/Library_svxcore.mk svx/Package_inc.mk svx/source unusedcode.easy

[Matus Kukan]

 svx/Library_svxcore.mk   |1 
 svx/Package_inc.mk   |1 
 svx/inc/svx/sdrcomment.hxx   |  108 ---
 svx/inc/svx/svdpage.hxx  |9 ---
 svx/source/svdraw/sdrcomment.cxx |   99 ---
 unusedcode.easy  |5 -
 6 files changed, 223 deletions(-)

New commits:
commit 9148757cc823efa0ac6dfe0a9a825bae47cb31fa
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Dec 20 22:23:33 2011 +0100

callcather: remove sdr::Comment

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index f7b3be7..508622f 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -305,7 +305,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
 svx/source/svdraw/clonelist \
 svx/source/svdraw/gradtrns \
 svx/source/svdraw/polypolygoneditor \
-svx/source/svdraw/sdrcomment \
 svx/source/svdraw/sdrhittesthelper \
 svx/source/svdraw/sdrmasterpagedescriptor \
 svx/source/svdraw/sdrpagewindow \
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 60b576a..bd07e7b 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -378,7 +378,6 @@ $(eval $(call 
gb_Package_add_file,svx_inc,inc/svx/svdfield.hxx,svx/svdfield.hxx)
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/relfld.hxx,svx/relfld.hxx))
 $(eval $(call 
gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeInfo.hxx,svx/AccessibleShapeInfo.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/numvset.hxx,svx/numvset.hxx))
-$(eval $(call 
gb_Package_add_file,svx_inc,inc/svx/sdrcomment.hxx,svx/sdrcomment.hxx))
 $(eval $(call 
gb_Package_add_file,svx_inc,inc/svx/txenctab.hxx,svx/txenctab.hxx))
 $(eval $(call 
gb_Package_add_file,svx_inc,inc/svx/svdorect.hxx,svx/svdorect.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshit.hxx,svx/xftshit.hxx))
diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx
deleted file mode 100644
index f89e9ac..000
--- a/svx/inc/svx/sdrcomment.hxx
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * 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.
- *
- /
-
-#ifndef _SDR_COMMENT_HXX
-#define _SDR_COMMENT_HXX
-
-#include sal/types.h
-#include tools/date.hxx
-#include rtl/ustring.hxx
-#include basegfx/point/b2dpoint.hxx
-
-#include vector
-
-//
-// predeclarations
-
-//
-
-namespace sdr
-{
-class Comment
-{
-// counting ID
-sal_uInt32  mnID;
-
-// creation date
-DatemaCreationDate;
-
-// name of creator
-::rtl::OUString maUserName;
-
-// text content
-::rtl::OUString maText;
-
-// position
-basegfx::B2DPoint   maPosition;
-
-public:
-Comment(
-sal_uInt32 nID,
-Date aCreationDate,
-const ::rtl::OUString rUserName,
-const ::rtl::OUString rText,
-const basegfx::B2DPoint rPosition);
-~Comment();
-
-// operator for sorting the vector by mnID
-sal_Bool operator(const Comment rCandidate) const { return (mnID  
rCandidate.mnID); }
-
-// comparison operators
-sal_Bool operator==(const Comment rCandidate) const;
-sal_Bool operator!=(const Comment rCandidate) const { return 
!(operator==(rCandidate)); }
-
-// access to ID, read only
-sal_uInt32 GetID() const { return mnID; }
-
-// access to CreationDate
-Date GetCreationDate() const { return maCreationDate; }

[Libreoffice-commits] .: sal/rtl

[Matus Kukan]

 sal/rtl/source/alloc_impl.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ec64e5e36db7d9bf7c9f6fe2705c11dc54548fb7
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Dec 19 12:09:48 2011 +0100

WaE: GCC 4.5.1 does not allow #pragma GCC diagnostic warning

diff --git a/sal/rtl/source/alloc_impl.hxx b/sal/rtl/source/alloc_impl.hxx
index 2e51abe..4452f19 100644
--- a/sal/rtl/source/alloc_impl.hxx
+++ b/sal/rtl/source/alloc_impl.hxx
@@ -260,7 +260,7 @@ typedef CRITICAL_SECTION rtl_memory_lock_type;
 #define GCC_VERSION (__GNUC__ * 1 \
  + __GNUC_MINOR__ * 100 \
  + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION = 40201  !defined __clang__
+#if GCC_VERSION = 40600  !defined __clang__
 #pragma GCC diagnostic warning -Wunused-but-set-variable
 #endif
 #define RTL_VALGRIND_IGNORE_VAL (void)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild' - 0 commits -

[Matus Kukan]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/gbuild_cppuhelper'

[Matus Kukan]

New branch 'feature/gbuild_cppuhelper' available with the following commits:
commit 47019a6e70d41df5da057266a326eb1853d35385
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Aug 23 15:03:09 2011 +0200

cppuhelper: convert to gbuild

missing subsequent test qa/propertysetmixin/makefile.mk

commit e7c593b0959bd5d650d1ebe971e426c521c4f4ae
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Aug 23 14:47:42 2011 +0200

cppuhelper: add visibility symbols as first step for porting to gbuild

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/pf_extensions' - 0 commits -

[Matus Kukan]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - 2 commits - extensions/Executable_nsplugin.mk solenv/gbuild

[Matus Kukan]

 extensions/Executable_nsplugin.mk   |   24 +---
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 +
 2 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 4ee82ce8aeb36673301b631e94f80f725eecc362
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Dec 19 20:58:22 2011 +0100

extensions: nsplugin: tweak linked libraries

diff --git a/extensions/Executable_nsplugin.mk 
b/extensions/Executable_nsplugin.mk
index 6b97d46..49b8761 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
@@ -46,21 +46,15 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
cppu \
cppuhelper \
sal \
+   $(if $(filter $(GUI),UNX), \
+   dl \
+   ) \
+   $(if $(filter $(OS),SOLARIS), \
+   nsl \
+   socket \
+   ) \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,nsplugin,\
-   dl \
-))
-endif
-
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Executable_add_libs,nsplugin,\
-   -lsocket \
-   -lnsl \
-))
-endif
-
 ifeq ($(GUI),WNT)
 $(eval $(call gb_Executable_add_ldflags,nsplugin,\
$(OUTDIR)/lib/pathutils-obj.obj \
@@ -85,4 +79,4 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
 ))
 endif # WNT
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set noet sw=4 ts=4:
commit a705718a7d95c8e1abc22fcc57ddb84e5b18aa0a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Dec 19 20:52:02 2011 +0100

gbuild: register ws2_32 also for MSVC

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 1e068ff..de562a7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -426,6 +426,7 @@ gb_Library_PLAINLIBS_NONE += \
version \
winmm \
winspool \
+   ws2_32 \
 
 gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Matus Kukan]

 sw/source/ui/inc/optpage.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit be45ae39c4712da0079b26fe856a71c608909db5
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Dec 19 22:39:50 2011 +0100

fix build: we now use SwTestTabPage also with disabled dbgutil

diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 3824419..a2ebae6 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -361,8 +361,6 @@ public:
  TabPage test settings for SW
 - */
 
-#ifdef DBG_UTIL
-
 class SwTestTabPage : public SfxTabPage
 {
 public:
@@ -394,7 +392,6 @@ private:
 DECL_LINK( AutoClickHdl, CheckBox * );
 
 };
-#endif // DBG_UTIL
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Matus Kukan]

 sw/source/ui/config/optpage.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 7f56bfc31ce5ca2e7fa1678de2c924b8107967c5
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Dec 20 00:57:42 2011 +0100

remove one more ifdef for SwTestTabPage

But shouldn't this stay as it was before
d330111ec383542ad8955d78a64f4ed4b095b683
in sw/source/ui/dialog/swdlgfact.cxx:1648 ?

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index c8be2e2..ecf345a 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1729,8 +1729,6 @@ void 
SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow rExampleWin)
 }
 
 
-#ifdef DBG_UTIL
-
 void lcl_SetPosSize(Window rWin, Point aPos, Size aSize)
 {
 aPos = rWin.LogicToPixel(aPos, MAP_APPFONT);
@@ -1863,8 +1861,6 @@ IMPL_LINK_INLINE_START( SwTestTabPage, AutoClickHdl, 
CheckBox *, EMPTYARG )
 return 0;
 }
 IMPL_LINK_INLINE_END( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG )
-#endif
-
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/head/feature/gbuild'

[Matus Kukan]

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'refs/head/feature/gbuild' - 0 commits -

[Matus Kukan]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild' - 0 commits -

[Matus Kukan]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/gbuild'

[Matus Kukan]

New branch 'feature/gbuild' available with the following commits:
commit df889b0a3f8d555be218723e8420e14b0af4481b
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:43:20 2011 -0500

add idl to tail_build

commit 12771b1257627e687c2801b3c7d4a506bce97c7a
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:40:01 2011 -0500

add dtrans to tail_build

commit bffad422f9060973c73b4c455f27a3e58b973c6a
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:36:35 2011 -0500

add xmloff to tail_build

commit c01d7eeed3457e32cc2cada3df95a8c2e0a3076f
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:28:25 2011 -0500

add editeng to tail_build

commit 2b81f014536c30239cca20ed6c5858de74044bda
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:26:42 2011 -0500

add canvas to tail_build

commit 541da5f4ef658588821332976df3fa17740021ff
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:21:39 2011 -0500

add scaddins to tail_build

commit b53b3cc710d7d22bc47e8ab5bc02737522cabb49
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:18:06 2011 -0500

add cppcanvas to tail_build

commit 8a507ba076db0bfa4781c12edd9bfd89b9dcb66c
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:15:07 2011 -0500

add sfx2 to tail_build

commit 635ec95713cf878a2c0d0822f1b0bd8ec889a636
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:09:19 2011 -0500

add avmedia to tail_build

commit c66a882a02cb26c6696c549a78382ee1cae4a27f
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 16:53:06 2011 -0500

add drawinglayer to tail_build

commit 7c37eadd4f3a3d5e400a48851010378f8338ce11
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 16:49:28 2011 -0500

add svx to tail_build

commit d645f2ada6d859ca50df3fb7c67854da88d084f1
Author: Peter Foley pefol...@verizon.net
Date:   Mon Oct 10 00:39:06 2011 +

convert extensions to gbuild and add to tail_build

commit 9b974c031b754d8fc46541408b4ce61d59bef34e
Merge: f85fb6272fa1fd2d7c7820104a864ae01978e7d2 
05e787fb5e32880ff51902137cfd8da9820cd870
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 16:35:17 2011 -0500

Merge branch 'master' into feature/gbuild

commit f85fb6272fa1fd2d7c7820104a864ae01978e7d2
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:18:58 2011 +0100

sal: add more unit tests

commit 9464e225225fbc01df914fc25f9364e79957ad03
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:22:02 2011 +0100

sal: add visibility symbols

commit 006649cc2790b98e6f4d9f65be3d97fcdad0c5b6
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:13:11 2011 +0100

sal: convert to gbuild

commit 0ff2a6697863f110fcf08d88f9914009d737bcaf
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 16:46:22 2011 +0100

cppu: add visibility symbols

commit 05c20d7f582309e495f8e403060a38130d27ed45
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:55:08 2011 +0100

cppu: convert to gbuild

There are missing unit tests

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild' - 0 commits -

[Matus Kukan]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/gbuild'

[Matus Kukan]

New branch 'feature/gbuild' available with the following commits:
commit 015dad0d748a1cec188e7ae2651b219206107d93
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:18:58 2011 +0100

sal: add more unit tests

commit 288064cdc28f768e32a07d420e174763d0c20a64
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:22:02 2011 +0100

sal: add visibility symbols

commit c9685afcb0c7305b8d05f64a2de1a84dab08fc7f
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:13:11 2011 +0100

sal: convert to gbuild

commit e20ac2ea129257490ef1d0c8355e376bc6bf0ef2
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Dec 18 04:56:57 2011 +0100

cppu: add visibility symbols

commit be07ffba7b5a59f045b99f672d690f36792b2424
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:55:08 2011 +0100

cppu: convert to gbuild

Because of unit tests is here custom target where are idl files
processed.

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svtools/source

[Matus Kukan]

 svtools/source/graphic/graphic.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3744cd818383fd954125a6567856e92198792cf1
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:29:50 2011 +0100

gcc-trunk: avoid confusion

diff --git a/svtools/source/graphic/graphic.hxx 
b/svtools/source/graphic/graphic.hxx
index 7b4f5e0..a1efca0 100644
--- a/svtools/source/graphic/graphic.hxx
+++ b/svtools/source/graphic/graphic.hxx
@@ -58,7 +58,7 @@ public:
 Graphic();
 ~Graphic() throw();
 
-using unographic::GraphicDescriptor::init;
+using ::unographic::GraphicDescriptor::init;
 void init( const ::Graphic rGraphic ) throw();
 
 static const ::Graphic* getImplementation( const 
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface  rxIFace 
) throw();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild' - 0 commits -

[Matus Kukan]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/gbuild'

[Matus Kukan]

New branch 'feature/gbuild' available with the following commits:
commit f85fb6272fa1fd2d7c7820104a864ae01978e7d2
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:18:58 2011 +0100

sal: add more unit tests

commit 9464e225225fbc01df914fc25f9364e79957ad03
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:22:02 2011 +0100

sal: add visibility symbols

commit 006649cc2790b98e6f4d9f65be3d97fcdad0c5b6
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:13:11 2011 +0100

sal: convert to gbuild

commit 0ff2a6697863f110fcf08d88f9914009d737bcaf
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 16:46:22 2011 +0100

cppu: add visibility symbols

commit 05c20d7f582309e495f8e403060a38130d27ed45
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:55:08 2011 +0100

cppu: convert to gbuild

There are missing unit tests

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/pf_extensions'

[Matus Kukan]

New branch 'feature/pf_extensions' available with the following commits:
commit bce6369809b34ca579b8587b10c8992f1f4556af
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:43:20 2011 -0500

add idl to tail_build

commit 51bd9c68f65ada55865839582250747c121cc701
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:40:01 2011 -0500

add dtrans to tail_build

commit 8bb52eb018a940b4aa190ab5c8849a75d940facb
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:36:35 2011 -0500

add xmloff to tail_build

commit 2d107d13dd696d67c6d423dc3e1676d7fa833319
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:28:25 2011 -0500

add editeng to tail_build

commit 1a3bed66706b8737b2d6f6d1852e434e6f1bc28d
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:26:42 2011 -0500

add canvas to tail_build

commit 46dfd1fa94e643e899a67b71598724a1689e66e2
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:21:39 2011 -0500

add scaddins to tail_build

commit 40b7fdc9819d880a268a70e0454ddb8421969efa
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:18:06 2011 -0500

add cppcanvas to tail_build

commit 1ed556762e29c589eb3287d3552978ebc9ba2b1b
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:15:07 2011 -0500

add sfx2 to tail_build

commit eb27d8d430bc548ad9f298954101ee8ad567fc2d
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:09:19 2011 -0500

add avmedia to tail_build

commit e628947b98e2406bc8178ceb26eaefda85e15b90
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 16:53:06 2011 -0500

add drawinglayer to tail_build

commit 1bee8042851e8c3bc04bc66f028050889516ced5
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 16:49:28 2011 -0500

add svx to tail_build

commit 65345b23fbe72c73ae92cbefbf988868339f4b7d
Author: Peter Foley pefol...@verizon.net
Date:   Mon Oct 10 00:39:06 2011 +

convert extensions to gbuild and add to tail_build

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits