[Libreoffice-commits] core.git: 2 commits - sc/Library_scqahelper.mk sc/Module_sc.mk

[Matúš Kukan]

 sc/Library_scqahelper.mk |    2 -
 sc/Module_sc.mk          |   83 +++++++++++++++++++++++------------------------
 2 files changed, 42 insertions(+), 43 deletions(-)

New commits:
commit 86a1d732b3812d6040ce3e60558a8dd8017e42f8
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Nov 17 18:32:38 2015 +0100

    Be consistent in using tabs at least here
    
    Change-Id: I961516d92abd693c19efe8a051e35ae5192ef7d2

diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk
index a91d2c0..3cfd6d4 100644
--- a/sc/Library_scqahelper.mk
+++ b/sc/Library_scqahelper.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\
 	comphelper \
 	cppu \
 	cppuhelper \
-    editeng \
+	editeng \
 	for \
 	sal \
 	sc \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 99dabe9..1d802f9 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -39,61 +39,61 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
-    Library_scqahelper \
+	Library_scqahelper \
 	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
 		CppunitTest_sc_ucalc) \
-    CppunitTest_sc_filters_test \
-    CppunitTest_sc_rangelst_test \
-    CppunitTest_sc_core \
+	CppunitTest_sc_filters_test \
+	CppunitTest_sc_rangelst_test \
+	CppunitTest_sc_core \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sc, \
-    CppunitTest_sc_condformats \
-    CppunitTest_sc_new_cond_format_api \
-    CppunitTest_sc_subsequent_filters_test \
-    CppunitTest_sc_subsequent_export_test \
-    CppunitTest_sc_bugfix_test \
-    CppunitTest_sc_html_export_test \
-    CppunitTest_sc_opencl_test \
-    CppunitTest_sc_copypaste \
+	CppunitTest_sc_condformats \
+	CppunitTest_sc_new_cond_format_api \
+	CppunitTest_sc_subsequent_filters_test \
+	CppunitTest_sc_subsequent_export_test \
+	CppunitTest_sc_bugfix_test \
+	CppunitTest_sc_html_export_test \
+	CppunitTest_sc_opencl_test \
+	CppunitTest_sc_copypaste \
 ))
 
 # Disabled to allow the check tinderbox execute the sd tests
 # CppunitTest_sc_chart_regression_test \
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
-    JunitTest_sc_complex \
-    JunitTest_sc_unoapi_1 \
-    JunitTest_sc_unoapi_2 \
-    JunitTest_sc_unoapi_3 \
-    JunitTest_sc_unoapi_4 \
-    JunitTest_sc_unoapi_5 \
-    JunitTest_sc_unoapi_6 \
-    JunitTest_sc_unoapi_7 \
-    CppunitTest_sc_annotationshapeobj \
-    CppunitTest_sc_outlineobj \
-    CppunitTest_sc_styleloaderobj \
-    CppunitTest_sc_recordchanges \
-    CppunitTest_sc_annotationobj \
-    CppunitTest_sc_annotationsobj \
-    CppunitTest_sc_cellrangeobj \
-    $(if $(filter-out $(OS),IOS), \
-            CppunitTest_sc_databaserangeobj) \
-    CppunitTest_sc_datapilottableobj \
-    CppunitTest_sc_datapilotfieldobj \
-    CppunitTest_sc_macros_test \
-    CppunitTest_sc_namedrangeobj \
-    CppunitTest_sc_namedrangesobj \
-    CppunitTest_sc_tablesheetobj \
-    CppunitTest_sc_tablesheetsobj \
-    CppunitTest_sc_editfieldobj_cell \
-    CppunitTest_sc_editfieldobj_header \
-    CppunitTest_sc_modelobj \
+	JunitTest_sc_complex \
+	JunitTest_sc_unoapi_1 \
+	JunitTest_sc_unoapi_2 \
+	JunitTest_sc_unoapi_3 \
+	JunitTest_sc_unoapi_4 \
+	JunitTest_sc_unoapi_5 \
+	JunitTest_sc_unoapi_6 \
+	JunitTest_sc_unoapi_7 \
+	CppunitTest_sc_annotationshapeobj \
+	CppunitTest_sc_outlineobj \
+	CppunitTest_sc_styleloaderobj \
+	CppunitTest_sc_recordchanges \
+	CppunitTest_sc_annotationobj \
+	CppunitTest_sc_annotationsobj \
+	CppunitTest_sc_cellrangeobj \
+	$(if $(filter-out $(OS),IOS), \
+		CppunitTest_sc_databaserangeobj) \
+	CppunitTest_sc_datapilottableobj \
+	CppunitTest_sc_datapilotfieldobj \
+	CppunitTest_sc_macros_test \
+	CppunitTest_sc_namedrangeobj \
+	CppunitTest_sc_namedrangesobj \
+	CppunitTest_sc_tablesheetobj \
+	CppunitTest_sc_tablesheetsobj \
+	CppunitTest_sc_editfieldobj_cell \
+	CppunitTest_sc_editfieldobj_header \
+	CppunitTest_sc_modelobj \
 ))
 
 $(eval $(call gb_Module_add_perfcheck_targets,sc,\
-    CppunitTest_sc_perfobj \
-    CppunitTest_sc_tablesheetobj \
+	CppunitTest_sc_perfobj \
+	CppunitTest_sc_tablesheetobj \
 ))
 
 
commit 02edab32d9cc1ee5403e3946d53d66838f03ae0e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Nov 17 18:28:13 2015 +0100

    There is no need for this broken 'if' here
    
    Change-Id: I10f926af9ca19252878b9b6e20365c38c885ce83

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 02f41e1..99dabe9 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
-	$(if $(filter $(BUILD_TYPE),$(DESKTOP)),, \
-		Library_scqahelper) \
+    Library_scqahelper \
 	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
 		CppunitTest_sc_ucalc) \
     CppunitTest_sc_filters_test \