mv ooo to top-level

solenv/gbuild/ComponentTarget.mk

@@ -29,30 +29,30 @@ gb_ComponentTarget_get_source = $(1)/$(2).component
 define gb_ComponentTarget__command
 $(call gb_Output_announce,$(3),$(true),CMP,1)
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_XSLTPROC) --nonet --stringparam uri \
-        '$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
-        $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
+	mkdir -p $(dir $(1)) && \
+	$(gb_XSLTPROC) --nonet --stringparam uri \
+    	'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
+		$(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
 
 endef
 
 define gb_ComponentTarget__rules
 $$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
-    $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
+	$$(call gb_ComponentTarget__command,$$@,$$<,$$*)
 
 $$(call gb_ComponentTarget_get_clean_target,%) :
-    $$(call gb_Output_announce,$$*,$(false),CMP,1)
-    rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
+	$$(call gb_Output_announce,$$*,$(false),CMP,1)
+	rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
 
 endef
 
 $(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
 
 $(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 xlstproc is missing.))
+	$(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xlstproc is missing.))
 
 $(call gb_ComponentTarget_get_external_target,%) :
-    $(call gb_Deliver_deliver,$<,$@)
+	$(call gb_Deliver_deliver,$<,$@)
 
 define gb_ComponentTarget_ComponentTarget
 $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)

solenv/gbuild/CppunitTest.mk

@@ -37,15 +37,15 @@ gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filen
 
 .PHONY : $(call gb_CppunitTest_get_clean_target,%)
 $(call gb_CppunitTest_get_clean_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
 
 .PHONY : $(call gb_CppunitTest_get_target,%)
 $(call gb_CppunitTest_get_target,%) : $(gb_CppunitTest_CPPTESTTARGET)
-    $(call gb_Output_announce,$*,$(true),CUT,2)
-    $(call gb_Helper_abbreviate_dirs_native,\
-        mkdir -p $(dir $@) && \
-        $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Output_announce,$*,$(true),CUT,2)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		mkdir -p $(dir $@) && \
+		$(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) > $@.log 2>&1 || (cat $@.log && false))
 
 define gb_CppunitTest_CppunitTest
 $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1)))
@@ -69,28 +69,28 @@ gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_lin
 endef
 
 $(eval $(foreach method,\
-    add_cobject \
-    add_cobjects \
-    add_cxxobject \
-    add_cxxobjects \
-    add_objcxxobject \
-    add_objcxxobjects \
-    add_exception_objects \
-    add_noexception_objects \
-    set_cflags \
-    set_cxxflags \
-    set_objcxxflags \
-    set_defs \
-    set_include \
-    set_ldflags \
-    set_library_path_flags \
-    add_linked_libs \
-    add_linked_static_libs \
-    add_package_headers \
-    add_sdi_headers \
-    add_precompiled_header \
+	add_cobject \
+	add_cobjects \
+	add_cxxobject \
+	add_cxxobjects \
+	add_objcxxobject \
+	add_objcxxobjects \
+	add_exception_objects \
+	add_noexception_objects \
+	set_cflags \
+	set_cxxflags \
+	set_objcxxflags \
+	set_defs \
+	set_include \
+	set_ldflags \
+	set_library_path_flags \
+	add_linked_libs \
+	add_linked_static_libs \
+	add_package_headers \
+	add_sdi_headers \
+	add_precompiled_header \
 ,\
-    $(call gb_CppunitTest__forward_to_Linktarget,$(method))\
+	$(call gb_CppunitTest__forward_to_Linktarget,$(method))\
 ))
 
 # vim: set noet sw=4 ts=4:

solenv/gbuild/CustomTarget.mk

@@ -26,30 +26,30 @@ gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
 # N.B.: putting the "+" there at the start activates the GNU make job server
 define gb_CustomTarget__command
 +$(call gb_Helper_abbreviate_dirs,\
-    mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
-    $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
-    touch $(1))
+	mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
+	$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
+	touch $(1))
 
 endef
 
 define gb_CustomTarget__rules
 $$(call gb_CustomTarget_get_repo_target,$(1),%) :
-    $$(call gb_Output_announce,$$*,$$(true),MAK,3)
-    $$(call gb_CustomTarget__command,$$@,$$*)
+	$$(call gb_Output_announce,$$*,$$(true),MAK,3)
+	$$(call gb_CustomTarget__command,$$@,$$*)
 
 $$(call gb_CustomTarget_get_target,%) : $$(call gb_CustomTarget_get_repo_target,$(1),%)
-    $$(call gb_Helper_abbreviate_dirs,\
-        touch $$@)
+	$$(call gb_Helper_abbreviate_dirs,\
+		touch $$@)
 
 endef
 
 .PHONY: $(call gb_CustomTarget_get_clean_target,%)
 $(call gb_CustomTarget_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),MAK,3)
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
-        rm -f $(call gb_CustomTarget_get_target,$*) \
-            $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(call gb_CustomTarget_get_repo_target,$(reponame),$*)))
+	$(call gb_Output_announce,$*,$(false),MAK,3)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
+		rm -f $(call gb_CustomTarget_get_target,$*) \
+			$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(call gb_CustomTarget_get_repo_target,$(reponame),$*)))
 
 
 $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(eval $(call gb_CustomTarget__rules,$(reponame))))
@@ -60,7 +60,7 @@ endef
 
 define gb_CustomTarget_CustomTarget
 $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
-    $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1))))
+	$(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1))))
 
 $(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1))
 
@@ -69,7 +69,7 @@ endef
 
 define gb_CustomTarget_add_dependency
 $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
-    $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $($(reponame))/$(2)))
+	$(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $($(reponame))/$(2)))
 
 endef
 
@@ -80,7 +80,7 @@ endef
 
 define gb_CustomTarget_add_outdir_dependency
 $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
-    $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(2)))
+	$(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(2)))
 
 endef
 

solenv/gbuild/Deliver.mk

@@ -74,8 +74,8 @@ endef
 # deliver.log format is broken in that case anyway
 .PHONY : deliverlog showdeliverables
 deliverlog:
-    $(eval $(call gb_Deliver_setdeliverlogcommand))
-    $(call gb_Helper_abbreviate_dirs, $(COMMAND))
+	$(eval $(call gb_Deliver_setdeliverlogcommand))
+	$(call gb_Helper_abbreviate_dirs, $(COMMAND))
 
 # all : deliverlog
 
@@ -84,8 +84,8 @@ $(info $(1) $(patsubst $(OUTDIR)/%,%,$(2)))
 endef
 
 showdeliverables :
-    $(eval MAKEFLAGS := s)
-    $(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\
-            $(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
-    true
+	$(eval MAKEFLAGS := s)
+	$(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\
+			$(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
+	true
 # vim: set noet sw=4 ts=4:

solenv/gbuild/Executable.mk

@@ -28,14 +28,14 @@
 
 .PHONY : $(call gb_Executable_get_clean_target,%)
 $(call gb_Executable_get_clean_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_Executable_get_target,$*) \
-            $(AUXTARGETS))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_Executable_get_target,$*) \
+			$(AUXTARGETS))
 
 $(call gb_Executable_get_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        $(call gb_Deliver_deliver,$<,$@) \
-            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+	$(call gb_Helper_abbreviate_dirs,\
+		$(call gb_Deliver_deliver,$<,$@) \
+			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
 
 define gb_Executable_Executable
 $(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
@@ -59,29 +59,29 @@ gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable
 endef
 
 $(eval $(foreach method,\
-    add_cobject \
-    add_cobjects \
-    add_cxxobject \
-    add_cxxobjects \
-    add_objcxxobject \
-    add_objcxxobjects \
-    add_exception_objects \
-    add_noexception_objects \
-    add_generated_exception_objects \
-    set_cflags \
-    set_cxxflags \
-    set_objcxxflags \
-    set_defs \
-    set_include \
-    set_ldflags \
-    set_library_path_flags \
-    add_linked_libs \
-    add_linked_static_libs \
-    add_package_headers \
-    add_sdi_headers \
-    add_precompiled_header \
+	add_cobject \
+	add_cobjects \
+	add_cxxobject \
+	add_cxxobjects \
+	add_objcxxobject \
+	add_objcxxobjects \
+	add_exception_objects \
+	add_noexception_objects \
+	add_generated_exception_objects \
+	set_cflags \
+	set_cxxflags \
+	set_objcxxflags \
+	set_defs \
+	set_include \
+	set_ldflags \
+	set_library_path_flags \
+	add_linked_libs \
+	add_linked_static_libs \
+	add_package_headers \
+	add_sdi_headers \
+	add_precompiled_header \
 ,\
-    $(call gb_Executable_forward_to_Linktarget,$(method))\
+	$(call gb_Executable_forward_to_Linktarget,$(method))\
 ))
 
 # vim: set noet sw=4 ts=4:

solenv/gbuild/Helper.mk

@@ -43,7 +43,7 @@ gb_Helper_REPOSITORYNAMES :=
 
 .PHONY : $(WORKDIR)/Misc/PHONY
 $(gb_Helper_MISCDUMMY) :
-    @mkdir -p $(dir $@) && touch $@
+	@mkdir -p $(dir $@) && touch $@
 
 define gb_Helper_abbreviate_dirs
 R=$(REPODIR) && \
@@ -69,19 +69,19 @@ endef
 
 define gb_Helper_make_clean_targets
 $(foreach targettype,$(1),\
-    $(call gb_Helper_make_clean_target,$(targettype)))
+	$(call gb_Helper_make_clean_target,$(targettype)))
 
 endef
 
 define gb_Helper_make_outdir_clean_targets
 $(foreach targettype,$(1),\
-    $(call gb_Helper_make_outdir_clean_target,$(targettype)))
+	$(call gb_Helper_make_outdir_clean_target,$(targettype)))
 
 endef
 
 define gb_Helper_make_dep_targets
 $(foreach targettype,$(1),\
-    $(call gb_Helper_make_dep_target,$(targettype)))
+	$(call gb_Helper_make_dep_target,$(targettype)))
 
 endef
 

solenv/gbuild/JavaClassSet.mk

@@ -26,27 +26,27 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
 
 define gb_JavaClassSet__command
 $(call gb_Helper_abbreviate_dirs_native,\
-    mkdir -p $(dir $(1)) && \
-    $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) && \
-    touch $(1))
+	mkdir -p $(dir $(1)) && \
+	$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) && \
+	touch $(1))
 
 endef
 
 define gb_JavaClassSet__rules
 $$(call gb_JavaClassSet_get_repo_target,$(1),%) :
-    $$(call gb_JavaClassSet__command,$$@,$$*,$$?)
+	$$(call gb_JavaClassSet__command,$$@,$$*,$$?)
 
 $$(call gb_JavaClassSet_get_target,%) : $$(call gb_JavaClassSet_get_repo_target,$(1),%)
-    $$(call gb_Output_announce,$$*,$$(true),JCS,3)
-    $$(call gb_Helper_abbreviate_dirs,\
-        touch $$@)
+	$$(call gb_Output_announce,$$*,$$(true),JCS,3)
+	$$(call gb_Helper_abbreviate_dirs,\
+		touch $$@)
 
 endef
 
 $(call gb_JavaClassSet_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),JCS,3)
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
+	$(call gb_Output_announce,$*,$(false),JCS,3)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
 
 
 $(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),$(eval $(call gb_JavaClassSet__rules,$(reponame))))
@@ -60,7 +60,7 @@ endef
 
 define gb_JavaClassSet_add_sourcefile
 $(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
-    $(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2))))
+	$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2))))
 
 endef
 

solenv/gbuild/JunitTest.mk

@@ -32,18 +32,18 @@ export DBGSV_ERROR_OUT
 
 .PHONY : $(call gb_JunitTest_get_clean_target,%)
 $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,%))
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $@ $@.log)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $@ $@.log)
 
 .PHONY : $(call gb_JunitTest_get_target,$(1))
 $(call gb_JunitTest_get_target,%) :
-    $(call gb_Output_announce,$*,$(true),JUT,2)
-    $(call gb_Helper_abbreviate_dirs_native,\
+	$(call gb_Output_announce,$*,$(true),JUT,2)
+	$(call gb_Helper_abbreviate_dirs_native,\
         rm -rf $(call gb_JunitTest_get_userdir,$*) && \
-        mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
-        $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false) && \
+		mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
+		$(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false) && \
         rm -rf $(call gb_JunitTest_get_userdir,$*))
-    $(CLEAN_CMD)
+	$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest
 $(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib

solenv/gbuild/Library.mk

@@ -40,15 +40,15 @@ gb_Library__get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 .PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT)
 $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
-            $(AUXTARGETS))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
+			$(AUXTARGETS))
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 $(gb_Library_OUTDIRLOCATION)/%$(gb_Library_PLAINEXT) : 
-    $(call gb_Helper_abbreviate_dirs,\
-        $(call gb_Deliver_deliver,$<,$@) \
-            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+	$(call gb_Helper_abbreviate_dirs,\
+		$(call gb_Deliver_deliver,$<,$@) \
+			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
 
 define gb_Library_Library
 ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS)))
@@ -65,8 +65,8 @@ define gb_Library__Library_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),Library)
 $(call gb_LinkTarget_set_defs,$(2),\
-    $$(DEFS) \
-    $(gb_Library_DEFS) \
+	$$(DEFS) \
+	$(gb_Library_DEFS) \
 )
 $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
@@ -102,30 +102,30 @@ gb_Library_get_runtime_filename = \
  $(or $(call gb_Library_get_dllname,$(1)),$(call gb_Library_get_filename,$(1)))
 
 $(eval $(foreach method,\
-    add_cobject \
-    add_cobjects \
-    add_cxxobject \
-    add_cxxobjects \
-    add_objcxxobject \
-    add_objcxxobjects \
-    add_exception_objects \
-    add_noexception_objects \
-    add_generated_exception_objects \
-    set_cflags \
-    set_cxxflags \
-    set_objcxxflags \
-    set_defs \
-    set_include \
-    set_ldflags \
-    set_library_path_flags \
-    add_linked_libs \
-    add_linked_static_libs \
-    add_external_libs \
-    add_package_headers \
-    add_sdi_headers \
-    add_precompiled_header \
+	add_cobject \
+	add_cobjects \
+	add_cxxobject \
+	add_cxxobjects \
+	add_objcxxobject \
+	add_objcxxobjects \
+	add_exception_objects \
+	add_noexception_objects \
+	add_generated_exception_objects \
+	set_cflags \
+	set_cxxflags \
+	set_objcxxflags \
+	set_defs \
+	set_include \
+	set_ldflags \
+	set_library_path_flags \
+	add_linked_libs \
+	add_linked_static_libs \
+	add_external_libs \
+	add_package_headers \
+	add_sdi_headers \
+	add_precompiled_header \
 ,\
-    $(call gb_Library__forward_to_Linktarget,$(method))\
+	$(call gb_Library__forward_to_Linktarget,$(method))\
 ))
 
 # vim: set noet sw=4 ts=4:

solenv/gbuild/Module.mk

@@ -33,31 +33,31 @@ gb_Module_CLEANTARGETSTACK :=
 
 .PHONY : $(call gb_Module_get_clean_target,%)
 $(call gb_Module_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),MOD,5)
-    $(call gb_Output_announce_title,module $* cleared.)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
+	$(call gb_Output_announce,$*,$(false),MOD,5)
+	$(call gb_Output_announce_title,module $* cleared.)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
 
 $(call gb_Module_get_check_target,%) :
-    $(call gb_Output_announce,$*,$(true),CHK,5)
-    $(call gb_Output_announce_title,module $* checks done.)
-    -$(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        touch $@)
+	$(call gb_Output_announce,$*,$(true),CHK,5)
+	$(call gb_Output_announce_title,module $* checks done.)
+	-$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		touch $@)
 
 $(call gb_Module_get_subsequentcheck_target,%) :
-    $(call gb_Output_announce,$*,$(true),SCK,5)
-    $(call gb_Output_announce_title,module $* subsequentchecks done.)
-    -$(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        touch $@)
+	$(call gb_Output_announce,$*,$(true),SCK,5)
+	$(call gb_Output_announce_title,module $* subsequentchecks done.)
+	-$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		touch $@)
 
 $(call gb_Module_get_target,%) :
-    $(call gb_Output_announce,$*,$(true),MOD,5)
-    $(call gb_Output_announce_title,module $* done.)
-    -$(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        touch $@)
+	$(call gb_Output_announce,$*,$(true),MOD,5)
+	$(call gb_Output_announce_title,module $* done.)
+	-$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		touch $@)
 
 .PHONY : all allandcheck clean check subsequentcheck
 .DEFAULT_GOAL := allandcheck
@@ -70,26 +70,26 @@ ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),)
 endif
 
 all : 
-    $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
-    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
-    $(call gb_Output_announce_title,all done.)
-    $(call gb_Output_announce_bell)
+	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
+	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
+	$(call gb_Output_announce_title,all done.)
+	$(call gb_Output_announce_bell)
 
 check :
-    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6)
-    $(call gb_Output_announce_title,all tests checked.)
-    $(call gb_Output_announce_bell)
+	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6)
+	$(call gb_Output_announce_title,all tests checked.)
+	$(call gb_Output_announce_bell)
 
 subsequentcheck : all 
-    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6)
-    $(call gb_Output_announce_title,all subsequent tests checked.)
-    $(call gb_Output_announce_bell)
+	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6)
+	$(call gb_Output_announce_title,all subsequent tests checked.)
+	$(call gb_Output_announce_bell)
 
 clean : 
-    $(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6)
-    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6)
-    $(call gb_Output_announce_title,all cleared.)
-    $(call gb_Output_announce_bell)
+	$(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6)
+	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6)
+	$(call gb_Output_announce_title,all cleared.)
+	$(call gb_Output_announce_bell)
 
 define gb_Module_Module
 gb_Module_ALLMODULES += $(1)

solenv/gbuild/Output.mk

@@ -93,8 +93,8 @@ gb_Output_COLOR_ERROR := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
 
 define gb_Output__format_type
 $(subst :, ,$(word 2,$(1) \
-    $(gb_Output_COLOR_OUTBUILD_LEVEL$(3))[:$(gb_Output_COLOR_INBUILD_LEVEL$(3))build:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTBUILD_LEVEL$(3)):] \
-    $(gb_Output_COLOR_OUTCLEAN_LEVEL$(3))[:$(gb_Output_COLOR_INCLEAN_LEVEL$(3))clean:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3)):]))$(gb_Output_COLOR_RESET)
+	$(gb_Output_COLOR_OUTBUILD_LEVEL$(3))[:$(gb_Output_COLOR_INBUILD_LEVEL$(3))build:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTBUILD_LEVEL$(3)):] \
+	$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3))[:$(gb_Output_COLOR_INCLEAN_LEVEL$(3))clean:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3)):]))$(gb_Output_COLOR_RESET)
 endef
 
 define gb_Output_info

solenv/gbuild/Package.mk

@@ -25,7 +25,7 @@
 # PackagePart class
 
 $(foreach destination,$(call gb_PackagePart_get_destinations), $(destination)/%) :
-    $(call gb_Deliver_deliver,$<,$@)
+	$(call gb_Deliver_deliver,$<,$@)
 
 define gb_PackagePart_PackagePart
 $(OUTDIR)/$(1) : $(2)
@@ -39,16 +39,16 @@ endef
 
 .PHONY : $(call gb_Package_get_clean_target,%)
 $(call gb_Package_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),PKG,2)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(FILES))
+	$(call gb_Output_announce,$*,$(false),PKG,2)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(FILES))
 
 $(call gb_Package_get_preparation_target,%) :
-    mkdir -p $(dir $@) && touch $@
+	mkdir -p $(dir $@) && touch $@
 
 $(call gb_Package_get_target,%) :
-    $(call gb_Output_announce,$*,$(true),PKG,2)
-    mkdir -p $(dir $@) && touch $@
+	$(call gb_Output_announce,$*,$(true),PKG,2)
+	mkdir -p $(dir $@) && touch $@
 
 
 define gb_Package_Package

solenv/gbuild/PrecompiledHeaders.mk

@@ -36,38 +36,38 @@ gb_NoexPrecompiledHeader_DEBUGDIR := nodebug
 endif
 
 $(call gb_PrecompiledHeader_get_dep_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
 
 $(call gb_NoexPrecompiledHeader_get_dep_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@) && \
-        echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
 
 $(call gb_PrecompiledHeader_get_target,%) :
-    $(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+	$(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
 
 $(call gb_NoexPrecompiledHeader_get_target,%) :
-    $(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+	$(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
 
 .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%)
 $(call gb_PrecompiledHeader_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),PCH,1)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_PrecompiledHeader_get_target,$*) \
-            $(call gb_PrecompiledHeader_get_target,$*).obj \
-            $(call gb_PrecompiledHeader_get_target,$*).pdb \
-            $(call gb_PrecompiledHeader_get_dep_target,$*))
+	$(call gb_Output_announce,$*,$(false),PCH,1)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_PrecompiledHeader_get_target,$*) \
+		    $(call gb_PrecompiledHeader_get_target,$*).obj \
+		    $(call gb_PrecompiledHeader_get_target,$*).pdb \
+			$(call gb_PrecompiledHeader_get_dep_target,$*))
 
 
 $(call gb_NoexPrecompiledHeader_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),PCH,1)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \
-            $(call gb_NoexPrecompiledHeader_get_target,$*).obj \
-            $(call gb_NoexPrecompiledHeader_get_target,$*).pdb \
-            $(call gb_NoexPrecompiledHeader_get_dep_target,$*))
+	$(call gb_Output_announce,$*,$(false),PCH,1)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \
+		    $(call gb_NoexPrecompiledHeader_get_target,$*).obj \
+		    $(call gb_NoexPrecompiledHeader_get_target,$*).pdb \
+			$(call gb_NoexPrecompiledHeader_get_dep_target,$*))
 endif
 
 # vim: set noet sw=4 ts=4:

solenv/gbuild/SdiTarget.mk

@@ -31,28 +31,28 @@ gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target,svidl)
 gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
 
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET)
-    $(call gb_Output_announce,$*,$(true),SDI,1)
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@))
-    $(call gb_Helper_abbreviate_dirs_native,\
-        cd $(dir $<) && \
-        $(gb_SdiTarget_SVIDLCOMMAND) -quiet \
-            $(INCLUDE) \
-            -fs$@.hxx \
-            -fd$@.ilb \
-            -fl$@.lst \
-            -fz$@.sid \
-            -fx$(EXPORTS) \
-            -fm$@ \
-            $<)
+	$(call gb_Output_announce,$*,$(true),SDI,1)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@))
+	$(call gb_Helper_abbreviate_dirs_native,\
+		cd $(dir $<) && \
+		$(gb_SdiTarget_SVIDLCOMMAND) -quiet \
+			$(INCLUDE) \
+			-fs$@.hxx \
+			-fd$@.ilb \
+			-fl$@.lst \
+			-fz$@.sid \
+			-fx$(EXPORTS) \
+			-fm$@ \
+			$<)
 
 .PHONY : $(call gb_SdiTarget_get_clean_target,%)
 $(call gb_SdiTarget_get_clean_target,%) :
-    $(call gb_Output_announce,$*,$(false),SDI,1)
-    -$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(foreach ext,.hxx .ilb .lst .sid,\
-            $(call gb_SdiTarget_get_target,$*)$(ext)) \
-            $(call gb_SdiTarget_get_target,$*))
+	$(call gb_Output_announce,$*,$(false),SDI,1)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(foreach ext,.hxx .ilb .lst .sid,\
+			$(call gb_SdiTarget_get_target,$*)$(ext)) \
+			$(call gb_SdiTarget_get_target,$*))
 
 define gb_SdiTarget_SdiTarget
 $(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $$(subst -I. ,-I$$(dir $(SRCDIR)/$(1)) ,$$(SOLARINC))

solenv/gbuild/StaticLibrary.mk

@@ -36,15 +36,15 @@ gb_StaticLibrary__get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 .PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT)
 $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(OUTDIR)/lib/$*$(gb_StaticLibrary_PLAINEXT) \
-            $(AUXTARGETS))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(OUTDIR)/lib/$*$(gb_StaticLibrary_PLAINEXT) \
+			$(AUXTARGETS))
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 $(gb_StaticLibrary_OUTDIRLOCATION)/%$(gb_StaticLibrary_PLAINEXT) : 
-    $(call gb_Helper_abbreviate_dirs,\
-        $(call gb_Deliver_deliver,$<,$@) \
-            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+	$(call gb_Helper_abbreviate_dirs,\
+		$(call gb_Deliver_deliver,$<,$@) \
+			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
 
 define gb_StaticLibrary_StaticLibrary
 ifeq (,$$(findstring $(1),$$(gb_StaticLibrary_KNOWNLIBS)))
@@ -60,8 +60,8 @@ define gb_StaticLibrary__StaticLibrary_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
 $(call gb_LinkTarget_set_defs,$(2),\
-    $$(DEFS) \
-    $(gb_StaticLibrary_DEFS) \
+	$$(DEFS) \
+	$(gb_StaticLibrary_DEFS) \
 )
 $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
@@ -77,29 +77,29 @@ gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_StaticLibrary__get
 endef
 
 $(eval $(foreach method,\
-    add_cobject \
-    add_cobjects \
-    add_cxxobject \
-    add_cxxobjects \
-    add_objcxxobject \
-    add_objcxxobjects \
-    add_exception_objects \
-    add_noexception_objects \
-    add_generated_exception_objects \
-    set_cflags \
-    set_cxxflags \
-    set_objcxxflags \
-    set_defs \
-    set_include \
-    set_ldflags \
-    set_library_path_flags \
-    add_linked_libs \
-    add_linked_static_libs \
-    add_package_headers \
-    add_sdi_headers \
-    add_precompiled_header \
+	add_cobject \
+	add_cobjects \
+	add_cxxobject \
+	add_cxxobjects \
+	add_objcxxobject \
+	add_objcxxobjects \
+	add_exception_objects \
+	add_noexception_objects \
+	add_generated_exception_objects \
+	set_cflags \
+	set_cxxflags \
+	set_objcxxflags \
+	set_defs \
+	set_include \
+	set_ldflags \
+	set_library_path_flags \
+	add_linked_libs \
+	add_linked_static_libs \
+	add_package_headers \
+	add_sdi_headers \
+	add_precompiled_header \
 ,\
-    $(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
+	$(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
 ))
 
 # vim: set noet sw=4 ts=4:

solenv/gbuild/TargetLocations.mk

@@ -96,37 +96,37 @@ $(patsubst $(1):%,$(WORKDIR)/Headers/StaticLibrary/%,$(filter $(1):%,$(gb_Static
 endef
 
 $(eval $(call gb_Helper_make_clean_targets,\
-    AllLangResTarget \
-    ComponentTarget \
-    JavaClassSet \
-    JunitTest \
-    LinkTarget \
-    Module \
-    WinResTarget \
-    NoexPrecompiledHeader \
-    PackagePart \
-    PrecompiledHeader \
-    ResTarget \
-    SdiTarget \
-    SrsTarget \
-    CppunitTest \
-    CustomTarget \
+	AllLangResTarget \
+	ComponentTarget \
+	JavaClassSet \
+	JunitTest \
+	LinkTarget \
+	Module \
+	WinResTarget \
+	NoexPrecompiledHeader \
+	PackagePart \
+	PrecompiledHeader \
+	ResTarget \
+	SdiTarget \
+	SrsTarget \
+	CppunitTest \
+	CustomTarget \
 ))
 
 $(eval $(call gb_Helper_make_outdir_clean_targets,\
-    Executable \
-    Library \
-    Package \
-    StaticLibrary \
+	Executable \
+	Library \
+	Package \
+	StaticLibrary \
 ))
 
 $(eval $(call gb_Helper_make_dep_targets,\
-    CObject \
-    CxxObject \
-    ObjCxxObject \
-    LinkTarget \
-    SrsPartTarget \
-    SrsTarget \
+	CObject \
+	CxxObject \
+	ObjCxxObject \
+	LinkTarget \
+	SrsPartTarget \
+	SrsTarget \
 ))
 # needs to use same dep target because we use gb_CxxObject__command
 gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target)

solenv/gbuild/WinResTarget.mk

@@ -50,21 +50,21 @@ endef
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_WinResTarget_get_dep_target,%) : $(gb_Helper_MISCDUMMY)
-        mkdir -p $(dir $@) && \
-            echo '$(call gb_WinResTarget_get_target,$*) : $$(gb_Helper_PHONY)' > $@
+		mkdir -p $(dir $@) && \
+			echo '$(call gb_WinResTarget_get_target,$*) : $$(gb_Helper_PHONY)' > $@
 endif
 
 
 $(call gb_WinResTarget_get_target,%) :
-    $(call gb_Output_announce,$*,$(true),RES,1)
-    $(call gb_WinResTarget__command_dep,$*,$<)
-    $(call gb_Helper_abbreviate_dirs,\
-        mkdir -p $(dir $@))
-    $(call gb_WinResTarget__command,$@)
+	$(call gb_Output_announce,$*,$(true),RES,1)
+	$(call gb_WinResTarget__command_dep,$*,$<)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@))
+	$(call gb_WinResTarget__command,$@)
 
 $(call gb_WinResTarget_get_clean_target,%) :
-    $(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_WinResTarget_get_target,$*))
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_WinResTarget_get_target,$*))
 
 define gb_WinResTarget_set_defs
 $(call gb_WinResTarget_get_target,$(1)) : DEFS := $(2)

solenv/gbuild/extensions/post_PackModule.mk

@@ -38,8 +38,8 @@ endif
 endef
 
 packmodule : allandcheck deliverlog
-    $(eval $(call gb_PackModule_setpackmodulecommand))
-    $(COMMAND)
+	$(eval $(call gb_PackModule_setpackmodulecommand))
+	$(COMMAND)
 
 define gb_PackModule_setcleanpackmodulecommand
 ifeq ($$(words $(gb_Module_ALLMODULES)),1)
@@ -52,7 +52,7 @@ endif
 endef
 
 cleanpackmodule : clean
-    $(eval $(call gb_PackModule_setcleanpackmodulecommand))
-    $(COMMAND)
-    
+	$(eval $(call gb_PackModule_setcleanpackmodulecommand))
+	$(COMMAND)
+	
 # vim: set noet ts=4 sw=4:

solenv/gbuild/extensions/post_SetupLocal.mk

@@ -25,39 +25,39 @@
 ifneq ($(gb_LOCALBUILDDIR),)
 ifneq ($(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk),)
 setuplocal :
-    $(eval $(call gb_Output_error,$(gb_LOCALBUILDDIR) exists already.))
+	$(eval $(call gb_Output_error,$(gb_LOCALBUILDDIR) exists already.))
 
 else
 
 setuplocal :
-    $(eval MODULE := $(firstword $(MODULE) $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))))
-    $(eval modulerepo := $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))))
-    $(eval $(call gb_Output_announce,setting up local build directory (module: $(MODULE)).,$(true),SYC,5))
-    mkdir -p $(gb_LOCALBUILDDIR)/srcdir $(gb_LOCALBUILDDIR)/workdir $(gb_LOCALBUILDDIR)/outdir
-    rsync --archive --exclude 'workdir/**' $(SOLARVERSION)/$(INPATH)/ $(gb_LOCALBUILDDIR)/outdir
-    cp $(modulerepo)/Repository.mk $(gb_LOCALBUILDDIR)/srcdir/Repository.mk
-    cp $(modulerepo)/RepositoryFixes.mk $(gb_LOCALBUILDDIR)/srcdir/RepositoryFixes.mk
-    rsync --archive $(modulerepo)/$(MODULE)/ $(gb_LOCALBUILDDIR)/srcdir/$(MODULE)
-    echo "gb_REPOS := $(gb_LOCALBUILDDIR)/srcdir $(filter-out $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))),$(gb_REPOS))" > $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "#original gb_REPOS was $(gb_REPOS)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "OUTDIR := $(gb_LOCALBUILDDIR)/outdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "#original OUTDIR was $(OUTDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "WORKDIR := $(gb_LOCALBUILDDIR)/workdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-    echo "#original WORKDIR was $(WORKDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	$(eval MODULE := $(firstword $(MODULE) $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))))
+	$(eval modulerepo := $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))))
+	$(eval $(call gb_Output_announce,setting up local build directory (module: $(MODULE)).,$(true),SYC,5))
+	mkdir -p $(gb_LOCALBUILDDIR)/srcdir $(gb_LOCALBUILDDIR)/workdir $(gb_LOCALBUILDDIR)/outdir
+	rsync --archive --exclude 'workdir/**' $(SOLARVERSION)/$(INPATH)/ $(gb_LOCALBUILDDIR)/outdir
+	cp $(modulerepo)/Repository.mk $(gb_LOCALBUILDDIR)/srcdir/Repository.mk
+	cp $(modulerepo)/RepositoryFixes.mk $(gb_LOCALBUILDDIR)/srcdir/RepositoryFixes.mk
+	rsync --archive $(modulerepo)/$(MODULE)/ $(gb_LOCALBUILDDIR)/srcdir/$(MODULE)
+	echo "gb_REPOS := $(gb_LOCALBUILDDIR)/srcdir $(filter-out $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))),$(gb_REPOS))" > $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "#original gb_REPOS was $(gb_REPOS)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "OUTDIR := $(gb_LOCALBUILDDIR)/outdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "#original OUTDIR was $(OUTDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "WORKDIR := $(gb_LOCALBUILDDIR)/workdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+	echo "#original WORKDIR was $(WORKDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
 
 endif
 
 removelocal :
-    $(eval $(call gb_Output_warn,removing directory $(gb_LOCALBUILDDIR).,SYC))
-    sleep 10
-    rm -rf $(gb_LOCALBUILDDIR)
+	$(eval $(call gb_Output_warn,removing directory $(gb_LOCALBUILDDIR).,SYC))
+	sleep 10
+	rm -rf $(gb_LOCALBUILDDIR)
 
 else
 setuplocal:
-    $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
+	$(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
 
 removelocal:
-    $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
+	$(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
 
 endif
 

solenv/gbuild/gbuild.mk

@@ -151,40 +151,40 @@ include $(GBUILDDIR)/Tempfile.mk
 $(eval $(call gb_Helper_collect_knownlibs))
 
 gb_GLOBALDEFS := \
-    -D_REENTRANT \
-    -DCUI \
-    -DENABLE_LAYOUT_EXPERIMENTAL=0 \
-    -DENABLE_LAYOUT=0 \
-    -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
-    -DSOLAR_JAVA \
-    -DSTLPORT_VERSION=$(STLPORT_VER) \
-    -DSUPD=$(UPD) \
-    -DVCL \
-    $(gb_OSDEFS) \
-    $(gb_COMPILERDEFS) \
-    $(gb_CPUDEFS) \
+	-D_REENTRANT \
+	-DCUI \
+	-DENABLE_LAYOUT_EXPERIMENTAL=0 \
+	-DENABLE_LAYOUT=0 \
+	-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
+	-DSOLAR_JAVA \
+	-DSTLPORT_VERSION=$(STLPORT_VER) \
+	-DSUPD=$(UPD) \
+	-DVCL \
+	$(gb_OSDEFS) \
+	$(gb_COMPILERDEFS) \
+	$(gb_CPUDEFS) \
 
 ifeq ($(gb_PRODUCT),$(true))
 gb_GLOBALDEFS += \
-    -DPRODUCT \
-    -DPRODUCT_FULL \
+	-DPRODUCT \
+	-DPRODUCT_FULL \
 
 else
 gb_GLOBALDEFS += \
-    -DDBG_UTIL \
-    -D_STLP_DEBUG \
-    -D_DEBUG \
+	-DDBG_UTIL \
+	-D_STLP_DEBUG \
+	-D_DEBUG \
 
 endif
 
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_GLOBALDEFS += \
-    -DDEBUG \
+	-DDEBUG \
 
 else
 gb_GLOBALDEFS += \
-    -DOPTIMIZE \
-    -DNDEBUG \
+	-DOPTIMIZE \
+	-DNDEBUG \
 
 endif
 
@@ -228,21 +228,21 @@ $(eval $(call gb_Deliver_init))
 # is not available everywhere by default.
 
 include $(foreach class, \
-    ComponentTarget \
-    AllLangResTarget \
-    WinResTarget \
-    LinkTarget \
-    Library \
-    StaticLibrary \
-    Executable \
-    SdiTarget \
-    Package \
-    CustomTarget \
-    PrecompiledHeaders \
-    CppunitTest \
-    JavaClassSet \
-    JunitTest \
-    Module \
+	ComponentTarget \
+	AllLangResTarget \
+	WinResTarget \
+	LinkTarget \
+	Library \
+	StaticLibrary \
+	Executable \
+	SdiTarget \
+	Package \
+	CustomTarget \
+	PrecompiledHeaders \
+	CppunitTest \
+	JavaClassSet \
+	JunitTest \
+	Module \
 ,$(GBUILDDIR)/$(class).mk)
 
 # optional extensions that should never be essential

solenv/gbuild/templates/AllLangResTarget.mk

@@ -35,7 +35,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,RES/res))
 
 # add any additional include paths here
 $(eval $(call gb_SrsTarget_set_include,RES/res,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
 # add src files here (complete path relative to repository root)

solenv/gbuild/templates/CppunitTest.mk

@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
 # vim: set noet sw=4 ts=4:

solenv/gbuild/templates/Executable.mk

@@ -24,11 +24,11 @@
 $(eval $(call gb_Executable_Executable,EXEC))
 
 $(eval $(call gb_Executable_set_include,EXEC,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Executable_set_cxxflags,EXEC,\
-    $$(CXXFLAGS) \
+	$$(CXXFLAGS) \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,EXEC,\

solenv/gbuild/templates/JunitTest.mk

@@ -24,16 +24,16 @@
 $(eval $(call gb_JunitTest_JunitTest,MODULE_TYPE))
 
 $(eval $(call gb_JunitTest_set_defs,MODULE_TYPE,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/MODULE/DOCUMENTPATH \
+	$$(DEFS) \
+	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/MODULE/DOCUMENTPATH \
 ))
 
 $(eval $(call gb_JunitTest_add_jars,MODULE_TYPE,\
-    $(OUTDIR)/bin/OOoRunner.jar \
-    $(OUTDIR)/bin/ridl.jar \
-    $(OUTDIR)/bin/test.jar \
-    $(OUTDIR)/bin/unoil.jar \
-    $(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/OOoRunner.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/test.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
 ))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,MODULE_TYPE,\

solenv/gbuild/templates/Library.mk

@@ -40,13 +40,13 @@ $(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE))
 
 # add any additional include paths for this library here
 $(eval $(call gb_Library_set_include,LIB,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
 # add any additional definitions to be set for compilation here
 # (e.g. -DLIB_DLLIMPLEMENTATION)
 $(eval $(call gb_Library_set_defs,LIB,\
-    $$(DEFS) \
+	$$(DEFS) \
 ))
 
 # add libraries to be linked to LIB; again these names need to be given as
@@ -67,7 +67,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,MODULE/sdi/ROOT_SDI_FILE,MODULE/sdi/LIB))
 
 # add any additional include paths for sdi processing here
 $(eval $(call gb_SdiTarget_set_include,MODULE/sdi/ROOT_SDI_FILE,\
-    $$(INCLUDE) \
+	$$(INCLUDE) \
 ))
 
 # this is an example how files can be added that require special compiler settings, e.g. building without optimizing

svx/AllLangResTarget_svx.mk

@@ -26,19 +26,19 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,svx))
 $(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx))
 
 $(eval $(call gb_AllLangResTarget_add_srs,svx,\
-    svx/res \
+	svx/res \
 ))
 
 $(eval $(call gb_SrsTarget_SrsTarget,svx/res))
 
 $(eval $(call gb_SrsTarget_set_include,svx/res,\
-    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
-    -I$(WORKDIR)/inc \
-    -I$(WORKDIR)/inc/svx \
-    -I$(SRCDIR)/svx/source/inc \
-    -I$(SRCDIR)/svx/source/dialog \
-    -I$(SRCDIR)/svx/inc/ \
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc \
+	-I$(WORKDIR)/inc \
+	-I$(WORKDIR)/inc/svx \
+	-I$(SRCDIR)/svx/source/inc \
+	-I$(SRCDIR)/svx/source/dialog \
+	-I$(SRCDIR)/svx/inc/ \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svx/res,\
@@ -100,36 +100,36 @@ $(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(WORKDIR)/i
 $(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_clean
 
 $(OUTDIR)/inc/svx/globlmn.hrc : $(WORKDIR)/inc/svx/globlmn.hrc
-    $(call gb_Deliver_deliver,$<,$@)
+	$(call gb_Deliver_deliver,$<,$@)
 
 # hack !!!
 # just a temporary - globlmn.hrc about to be removed!
 ifeq ($(strip $(WITH_LANG)),)
 $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc
-    echo copying $@
-    -mkdir -p $(WORKDIR)/inc/svx
-    cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc
-    rm -f $(WORKDIR)/inc/svx/lastrun.mk 
+	echo copying $@
+	-mkdir -p $(WORKDIR)/inc/svx
+	cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc
+	rm -f $(WORKDIR)/inc/svx/lastrun.mk 
 else
 -include $(WORKDIR)/inc/svx/lastrun.mk
 ifneq ($(gb_lastrun_globlmn),MERGED)
 .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc
 endif
 $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
-    echo merging $@
-    -mkdir -p $(WORKDIR)/inc/svx
-    rm -f $(WORKDIR)/inc/svx/lastrun.mk
-    echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk
-    $(call gb_Helper_abbreviate_dirs_native, \
-        $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-        -p svx \
-         -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all)
+	echo merging $@
+	-mkdir -p $(WORKDIR)/inc/svx
+	rm -f $(WORKDIR)/inc/svx/lastrun.mk
+	echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+		-p svx \
+		 -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all)
 endif
 
 .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean
 $(WORKDIR)/inc/svx/globlmn.hrc_clean :
-    rm -f $(WORKDIR)/inc/svx/lastrun.mk \
-        $(WORKDIR)/inc/svx/globlmn.hrc
+	rm -f $(WORKDIR)/inc/svx/lastrun.mk \
+		$(WORKDIR)/inc/svx/globlmn.hrc
 
 
 # vim: set noet sw=4 ts=4:

test/testoo/source/testcase/SayHelloToOO.java

-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-package testcase;
-
-import static org.junit.Assert.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import testlib.CalcUtil;
-import testlib.Log;
-
-/**
- * Before running the testing class, you need specify the AOO location firstly with system property openoffice.home.
- *
- * @author test
- *
- */
-public class SayHelloToOO {
-
-    /**
-     * TestCapture helps us to do
-     * 1. Take a screenshot when failure occurs.
-     * 2. Collect extra data when OpenOffice crashes.
-     */
-    @Rule
-    public Log LOG = new Log();
-
-
-    /**
-     * Do some setup task before running test
-     * @throws Exception
-     */
-    @Before
-    public void setUp() throws Exception {
-        //Start OpenOffice
-        app.start();
-    }
-
-    /**
-     * Clean task after testing
-     * @throws Exception
-     */
-    @After
-    public void tearDown() throws Exception {
-        //Close OpenOffice
-        app.close();
-    }
-
-    /**
-     * Implement the case
-     */
-    @Test
-    public void helloOO() {
-        startcenter.menuItem("File->New->Spreadsheet").select();
-        calc.waitForExistence(10, 3);
-        typeKeys("Hello");
-        assertEquals("Assert", "Hello", CalcUtil.getCellInput("A1"));
-    }
-
-}

test/testoo/source/testcase/SmokeTest.java

-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-package testcase;
-
-import static org.junit.Assert.*;
-import static org.openoffice.test.common.FileUtil.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
-
-import java.io.File;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import testlib.Log;
-
-public class SmokeTest {
-
-    @Rule
-    public Log LOG = new Log();
-
-    File smoketestOutput;
-
-    @Before
-    public void setUp() throws Exception {
-        app.getOpenOffice().cleanUserInstallation();
-        app.start();
-        smoketestOutput = new File(oo.getUserInstallation(), "user/temp");
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        app.close();
-    }
-
-    @Test
-    public void testMacro() {
-        testFile("TestExtension.oxt");
-        String file = testFile("smoketestdoc.sxw");
-        // Open sample file smoketestdoc.sxw
-        app.dispatch(".uno:Open", 3);
-        submitOpenDlg(file);
-        writer.waitForEnabled(10, 2);
-        // Run test cases
-        app.dispatch("vnd.sun.star.script:Standard.Global.StartTestWithDefaultOptions?language=Basic&location=document", 120);
-        String smoketestlog = readFileAsString(new File(smoketestOutput, "smoketest.log"));
-        String testclosurelog = readFileAsString(new File(smoketestOutput, "testclosure.log"));
-        LOG.info(smoketestlog + "\n" + testclosurelog);
-        assertTrue("No Error", !smoketestlog.contains("error") && !testclosurelog.contains("error"));
-
-    }
-}

test/testoo/source/testsuite/BVT.java

-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-package testsuite;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-import testcase.BVTFileType;
-import testcase.BVTFunction;
-import testcase.SmokeTest;
-
-@RunWith(Suite.class)
-@SuiteClasses({SmokeTest.class, BVTFileType.class, BVTFunction.class})
-public class BVT {
-
-}

tools/StaticLibrary_ooopathutils.mk

@@ -26,7 +26,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils))
 $(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
-    tools/source/misc/pathutils \
+	tools/source/misc/pathutils \
 ))
 
 
@@ -38,7 +38,7 @@ $(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1)
 $$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils)))
 
 $(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils)
-    $$(call gb_Deliver_deliver,$$<,$$@)
+	$$(call gb_Deliver_deliver,$$<,$$@)
 
 endef