diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | connectivity/Jar_ConnectivityTools.mk | 2 | ||||
| -rw-r--r-- | javaunohelper/JunitTest_juh.mk | 2 | ||||
| -rw-r--r-- | jurt/JunitTest_java_remote.mk | 2 | ||||
| -rw-r--r-- | jurt/JunitTest_uno.mk | 2 | ||||
| -rw-r--r-- | qadevOOo/Jar_OOoRunnerLight.mk | 140 | ||||
| -rw-r--r-- | qadevOOo/Module_qadevOOo.mk | 1 | ||||
| -rw-r--r-- | ridljar/JunitTest_util.mk | 2 |
8 files changed, 5 insertions, 147 deletions
diff --git a/Repository.mk b/Repository.mk index d84dc6de020c..58fee03e67ae 100644 --- a/Repository.mk +++ b/Repository.mk @@ -800,7 +800,6 @@ $(eval $(call gb_Helper_register_jars,NONE,\ Highlight \ MemoryUsage \ OOoRunner \ - OOoRunnerLight \ TestExtension \ test \ test-tools \ diff --git a/connectivity/Jar_ConnectivityTools.mk b/connectivity/Jar_ConnectivityTools.mk index ccc6c16746e2..e398d7372ef0 100644 --- a/connectivity/Jar_ConnectivityTools.mk +++ b/connectivity/Jar_ConnectivityTools.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Jar_use_jars,ConnectivityTools,\ jurt \ juh \ java_uno \ - OOoRunnerLight \ + OOoRunner \ )) $(eval $(call gb_Jar_set_packageroot,ConnectivityTools,connectivity)) diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk index 214589d36a6d..22aff54608d6 100644 --- a/javaunohelper/JunitTest_juh.mk +++ b/javaunohelper/JunitTest_juh.mk @@ -15,7 +15,7 @@ $(eval $(call gb_JunitTest_set_defs,juh,\ )) $(eval $(call gb_JunitTest_use_jars,juh,\ - OOoRunnerLight \ + OOoRunner \ ridl \ jurt \ )) diff --git a/jurt/JunitTest_java_remote.mk b/jurt/JunitTest_java_remote.mk index 6ea59b6abdf3..defa35abf76d 100644 --- a/jurt/JunitTest_java_remote.mk +++ b/jurt/JunitTest_java_remote.mk @@ -10,7 +10,7 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_java_remote)) $(eval $(call gb_JunitTest_use_jars,jurt_java_remote,\ - OOoRunnerLight \ + OOoRunner \ ridl \ )) diff --git a/jurt/JunitTest_uno.mk b/jurt/JunitTest_uno.mk index c6570cf2d5c3..3af341eb15d3 100644 --- a/jurt/JunitTest_uno.mk +++ b/jurt/JunitTest_uno.mk @@ -10,7 +10,7 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_uno)) $(eval $(call gb_JunitTest_use_jars,jurt_uno,\ - OOoRunnerLight \ + OOoRunner \ ridl \ )) diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk deleted file mode 100644 index 3fcdd35e10ab..000000000000 --- a/qadevOOo/Jar_OOoRunnerLight.mk +++ /dev/null @@ -1,140 +0,0 @@ -# -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# - -#force debug information for OOoRunnerLight -gb_JavaClassSet_JAVACDEBUG := -g - -$(eval $(call gb_Jar_Jar,OOoRunnerLight)) - -$(eval $(call gb_Jar_add_manifest_classpath,OOoRunnerLight,\ - ridl.jar \ - unoil.jar \ -)) - -$(eval $(call gb_Jar_set_manifest,OOoRunnerLight,$(SRCDIR)/qadevOOo/runner/manifest)) - -$(eval $(call gb_Jar_use_jars,OOoRunnerLight,\ - ridl \ - unoil \ - jurt \ - juh \ - java_uno \ -)) - -$(eval $(call gb_Jar_set_packageroot,OOoRunnerLight,\ - base \ - complexlib \ - convwatch \ - graphical \ - helper \ - lib \ - org \ - share \ - stats \ - util \ -)) - -$(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\ - qadevOOo/runner/base/java_complex \ - qadevOOo/runner/base/java_fat \ - qadevOOo/runner/base/java_fat_service \ - qadevOOo/runner/base/TestBase \ - qadevOOo/runner/complexlib/Assurance \ - qadevOOo/runner/complexlib/ComplexTestCase \ - qadevOOo/runner/complexlib/MethodThread \ - qadevOOo/runner/complexlib/ShowTargets \ - qadevOOo/runner/convwatch/DB \ - qadevOOo/runner/convwatch/DBHelper \ - qadevOOo/runner/convwatch/GlobalLogWriter \ - qadevOOo/runner/graphical/FileHelper \ - qadevOOo/runner/helper/APIDescGetter \ - qadevOOo/runner/helper/AppProvider \ - qadevOOo/runner/helper/BuildEnvTools \ - qadevOOo/runner/helper/CfgParser \ - qadevOOo/runner/helper/ClParser \ - qadevOOo/runner/helper/ComplexDescGetter \ - qadevOOo/runner/helper/ConfigHelper \ - qadevOOo/runner/helper/ConfigurationRead \ - qadevOOo/runner/helper/ContextMenuInterceptor \ - qadevOOo/runner/helper/CwsDataExchangeImpl \ - qadevOOo/runner/helper/FileTools \ - qadevOOo/runner/helper/LoggingThread \ - qadevOOo/runner/helper/OfficeProvider \ - qadevOOo/runner/helper/OfficeWatcher \ - qadevOOo/runner/helper/OSHelper \ - qadevOOo/runner/helper/ParameterNotFoundException \ - qadevOOo/runner/helper/ProcessHandler \ - qadevOOo/runner/helper/PropertyHandlerFactroy \ - qadevOOo/runner/helper/PropertyHandlerImpl \ - qadevOOo/runner/helper/StreamSimulator \ - qadevOOo/runner/helper/StringHelper \ - qadevOOo/runner/helper/UnoProvider \ - qadevOOo/runner/helper/URLHelper \ - qadevOOo/runner/helper/WindowListener \ - qadevOOo/runner/lib/DynamicClassLoader \ - qadevOOo/runner/lib/ExceptionStatus \ - qadevOOo/runner/lib/MultiMethodTest \ - qadevOOo/runner/lib/MultiPropertyTest \ - qadevOOo/runner/lib/SimpleStatus \ - qadevOOo/runner/lib/Status \ - qadevOOo/runner/lib/StatusException \ - qadevOOo/runner/lib/TestCase \ - qadevOOo/runner/lib/TestEnvironment \ - qadevOOo/runner/lib/TestParameters \ - qadevOOo/runner/lib/TestResult \ - qadevOOo/runner/org/openoffice/Runner \ - qadevOOo/runner/org/openoffice/RunnerService \ - qadevOOo/runner/share/ComplexTest \ - qadevOOo/runner/share/DescEntry \ - qadevOOo/runner/share/DescGetter \ - qadevOOo/runner/share/LogWriter \ - qadevOOo/runner/share/Watcher \ - qadevOOo/runner/stats/InternalLogWriter \ - qadevOOo/runner/stats/OutProducerFactory \ - qadevOOo/runner/stats/SimpleLogWriter \ - qadevOOo/runner/stats/SimpleOutProducer \ - qadevOOo/runner/stats/Summarizer \ - qadevOOo/runner/util/AccessibilityTools \ - qadevOOo/runner/util/BookmarkDsc \ - qadevOOo/runner/util/CalcTools \ - qadevOOo/runner/util/db/DatabaseDocument \ - qadevOOo/runner/util/db/DataSource \ - qadevOOo/runner/util/db/DataSourceDescriptor \ - qadevOOo/runner/util/dbg \ - qadevOOo/runner/util/DBTools \ - qadevOOo/runner/util/DefaultDsc \ - qadevOOo/runner/util/DesktopTools \ - qadevOOo/runner/util/DrawTools \ - qadevOOo/runner/util/DynamicClassLoader \ - qadevOOo/runner/util/FootnoteDsc \ - qadevOOo/runner/util/FormTools \ - qadevOOo/runner/util/FrameDsc \ - qadevOOo/runner/util/InstCreator \ - qadevOOo/runner/util/InstDescr \ - qadevOOo/runner/util/ParagraphDsc \ - qadevOOo/runner/util/PropertyName \ - qadevOOo/runner/util/RegistryTools \ - qadevOOo/runner/util/ShapeDsc \ - qadevOOo/runner/util/SOfficeFactory \ - qadevOOo/runner/util/SysUtils \ - qadevOOo/runner/util/TableDsc \ - qadevOOo/runner/util/TextSectionDsc \ - qadevOOo/runner/util/UITools \ - qadevOOo/runner/util/utils \ - qadevOOo/runner/util/ValueChanger \ - qadevOOo/runner/util/ValueComparer \ - qadevOOo/runner/util/WaitUnreachable \ - qadevOOo/runner/util/WriterTools \ - qadevOOo/runner/util/XInstCreator \ - qadevOOo/runner/util/XLayerHandlerImpl \ - qadevOOo/runner/util/XLayerImpl \ - qadevOOo/runner/util/XMLTools \ - qadevOOo/runner/util/XSchemaHandlerImpl \ -)) diff --git a/qadevOOo/Module_qadevOOo.mk b/qadevOOo/Module_qadevOOo.mk index 142d2d04d917..3093a18de0cd 100644 --- a/qadevOOo/Module_qadevOOo.mk +++ b/qadevOOo/Module_qadevOOo.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,qadevOOo)) ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,qadevOOo,\ - Jar_OOoRunnerLight \ Jar_OOoRunner \ )) endif diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk index a50f6cdf975b..3286b384a5a1 100644 --- a/ridljar/JunitTest_util.mk +++ b/ridljar/JunitTest_util.mk @@ -10,7 +10,7 @@ $(eval $(call gb_JunitTest_JunitTest,ridljar_util)) $(eval $(call gb_JunitTest_use_jars,ridljar_util,\ - OOoRunnerLight \ + OOoRunner \ ridl \ )) |