|author||Stephan Bergmann <firstname.lastname@example.org>||2013-10-18 12:45:00 +0200|
|committer||Stephan Bergmann <email@example.com>||2013-10-18 14:44:47 +0200|
Remove *_Test product, so cppunittester can be NONE again
...as per #libreoffice-dev IRC: Sep 19 10:32:24 <mst__> sberg, moggi why the hell is that thing named "cppunit/cppunittester" and inside a subdir? it's obstructing my attempt to put it in $(INSTDIR)/program Sep 19 10:33:28 <mst__> (... and if you wonder "wtf does it have to do with INSTDIR" you have never heard of awesome LibreOffice_Test installset.... not that i would know who needs it :) Sep 19 10:36:36 <sberg> mst__, it is in a subdir of solver/*/bin so that on Windows it would not accidentally have picked DLLs next to itself instead of the module-local DLLs it was supposed to test (back when we had module-local output trees) Sep 19 10:37:02 <mst__> sberg, ahh hysteric reasons then, /me renames it Sep 19 10:37:55 <tml> mst__, if nobody you know uses LibreOffice_Test, just kill it? Sep 19 10:38:59 <sberg> mst__, tml, LibreOffice_Test was conceived by pmladek and/or kendy, IIRC Sep 19 10:40:31 * kendy does not remember anything about it :-) Sep 19 10:42:17 <sberg> wasn't that something so users (or QA people?) could easily run the smoketest against an installation, to see whether the installation is any good at all, by installing that LibreOffice_Test alongside the installation proper? Sep 19 10:43:26 <sberg> mst__, ...and I'd unscientifically vote to kill it Sep 19 11:34:23 <pmladek> mst__, sberg: I have created the LibreOffice_Test package for one QA guy. He does not longer work on LO. I am not sure if anyone else started to use it. So, I think that it can be killed. Oct 17 18:18:07 <tml_> sberg: have you ever noticed that when you try to actually run instdir/unxmacxi/LibreOfficeDev.app , the system actually tries to run cppunittester inside the app bundle (it says so in the crash report) (it crashes because cppunittester requires a specialized DYLIB_LIBRARY_PATH apparently) Oct 17 18:19:29 <tml_> I suspect that the system when cppunittester as part of the build process is run from inside instdir (i.e. inside an app bundle) the system "caches" this false knowledge, and thinks that the executable of the app bundle is cppunittester... Oct 17 18:19:36 <sberg> tml_, no, never noticed; with "run instdir/unxmacxi/LibreOfficeDev.app" you mean calling "open instdir/unxmacxi/LibreOfficeDev.app"? (I always call .app/Contenst/MacOS/program explicitly) Oct 17 18:19:52 <tml_> yes, I mean "open instdir/..." Oct 17 18:20:53 <tml_> some googling tells me that at least years ago, the CFBundleExecutable key in the Info.plist is ignored if it is manually changed, so I guess similar caching of mapping between an app bundle and which executable to actually run happens in this case Oct 17 18:23:17 <tml_> and last year somebody even claims "And while on Mountain Lion, CFBundleExecutable seems to be a no-op", which would be odd, surely there must be widely used apps that have several executables inside the MacOS directory; how would the system know which one to run when the app is run? Oct 17 18:24:38 <tml_> hmm, apparently the code that handles this might be open source even, http://www.opensource.apple.com/source/CF/CF-744.18/CFBundle.c Oct 17 18:25:52 <tml_> some mention of "caches" there yes, my guesses might be right Oct 17 18:27:05 <tml_> if I cp -R instdir/unxmacxi/LibreOffice.app foo.app and open foo.app, it works fine Oct 17 18:28:33 <tml_> anyway, I guess it would be cleaner to have cppunittester somewhere else even without this problem Oct 17 18:37:09 <sberg> tml_, yes, IIRC having cppunittester in instdir was a misguided mst decision, because that odd LibreOffice_Test product (that pmladek said nobody needs any longer anyway) includes it; I think consensus was to kill LibreOffice_Test and move cppunittester where all the other NONE executables are, but looks like nobody executed Oct 17 18:37:55 <tml_> ah ok, so mst should know what needs to be done? good, no need for me to try to hack this now then Oct 17 18:38:19 <sberg> tml_, I'll do the cleanup tomorrow, unless somebody beats me This removes smoketest/losmoketest et al along with the *_Test product, as they seem to not make sense without it anyway. smoketest/Executable_libtest.mk appears to be a test that could also be run during the build, and only ended up in the *_Test product by accident, so I left it untouched for now. Change-Id: I8024472c909fe0a885eb08ef4d3777f8a9e1f7c8
Diffstat (limited to 'setup_native')
2 files changed, 0 insertions, 36 deletions
diff --git a/setup_native/Package_packinfo.mk b/setup_native/Package_packinfo.mk
index 945d3dc2e87e..d0678105508e 100644
@@ -25,7 +25,6 @@ $(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office.txt,
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_help.txt,packinfo_office_help.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_lang.txt,packinfo_office_lang.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_sdkoo.txt,packinfo_sdkoo.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_test.txt,packinfo_test.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_ure.txt,packinfo_ure.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/shellscripts.txt,shellscripts.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/shellscripts_core01.txt,shellscripts_core01.txt))
diff --git a/setup_native/source/packinfo/packinfo_test.txt b/setup_native/source/packinfo/packinfo_test.txt
deleted file mode 100644
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-# 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/.
-# This file incorporates work covered by the following license notice:
-# 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 .
-module = "gid_Module_Root_Smoketest"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-smoketest"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-smoketest"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01 %PACKAGEVERSION %PACKAGEVERSION"
-copyright = "2012 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "LibreOffice %PRODUCTVERSION Smoketest"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */