incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1241508 - in /incubator/ooo/trunk/main: comphelper/ framework/ sfx2/ sot/ svl/ svtools/ svx/ sw/ toolkit/ unoxml/ xmloff/
Date Tue, 07 Feb 2012 16:15:41 GMT
Author: af
Date: Tue Feb  7 16:15:40 2012
New Revision: 1241508

URL: http://svn.apache.org/viewvc?rev=1241508&view=rev
Log:
Do not add targets for junit tests when junit is disabled.

Modified:
    incubator/ooo/trunk/main/comphelper/Module_comphelper.mk
    incubator/ooo/trunk/main/framework/Module_framework.mk
    incubator/ooo/trunk/main/sfx2/Module_sfx2.mk
    incubator/ooo/trunk/main/sot/Module_sot.mk
    incubator/ooo/trunk/main/svl/Module_svl.mk
    incubator/ooo/trunk/main/svtools/Module_svtools.mk
    incubator/ooo/trunk/main/svx/Module_svx.mk
    incubator/ooo/trunk/main/sw/Module_sw.mk
    incubator/ooo/trunk/main/toolkit/Module_toolkit.mk
    incubator/ooo/trunk/main/unoxml/Module_unoxml.mk
    incubator/ooo/trunk/main/xmloff/Module_xmloff.mk

Modified: incubator/ooo/trunk/main/comphelper/Module_comphelper.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/comphelper/Module_comphelper.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/comphelper/Module_comphelper.mk (original)
+++ incubator/ooo/trunk/main/comphelper/Module_comphelper.mk Tue Feb  7 16:15:40 2012
@@ -28,8 +28,10 @@ $(eval $(call gb_Module_add_targets,comp
 	Library_comphelp \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\
 	JunitTest_comphelper_complex \
 ))
+endif
 
 # vim: set noet ts=4 sw=4:

Modified: incubator/ooo/trunk/main/framework/Module_framework.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/Module_framework.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/Module_framework.mk (original)
+++ incubator/ooo/trunk/main/framework/Module_framework.mk Tue Feb  7 16:15:40 2012
@@ -36,8 +36,11 @@ $(eval $(call gb_Module_add_targets,fram
 	Package_unotypes \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,framework,\
 	JunitTest_framework_complex \
 	JunitTest_framework_unoapi \
 ))
+endif
+
 # vim: set noet ts=4 sw=4:

Modified: incubator/ooo/trunk/main/sfx2/Module_sfx2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/Module_sfx2.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/Module_sfx2.mk (original)
+++ incubator/ooo/trunk/main/sfx2/Module_sfx2.mk Tue Feb  7 16:15:40 2012
@@ -36,10 +36,12 @@ $(eval $(call gb_Module_add_check_target
 ))
 endif
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
 	JunitTest_sfx2_complex \
 	JunitTest_sfx2_unoapi \
 ))
+endif
 
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
 $(eval $(call gb_Module_add_targets,sfx2,\

Modified: incubator/ooo/trunk/main/sot/Module_sot.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sot/Module_sot.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sot/Module_sot.mk (original)
+++ incubator/ooo/trunk/main/sot/Module_sot.mk Tue Feb  7 16:15:40 2012
@@ -28,7 +28,9 @@ $(eval $(call gb_Module_add_targets,sot,
     Library_sot \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sot,\
 	JunitTest_sot_complex \
 ))
+endif
 

Modified: incubator/ooo/trunk/main/svl/Module_svl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svl/Module_svl.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svl/Module_svl.mk (original)
+++ incubator/ooo/trunk/main/svl/Module_svl.mk Tue Feb  7 16:15:40 2012
@@ -31,9 +31,11 @@ $(eval $(call gb_Module_add_targets,svl,
 	Package_inc \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,svl,\
 	JunitTest_svl_complex \
 ))
+endif
 
 #todo: dde platform dependent
 #todo: package_inc

Modified: incubator/ooo/trunk/main/svtools/Module_svtools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/Module_svtools.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/Module_svtools.mk (original)
+++ incubator/ooo/trunk/main/svtools/Module_svtools.mk Tue Feb  7 16:15:40 2012
@@ -33,9 +33,11 @@ $(eval $(call gb_Module_add_targets,svto
 	Package_inc \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\
 	JunitTest_svtools_unoapi \
 ))
+endif
 
 #todo: javapatchres
 #todo: jpeg on mac in svtools/util/makefile.mk

Modified: incubator/ooo/trunk/main/svx/Module_svx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/Module_svx.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/Module_svx.mk (original)
+++ incubator/ooo/trunk/main/svx/Module_svx.mk Tue Feb  7 16:15:40 2012
@@ -36,9 +36,11 @@ $(eval $(call gb_Module_add_targets,svx,
 	Package_sdi \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
 	JunitTest_svx_unoapi \
 ))
+endif
 
 #todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
 #todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?

Modified: incubator/ooo/trunk/main/sw/Module_sw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/Module_sw.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/Module_sw.mk (original)
+++ incubator/ooo/trunk/main/sw/Module_sw.mk Tue Feb  7 16:15:40 2012
@@ -36,9 +36,11 @@ $(eval $(call gb_Module_add_targets,sw,\
 ))
 
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
 	JunitTest_sw_complex \
 	JunitTest_sw_unoapi \
 ))
+endif
 
 # vim: set noet ts=4 sw=4:

Modified: incubator/ooo/trunk/main/toolkit/Module_toolkit.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/Module_toolkit.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/Module_toolkit.mk (original)
+++ incubator/ooo/trunk/main/toolkit/Module_toolkit.mk Tue Feb  7 16:15:40 2012
@@ -31,9 +31,11 @@ $(eval $(call gb_Module_add_targets,tool
 	Package_util \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
 	JunitTest_toolkit_complex \
 	JunitTest_toolkit_unoapi \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/trunk/main/unoxml/Module_unoxml.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unoxml/Module_unoxml.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unoxml/Module_unoxml.mk (original)
+++ incubator/ooo/trunk/main/unoxml/Module_unoxml.mk Tue Feb  7 16:15:40 2012
@@ -28,9 +28,11 @@ $(eval $(call gb_Module_add_targets,unox
 	Library_unordf \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,unoxml,\
 	JunitTest_unoxml_complex \
 	JunitTest_unordf_complex \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/trunk/main/xmloff/Module_xmloff.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmloff/Module_xmloff.mk?rev=1241508&r1=1241507&r2=1241508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmloff/Module_xmloff.mk (original)
+++ incubator/ooo/trunk/main/xmloff/Module_xmloff.mk Tue Feb  7 16:15:40 2012
@@ -30,9 +30,11 @@ $(eval $(call gb_Module_add_targets,xmlo
 	Package_inc \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
 	JunitTest_xmloff_unoapi \
 ))
+endif
 
 #todo: map file
 #todo: xmlkywd.lib - built, but never used?!



Mime
View raw message