[Libreoffice-commits] .: 3 commits - RepositoryModule_ooo.mk cui/source solenv/gbuild

[Michael Stahl]

 RepositoryModule_ooo.mk             |    1 +
 cui/source/dialogs/winpluginlib.cxx |    2 +-
 solenv/gbuild/Executable.mk         |    4 ++++
 solenv/gbuild/Helper.mk             |    1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 5a0ab1a45858f4f7336f6dbdc218502cc31f0168
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 10 17:50:47 2012 +0100

    gbuild: Executable.mk: don't build unregistered exes

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 7858967..2c5d9ea 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -43,6 +43,10 @@ $(call gb_Executable_get_target,%) :
 			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
 
 define gb_Executable_Executable
+ifeq (,$$(findstring $(1),$$(gb_Executable_KNOWN)))
+$$(eval $$(call gb_Output_info,Currently known executables: $(sort $(gb_Executable_KNOWN)),ALL))
+$$(eval $$(call gb_Output_error,Executable $(1) must be registered in Repository.mk))
+endif
 $(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
 
 endef
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index e27d2ee..84e6cd9 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -116,6 +116,7 @@ endef
 define gb_Helper_collect_knownlibs
 gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
 gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
+gb_Executable_KNOWN := $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(gb_Executable_$$(group)))
 
 endef
 
commit 7608feeb7b490915c85ef75db33acdb8baef0c23
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 10 15:25:38 2012 +0100

    RepositoryModule_ooo.mk: add cppuhelper

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index f89b393..58cbaff 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     configmgr \
     cppcanvas \
     cppu \
+    cppuhelper \
     cui \
     dbaccess \
     desktop \
commit f6260b19dbed41e573209d598fee1d78f906eec4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 10 14:16:00 2012 +0100

    cui: remove unused macro for renamed library

diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx
index 25fa4a3..237e33b 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -38,7 +38,7 @@
 #include <stdio.h>
 
 #define SO_PATH_SIZE        4096
-#define MOZ_PLUGIN_DLL_NAME "npsopluginmi.dll"
+
 extern "C" {
 int lc_isInstalled(const  char* realFilePath)
 {