diff options
author | August Sodora <augsod@gmail.com> | 2011-12-05 17:15:34 -0500 |
---|---|---|
committer | August Sodora <augsod@gmail.com> | 2011-12-05 17:16:45 -0500 |
commit | f58ae13e8a0794295ddf35d50c37299d06d4ea28 (patch) | |
tree | e340552558490fa242b59ff21b699ac236e3d0d1 | |
parent | 5f49389c742c2ff642ee886eb816b2959c596ff6 (diff) |
Prevent the testtool from building
-rw-r--r-- | Module_tail_build.mk | 2 | ||||
-rw-r--r-- | Repository.mk | 2 | ||||
-rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
-rw-r--r-- | basic/AllLangResTarget_stt.mk | 49 | ||||
-rw-r--r-- | basic/Module_basic.mk | 2 | ||||
-rw-r--r-- | basic/StaticLibrary_app.mk | 61 | ||||
-rw-r--r-- | scp2/prj/build.lst | 3 | ||||
-rw-r--r-- | scp2/source/testtool/file_testtool.scp | 53 | ||||
-rw-r--r-- | scp2/source/testtool/makefile.mk | 48 | ||||
-rw-r--r-- | scp2/source/testtool/module_testtool.scp | 37 | ||||
-rw-r--r-- | scp2/source/testtool/module_testtool.ulf | 32 | ||||
-rw-r--r-- | scp2/util/makefile.mk | 2 |
12 files changed, 1 insertions, 291 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 97c437277c3e..dd320a8e808a 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Module_Module,tail_end)) $(eval $(call gb_Module_add_moduledirs,tail_end,\ animations \ - automation \ basctl \ bean \ chart2 \ @@ -54,7 +53,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ starmath \ sw \ swext \ - testautomation \ unoxml \ uui \ vbahelper \ diff --git a/Repository.mk b/Repository.mk index 5fab1b55f8db..e17dc0efe8b4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \ $(eval $(call gb_Helper_register_executables,OOO, \ spadmin.bin \ - testtool \ )) ifeq ($(OS),WNT) @@ -367,7 +366,6 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ )) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - app \ basegfx_s \ dtobj \ libeay32 \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index e7049f7ec322..edfd9b9cd2cb 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ svx \ sw \ swext \ - testautomation \ twain \ toolkit \ tools \ diff --git a/basic/AllLangResTarget_stt.mk b/basic/AllLangResTarget_stt.mk deleted file mode 100644 index 417729a419af..000000000000 --- a/basic/AllLangResTarget_stt.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,stt)) - -$(eval $(call gb_AllLangResTarget_add_srs,stt,\ - stt/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,stt/res)) - -$(eval $(call gb_SrsTarget_set_include,stt/res,\ - $$(INCLUDE) \ -)) - -$(eval $(call gb_SrsTarget_add_files,stt/res,\ - basic/source/app/basic.src \ - basic/source/app/basmsg.src \ - basic/source/app/svtmsg.src \ - basic/source/app/testtool.src \ - basic/source/app/ttmsg.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk index 885a0c0353d7..58ac0354cb6c 100644 --- a/basic/Module_basic.mk +++ b/basic/Module_basic.mk @@ -30,10 +30,8 @@ $(eval $(call gb_Module_Module,basic)) $(eval $(call gb_Module_add_targets,basic,\ AllLangResTarget_sb \ - AllLangResTarget_stt \ Library_sb \ Package_inc \ - StaticLibrary_app \ StaticLibrary_sample \ )) diff --git a/basic/StaticLibrary_app.mk b/basic/StaticLibrary_app.mk deleted file mode 100644 index 38d721b275d5..000000000000 --- a/basic/StaticLibrary_app.mk +++ /dev/null @@ -1,61 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_StaticLibrary_StaticLibrary,app)) - -$(eval $(call gb_StaticLibrary_add_package_headers,app,basic_inc)) - -$(eval $(call gb_StaticLibrary_set_include,app,\ - $$(INCLUDE) \ - -I$(realpath $(SRCDIR)/basic/inc) \ - -I$(realpath $(SRCDIR)/basic/source/inc) \ -)) - -$(eval $(call gb_StaticLibrary_add_api,app,\ - udkapi \ - offapi \ -)) - -$(eval $(call gb_StaticLibrary_add_exception_objects,app,\ - basic/source/app/appbased \ - basic/source/app/app \ - basic/source/app/appedit \ - basic/source/app/apperror \ - basic/source/app/appwin \ - basic/source/app/basicrt \ - basic/source/app/brkpnts \ - basic/source/app/dialogs \ - basic/source/app/msgedit \ - basic/source/app/mybasic \ - basic/source/app/process \ - basic/source/app/processw \ - basic/source/app/status \ - basic/source/app/textedit \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index 083461558fcd..b26c07d798ba 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -20,11 +20,10 @@ cp scp2\source\python nmake - all cp_python cp_langmacros c cp scp2\source\quickstart nmake - all cp_quickstart cp_langmacros cp_langtemplates NULL cp scp2\source\sdkoo nmake - all cp_sdkoo cp_langmacros cp_langtemplates NULL cp scp2\source\smoketest nmake - all cp_smoketest cp_langmacros cp_langtemplates NULL -cp scp2\source\testtool nmake - all cp_testtool cp_langmacros cp_langtemplates NULL cp scp2\source\writer nmake - all cp_writer cp_langmacros cp_langtemplates NULL cp scp2\source\base nmake - all cp_base cp_langmacros cp_langtemplates NULL cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacros cp_langtemplates NULL cp scp2\source\winexplorerext nmake - all cp_winexplorerext cp_langmacros cp_langtemplates NULL cp scp2\source\onlineupdate nmake - all cp_update cp_langmacros cp_langtemplates NULL cp scp2\source\accessories nmake - all cp_accessories cp_langmacros NULL -cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_smoketest cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL +cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_smoketest cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp deleted file mode 100644 index 703de8ff39da..000000000000 --- a/scp2/source/testtool/file_testtool.scp +++ /dev/null @@ -1,53 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -STD_LIB_FILE( gid_File_Lib_Communi, communi ) -STD_LIB_FILE( gid_File_Lib_Simplecm, simplecm ) - -File gid_File_Bin_Testtool - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); -#if defined WNT - Name = "testtool.exe"; -#else - Name = "testtool"; -#endif -End - -File gid_File_Config_Testtool - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); - #ifdef UNX - Name = "testtoolrc"; - #else - Name = "testtool.ini"; - #endif -End diff --git a/scp2/source/testtool/makefile.mk b/scp2/source/testtool/makefile.mk deleted file mode 100644 index debb27f20d62..000000000000 --- a/scp2/source/testtool/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=scp2 -TARGET=testtool -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -SCP_PRODUCT_TYPE=osl - -PARFILES= \ - module_testtool.par \ - file_testtool.par - -ULFFILES= \ - module_testtool.ulf - -# --- File --------------------------------------------------------- -.INCLUDE : target.mk diff --git a/scp2/source/testtool/module_testtool.scp b/scp2/source/testtool/module_testtool.scp deleted file mode 100644 index 2f4c4453f5d2..000000000000 --- a/scp2/source/testtool/module_testtool.scp +++ /dev/null @@ -1,37 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -Module gid_Module_Optional_Testtool - PackageInfo = "packinfo_office.txt"; - MOD_NAME_DESC ( MODULE_OPTIONAL_TESTTOOL ); - Sortkey = "650"; - ParentID = gid_Module_Optional; - Default = NO; - Files = (gid_File_Bin_Testtool, gid_File_Lib_Communi, gid_File_Lib_Simplecm, gid_File_Hid_Testtool, gid_File_Config_Testtool); -End diff --git a/scp2/source/testtool/module_testtool.ulf b/scp2/source/testtool/module_testtool.ulf deleted file mode 100644 index 8d219eaab541..000000000000 --- a/scp2/source/testtool/module_testtool.ulf +++ /dev/null @@ -1,32 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -[STR_NAME_MODULE_OPTIONAL_TESTTOOL] -en-US = "Testtool" - -[STR_DESC_MODULE_OPTIONAL_TESTTOOL] -en-US = "Testtool" diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 5d22a7097640..47b48a06b67d 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -79,8 +79,6 @@ SCP1FILES = installation_ooo.par \ module_extensions_lightproof.par \ directory_extensions.par \ file_extensions.par \ - module_testtool.par \ - file_testtool.par \ module_xsltfilter.par \ file_xsltfilter.par \ module_python.par \ |