diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-14 16:11:09 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-15 21:32:37 +0200 |
commit | 1f2a635ae159b62ab3a0dcbf7d460484f83ff77b (patch) | |
tree | 62a2f2e9c70ba2ebcb9cad710e863abf0514cde3 | |
parent | 9555b5bdb9ce2251bb8c4f967f20ed1b13eecf5e (diff) |
clean executables in Repository.mk
..so that no executable in gb_Helper_register_executables,NONE is installed
(except cppunittester from scp2/source/smoketest/)
and all others are installed.
Also remove unused officeloader executable.
Change-Id: I1726afc4d9d6848bca7fa07ebce3acd340777e8a
-rw-r--r-- | Repository.mk | 33 | ||||
-rw-r--r-- | desktop/Executable_officeloader.mk | 26 | ||||
-rw-r--r-- | desktop/Module_desktop.mk | 4 | ||||
-rw-r--r-- | desktop/unx/source/officeloader/officeloader.cxx | 100 |
4 files changed, 14 insertions, 149 deletions
diff --git a/Repository.mk b/Repository.mk index ac049f3e8650..7ee8588628b0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -25,7 +25,10 @@ $(eval $(call gb_Helper_register_executables,NONE, \ concat-deps \ cpp \ cppunit/cppunittester \ - $(call gb_Helper_optional,CRASHREP,crashrep) \ + $(if $(filter MSC,$(COM)), \ + gcc-wrapper \ + g++-wrapper \ + ) \ gencoll_rule \ genconv_dict \ gendict \ @@ -54,23 +57,20 @@ $(eval $(call gb_Helper_register_executables,NONE, \ stringex \ transex3 \ treex \ - $(if $(filter UCPP,$(BUILD_TYPE)),ucpp) \ uiex \ ulfex \ - $(call gb_Helper_optional,ODK,unoapploader) \ - xpdfimport \ xrmex \ )) $(eval $(call gb_Helper_register_executables,SDK, \ - idlc \ - $(if $(filter-out IOS,$(OS)), \ - climaker \ - cppumaker \ - javamaker \ - regcompare \ - uno-skeletonmaker \ - ) \ + $(if $(filter MSC,$(COM)),climaker) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),cppumaker) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),idlc) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),javamaker) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),regcompare) \ + $(if $(filter UCPP,$(BUILD_TYPE)),ucpp) \ + $(if $(filter ODK,$(BUILD_TYPE)),unoapploader) \ + $(if $(filter ODK,$(BUILD_TYPE)),uno-skeletonmaker) \ )) $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ @@ -78,9 +78,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ )) $(eval $(call gb_Helper_register_executables,OOO, \ + $(call gb_Helper_optional,CRASHREP,crashrep) \ gnome-open-url.bin \ $(if $(filter YES,$(ENABLE_NPAPI_INTO_BROWSER)),nsplugin) \ - $(if $(filter MACOSX,$(OS)),officeloader) \ $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ $(if $(filter YES,$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \ $(if $(filter-out WNT,$(OS)),soffice.bin) \ @@ -94,14 +94,10 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ) \ ui-previewer \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg.bin) \ + xpdfimport \ $(if $(filter WNT,$(OS)), \ crashrep_com \ - gcc-wrapper \ - g++-wrapper \ - guiloader \ - guistdio \ odbcconfig \ - officeloader \ pyuno/python \ quickstart \ sbase \ @@ -118,7 +114,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \ unopkg \ unopkg_bin \ unopkg_com \ - unopkgio \ ) \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk deleted file mode 100644 index 27a078e01d63..000000000000 --- a/desktop/Executable_officeloader.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Executable_Executable,officeloader)) - -$(eval $(call gb_Executable_use_libraries,officeloader,\ - sal \ - $(gb_UWINAPI) \ -)) - -# I'm not suer wht was the intent, but that break the link -#$(eval $(call gb_Executable_set_ldflags,officeloader,\ -# $(filter -bind_at_load,$$(LDFLAGS)) \ -#)) - -$(eval $(call gb_Executable_add_noexception_objects,officeloader,\ - desktop/unx/source/officeloader/officeloader \ -)) - -# vim: set ts=4 sw=4 et: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 2d322aa41d9a..05ff062c7c56 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -98,10 +98,6 @@ $(eval $(call gb_Module_add_targets,desktop,\ else ifeq ($(OS),MACOSX) -$(eval $(call gb_Module_add_targets,desktop,\ - Executable_officeloader \ -)) - else ifeq ($(OS),ANDROID) else ifeq ($(OS),IOS) diff --git a/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx deleted file mode 100644 index 4a62385359bc..000000000000 --- a/desktop/unx/source/officeloader/officeloader.cxx +++ /dev/null @@ -1,100 +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 . - */ - - -#include <sal/main.h> -#include <osl/process.h> -#include <rtl/ustring.hxx> - -#include "../../../source/inc/exithelper.h" - - -SAL_IMPLEMENT_MAIN() -{ - oslProcess process; - oslProcessError error; - - OUString sExecutableFile; - rtl_uString **pCommandArgs; - sal_uInt32 nCommandArgs; - - osl_getExecutableFile( &sExecutableFile.pData ); - - sExecutableFile += ".bin"; - - nCommandArgs = osl_getCommandArgCount(); - pCommandArgs = new rtl_uString *[nCommandArgs]; - - for ( sal_uInt32 i = 0; i < nCommandArgs; i++ ) - { - pCommandArgs[i] = NULL; - osl_getCommandArg( i, &pCommandArgs[i] ); - } - - bool bRestart = false; - bool bFirstRun = true; - oslProcessExitCode exitcode = 255; - - do { - error = osl_executeProcess( - sExecutableFile.pData, - bFirstRun ? pCommandArgs : NULL, - bFirstRun ? nCommandArgs : 0, - 0, - NULL, - NULL, - NULL, - 0, - &process - ); - - if ( osl_Process_E_None == error ) - { - oslProcessInfo info; - - info.Size = sizeof(info); - - error = osl_joinProcess( process ); - if ( osl_Process_E_None != error ) - break; - - error = osl_getProcessInfo( process, osl_Process_EXITCODE, &info ); - if ( osl_Process_E_None != error ) - break; - - if ( info.Fields & osl_Process_EXITCODE ) - { - exitcode = info.Code; - bRestart = (EXITHELPER_CRASH_WITH_RESTART == exitcode || EXITHELPER_NORMAL_RESTART == exitcode); - } - else - break; - - osl_freeProcessHandle( process ); - - } - - bFirstRun = false; - - } while ( bRestart ); - - return exitcode; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |