[Libreoffice-commits] .: 4 commits - basic/source filter/Configuration_filter.mk filter/Module_filter.mk solenv/gbuild

[Tor Lillqvist]

 basic/source/app/app.cxx       |    2 ++
 filter/Configuration_filter.mk |   14 +++++++-------
 filter/Module_filter.mk        |    9 +++++++--
 solenv/gbuild/gbuild.mk        |    2 --
 4 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 76ecc8f15c1280977b9ec0dc8dcba27624219826
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Sep 16 11:41:11 2011 +0300

    Don't do the Jar thingies if we don't want to use Java

diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 1a8240a..3fbb5e8 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -26,8 +26,6 @@ $(eval $(call gb_Module_add_targets,filter,\
 	AllLangResTarget_t602filter \
 	AllLangResTarget_xsltdlg \
 	Configuration_filter \
-	Jar_XSLTFilter \
-	Jar_XSLTValidate \
 	Library_PptImporter \
 	Library_egi \
 	Library_eme \
@@ -70,6 +68,13 @@ $(eval $(call gb_Module_add_targets,filter,\
 	Package_xslt \
 ))
 
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,filter,\
+	Jar_XSLTFilter \
+	Jar_XSLTValidate \
+))
+endif
+
 # TODO
 #$(eval $(call gb_Module_add_subsequentcheck_targets,filter,\
 	JunitTest_filter_complex \
commit a3ffd3e55ae1b6292f7694b6d6d2af4427c4e37a
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Sep 16 11:40:06 2011 +0300

    Use gb_Helper_abbreviate_dirs_native instead of gb_Helper_abbreviate_dirs

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 4224b15..cce0159 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -46,7 +46,7 @@ filter_XcuFilterTypesTarget_get_clean_target = \
 
 $(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
 	$(call gb_Output_announce,$*,$(true),XCU,1)
-	$(call gb_Helper_abbreviate_dirs,\
+	$(call gb_Helper_abbreviate_dirs_native,\
 		mkdir -p $(dir $@) && \
 		RESPONSEFILE=`$(gb_MKTEMP)` && \
 		echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
@@ -60,7 +60,7 @@ $(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
 
 $(call filter_XcuFilterTypesTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),XCU,1)
-	$(call gb_Helper_abbreviate_dirs,\
+	$(call gb_Helper_abbreviate_dirs_native,\
 		rm -f $(call filter_XcuFilterTypesTarget_get_target,$*) \
 			  $(call gb_XcuModuleTarget_get_outdir_target,$*))
 
@@ -93,7 +93,7 @@ filter_XcuFilterFiltersTarget_get_clean_target = \
 
 $(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET)
 	$(call gb_Output_announce,$*,$(true),XCU,1)
-	$(call gb_Helper_abbreviate_dirs,\
+	$(call gb_Helper_abbreviate_dirs_native,\
 		mkdir -p $(dir $@) && \
 		RESPONSEFILE=`$(gb_MKTEMP)` && \
 		echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
@@ -126,7 +126,7 @@ filter_XcuFilterOthersTarget_get_clean_target = \
 
 $(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET)
 	$(call gb_Output_announce,$*,$(true),XCU,1)
-	$(call gb_Helper_abbreviate_dirs,\
+	$(call gb_Helper_abbreviate_dirs_native,\
 		mkdir -p $(dir $@) && \
 		RESPONSEFILE=`$(gb_MKTEMP)` && \
 		RESPONSEFILE2=`$(gb_MKTEMP)` && \
@@ -164,7 +164,7 @@ filter_XcuFilterInternalTarget_get_clean_target = \
 
 $(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET)
 	$(call gb_Output_announce,$*,$(true),XCU,1)
-	$(call gb_Helper_abbreviate_dirs,\
+	$(call gb_Helper_abbreviate_dirs_native,\
 		mkdir -p $(dir $@) && \
 		RESPONSEFILE=`$(gb_MKTEMP)` && \
 		echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
@@ -210,7 +210,7 @@ filter_XcuResTarget_get_target = \
 
 $(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET)
 	$(call gb_Output_announce,$(filter_XcuFilterUiTarget),$(true),XCU,1)
-	$(call gb_Helper_abbreviate_dirs,\
+	$(call gb_Helper_abbreviate_dirs_native,\
 		mkdir -p $(dir $@) && \
 		RESPONSEFILE=`$(gb_MKTEMP)` && \
 		echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
@@ -235,7 +235,7 @@ define filter_XcuResTarget__rule
 $$(call filter_XcuResTarget_get_target,$(1)) : \
 		$(filter_XSLT_langfilter) $(filter_XcuFilterUiTarget)
 	$$(call gb_Output_announce,$(1),$(true),XCU,1)
-	$$(call gb_Helper_abbreviate_dirs,\
+	$$(call gb_Helper_abbreviate_dirs_native,\
 		mkdir -p $$(dir $$@) && \
 		$(gb_XSLTPROC) --nonet --stringparam lang $(1) \
 			$(filter_XSLT_langfilter) \
commit 836eef273f326a24bc0443a2721820bec5a71208
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Sep 16 11:39:18 2011 +0300

    OK, so avoid IMPL_GEN_RES_STR on Windows only then

diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index de61a3e..6609cdc 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -84,7 +84,9 @@ using namespace com::sun::star::beans;
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 
+#ifndef WNT
 IMPL_GEN_RES_STR;
+#endif
 
 SttResId::SttResId( sal_uInt32 nId ) :
     ResId( nId, *((*(BasicDLL**)GetAppData(SHL_BASIC))->GetSttResMgr()) )
commit a908054e4761861765acdfb390bff8c51745918b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Sep 16 10:45:25 2011 +0300

    Drop duplicated include of Tempfile.mk

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index d46dbd0..6169cdc 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -190,8 +190,6 @@ endif
 
 include $(GBUILDDIR)/Tempfile.mk
 
-include $(GBUILDDIR)/Tempfile.mk
-
 include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk)
 
 $(eval $(call gb_Helper_collect_knownlibs))