Repository.mk | 44 ++++------
RepositoryExternal.mk | 25 -----
RepositoryFixes.mk | 10 ++
cpputools/Module_cpputools.mk | 6 -
cpputools/Package_bin.mk | 15 ---
desktop/Executable_officeloader.mk | 26 -----
desktop/Module_desktop.mk | 4
desktop/unx/source/officeloader/officeloader.cxx | 100 -----------------------
scp2/AutoInstall.mk | 2
scp2/inc/macros.inc | 8 +
scp2/source/ooo/file_ooo.scp | 11 --
scp2/source/ooo/module_hidden_ooo.scp | 1
scp2/source/ooo/ure.scp | 22 -----
scp2/source/sdkoo/module_sdkoo.scp | 47 ----------
scp2/source/sdkoo/module_sdkoo.ulf | 23 -----
scp2/source/smoketest/module_smoketest.scp | 30 ------
scp2/source/smoketest/module_smoketest.ulf | 16 ---
scp2/source/stdlibs/file_stdlibs.scp | 39 --------
scp2/source/stdlibs/module_stdlibs.scp | 24 -----
scp2/source/stdlibs/module_stdlibs.ulf | 13 --
solenv/gbuild/AutoInstall.mk | 2
solenv/gbuild/Executable.mk | 42 ++-------
solenv/gbuild/ExternalExecutable.mk | 4
solenv/gbuild/Gallery.mk | 4
solenv/gbuild/Helper.mk | 11 ++
solenv/gbuild/TargetLocations.mk | 17 ++-
solenv/gbuild/extensions/pre_BuildTools.mk | 9 --
svx/Executable_gengal.bin.mk | 25 ++---
28 files changed, 94 insertions(+), 486 deletions(-)
New commits:
commit 03420d69e2149d2d8b64eeb1ae36411348c9d297
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Jun 14 23:49:54 2013 +0200
scp2: remove unused files
Change-Id: I86d836be85c5d2a2412d5cca2b3a84a2590141ac
diff --git a/scp2/source/sdkoo/module_sdkoo.scp
b/scp2/source/sdkoo/module_sdkoo.scp
deleted file mode 100644
index 86a4182..0000000
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ /dev/null
@@ -1,47 +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/.
- *
- * 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 "macros.inc"
-
-Module gid_Module_Optional_Sdkoo
- PackageInfo = "packinfo_office.txt";
- MOD_NAME_DESC ( MODULE_OPTIONAL_SDKOO );
- Sortkey = "630";
- ParentID = gid_Module_Optional;
- Default = NO;
- Files = (
- gid_File_Package_odk_bin,
- gid_File_Package_odk_cli,
- gid_File_Package_odk_config,
- gid_File_Package_odk_config_win,
- gid_File_Package_odk_config_notwin,
- gid_File_Package_odk_docs,
- gid_File_Package_odk_html,
- gid_File_Package_odk_javadoc,
- gid_File_Package_odk_lib,
- gid_File_Package_odk_macosx,
- gid_File_Package_odk_settings,
- gid_File_Package_odk_settings_generated,
- gid_File_Package_odk_unowinreg,
- gid_File_Zip_doxygen,
- gid_File_Zip_Odkexamples,
- gid_File_Zip_OdkIdl_udkapi,
- gid_File_Zip_OdkIdl_offapi,
- gid_File_Zip_uno_loader_classes
- );
-End
diff --git a/scp2/source/sdkoo/module_sdkoo.ulf
b/scp2/source/sdkoo/module_sdkoo.ulf
deleted file mode 100644
index cf24cbd..0000000
--- a/scp2/source/sdkoo/module_sdkoo.ulf
+++ /dev/null
@@ -1,23 +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/.
- *
- * 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 .
- */
-
-[STR_NAME_MODULE_OPTIONAL_SDKOO]
-en-US = "Software Development Kit (SDK)"
-
-[STR_DESC_MODULE_OPTIONAL_SDKOO]
-en-US = "The SDK provides all necessary tools, examples and documentation to
program with and for the office."
diff --git a/scp2/source/smoketest/module_smoketest.scp
b/scp2/source/smoketest/module_smoketest.scp
deleted file mode 100644
index 7495e7d..0000000
--- a/scp2/source/smoketest/module_smoketest.scp
+++ /dev/null
@@ -1,30 +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/.
- */
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Smoketest
- PackageInfo = "packinfo_test.txt";
- MOD_NAME_DESC ( MODULE_OPTIONAL_SMOKETEST );
- Sortkey = "630";
- ParentID = gid_Module_Optional;
- Default = NO;
- Files = (gid_Test_File_Txt_License,
- gid_Test_File_Txt_Readme,
- gid_Test_File_Misc_Smoketestdoc,
- gid_Test_File_Bin_LOSmoketest,
- gid_Test_File_Exe_Cppunittester,
- gid_Test_File_Lib_Cppunit,
- gid_Test_File_Lib_Smoketest,
- gid_Test_File_Lib_Test,
- gid_Test_File_Lib_Unotest,
- gid_Test_File_Lib_Unoexceptionprotector);
-End
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/smoketest/module_smoketest.ulf
b/scp2/source/smoketest/module_smoketest.ulf
deleted file mode 100644
index 49f7206..0000000
--- a/scp2/source/smoketest/module_smoketest.ulf
+++ /dev/null
@@ -1,16 +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/.
- */
-
-[STR_NAME_MODULE_OPTIONAL_SMOKETEST]
-en-US = "%PRODUCTNAME %PRODUCTVERSION Smoketest"
-
-[STR_DESC_MODULE_OPTIONAL_SMOKETEST]
-en-US = "The smoketest of %PRODUCTNAME %PRODUCTVERSION"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/stdlibs/file_stdlibs.scp
b/scp2/source/stdlibs/file_stdlibs.scp
deleted file mode 100644
index 9a92188..0000000
--- a/scp2/source/stdlibs/file_stdlibs.scp
+++ /dev/null
@@ -1,39 +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/.
- */
-
-#include "macros.inc"
-
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
- || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) ||
defined(DRAGONFLY))
-File gid_File_Dl_GccS
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#ifdef AIX
- Name = "libgcc_s.a";
-#else
- Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
-End
-#endif
-
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
- || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) ||
defined(DRAGONFLY))
-File gid_File_Dl_Stdcpp
- Dir = SCP2_URE_DL_DIR;
- LIB_FILE_BODY;
-#ifdef AIX
- Name = "libstdc++.a";
-#else
- Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
-End
-#endif
diff --git a/scp2/source/stdlibs/module_stdlibs.scp
b/scp2/source/stdlibs/module_stdlibs.scp
deleted file mode 100644
index 9bb86a7..0000000
--- a/scp2/source/stdlibs/module_stdlibs.scp
+++ /dev/null
@@ -1,24 +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/.
- */
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Stdlibs
- ParentID = gid_Module_Root;
- Default = NO;
- PackageInfo = "packinfo_ure.txt";
- MOD_NAME_DESC(MODULE_OPTIONAL_STDLIBS);
- Styles = ();
- Files = (
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
- || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) ||
defined(DRAGONFLY))
- gid_File_Dl_GccS,
- gid_File_Dl_Stdcpp
-#endif
- );
-End
diff --git a/scp2/source/stdlibs/module_stdlibs.ulf
b/scp2/source/stdlibs/module_stdlibs.ulf
deleted file mode 100644
index a0a80ca..0000000
--- a/scp2/source/stdlibs/module_stdlibs.ulf
+++ /dev/null
@@ -1,13 +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/.
- */
-
-[STR_NAME_MODULE_OPTIONAL_STDLIBS]
-en-US = "Standard Compiler Libraries"
-
-[STR_DESC_MODULE_OPTIONAL_STDLIBS]
-en-US = "libstdc++ and libgcc_s for too old Linux systems."
commit 6e2d870fccb5f0c311e0e7e908d1b7cf30bd7455
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Jun 14 22:06:09 2013 +0200
gbuild: add gb_Helper_install and use it for Executables
It's simpler than creating a package for every executable.
Change-Id: I5f853ef2d5574b1a1c65232d1d09bc307c46f67e
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 06541dd..7611ea3 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -23,9 +23,9 @@
# gb_Executable_Executable_platform
# NOTE: SDKBIN executables are already packaged in module odk
-gb_Executable_LAYER_DIRS := \
- OOO:program \
- UREBIN:ure/bin
+gb_Executable_LAYER_DIRS = \
+ OOO:$(gb_Package_PROGRAMDIRNAME) \
+ UREBIN:ure/bin
$(dir $(call gb_Executable_get_runtime_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
@@ -43,10 +43,10 @@ $(call gb_Executable_get_clean_target,%) :
$(call gb_Executable_get_runtime_target,$*) \
$(AUXTARGETS))
-gb_Executable_get_packagename = Executable/$(1)
-
-gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter
$(1):%,$(gb_Executable_LAYER_DIRS)))
-gb_Executable__get_instdir = $(call gb_Executable__get_dir_for_layer,$(call
gb_Executable_get_layer,$(1)))
+gb_Executable__get_dir_for_layer = $(patsubst $(1):%,$(INSTDIR)/%,$(filter
$(1):%,$(call gb_Executable_LAYER_DIRS)))
+gb_Executable__get_dir_for_exe = $(call
gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1)))
+gb_Executable__get_instdir = $(call
gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1))
+gb_Executable_get_install_target = $(if $(call
gb_Executable__get_dir_for_exe,$(1)),$(call gb_Executable__get_instdir,$(1)))
define gb_Executable_Executable
$(call gb_Postprocess_register_target,AllExecutables,Executable,$(1))
@@ -67,33 +67,16 @@ $(call gb_Executable_get_target,$(1)) : $(call
gb_LinkTarget_get_target,$(2)) \
$(call gb_Executable_get_runtime_target,$(1)) :| $(dir $(call
gb_Executable_get_runtime_target,$(1))).dir
$(call gb_Executable_get_runtime_target,$(1)) : $(call
gb_Executable_get_target_for_build,$(1))
$(call gb_Executable_get_clean_target,$(1)) : $(call
gb_LinkTarget_get_clean_target,$(2))
-$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
+$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call
gb_Executable_get_install_target,$(1))
$(call gb_Executable_Executable_platform,$(1),$(2))
-ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(if $(filter $(call
gb_Executable_get_layer,$(1)):%,$(gb_Executable_LAYER_DIRS)),\
- $(call gb_Executable__Executable_package,$(1),$(call
gb_Executable_get_packagename,$(1)),$(2),$(notdir $(call
gb_Executable_get_target,$(1)))) \
-)
-endif
-
+$(call gb_Helper_install,Executable,$(1),$(call gb_LinkTarget_get_target,$(2)))
$$(eval $$(call gb_Module_register_target,$(call
gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Executable)
$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call
gb_LinkTarget_get_target,$(2)),$(1))
endef
-# gb_Executable__Executable_package executable package linktarget filename
-define gb_Executable__Executable_package
-$(call gb_Package_Package_internal,$(2),$(WORKDIR))
-$(call gb_Package_set_outdir,$(2),$(INSTDIR))
-$(call gb_Package_add_file,$(2),$(call
gb_Executable__get_instdir,$(1))/$(4),$(subst $(WORKDIR)/,,$(call
gb_LinkTarget_get_target,$(3))))
-
-$(call gb_Executable_get_target,$(1)) :| $(call gb_Package_get_target,$(2))
-$(call gb_Package_get_target,$(2)) : $(call gb_LinkTarget_get_target,$(3))
-$(call gb_Executable_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target,$(2))
-
-endef
-
define gb_Executable_set_targettype_gui
$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(1)))
: TARGETGUI := $(2)
endef
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index cb51f50..b017a40 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -201,6 +201,17 @@ define gb_Helper_execute
$(call gb_Executable_get_command,$(firstword $(1))) $(wordlist 2,$(words
$(1)),$(1))
endef
+# define gb_Helper_install class instance-name target-to-install
+define gb_Helper_install
+ifneq (,$(call gb_$(1)_get_install_target,$(2)))
+$(call gb_$(1)_get_target,$(2)) :| $(call gb_$(1)_get_install_target,$(2))
+$(call gb_$(1)_get_install_target,$(2)) : $(3) \
+ | $(dir $(call gb_$(1)_get_install_target,$(2))).dir
+$(call gb_Deliver_add_deliverable,$(call
gb_$(1)_get_install_target,$(2)),$(3),$(2))
+endif
+
+endef
+
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker
need to use
# for libraries from the OUTDIR
commit 1f2a635ae159b62ab3a0dcbf7d460484f83ff77b
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Jun 14 16:11:09 2013 +0200
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
diff --git a/Repository.mk b/Repository.mk
index ac049f3..7ee8588 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 27a078e..0000000
--- 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 2d322aa..05ff062 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 4a62385..0000000
--- 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: */
commit 9555b5bdb9ce2251bb8c4f967f20ed1b13eecf5e
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Jun 14 12:48:20 2013 +0200
Add gengal to RepositoryFixes and autoinstall it.
Change-Id: I935fb9fd2620447f9aba9142b7db896e6fe31133
diff --git a/Repository.mk b/Repository.mk
index 93952d2..ac049f3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -73,8 +73,11 @@ $(eval $(call gb_Helper_register_executables,SDK, \
) \
))
+$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),gengal) \
+))
+
$(eval $(call gb_Helper_register_executables,OOO, \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),gengal.bin) \
gnome-open-url.bin \
$(if $(filter YES,$(ENABLE_NPAPI_INTO_BROWSER)),nsplugin) \
$(if $(filter MACOSX,$(OS)),officeloader) \
@@ -93,7 +96,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg.bin) \
$(if $(filter WNT,$(OS)), \
crashrep_com \
- gengal \
gcc-wrapper \
g++-wrapper \
guiloader \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e70c3f9..88724b4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2805,7 +2805,7 @@ endef
# Better duplication with gb_Gallery__UNO_COMPONENTS than nothing.
# This is used to determine what we need for 'build' platform.
-define gb_Executable__register_gengal_impl
+define gb_Executable__register_gengal
$(call gb_Executable_add_runtime_dependencies,$(1),\
$(foreach component, \
comphelper/util/comphelp \
@@ -2836,12 +2836,6 @@ $(call gb_Executable_add_runtime_dependencies,$(1),\
)
endef
-ifeq ($(OS),WNT)
-gb_Executable__register_gengal = $(call
gb_Executable__register_gengal_impl,gengal)
-else
-gb_Executable__register_gengal.bin = $(call
gb_Executable__register_gengal_impl,gengal.bin)
-endif
-
ifneq ($(SYSTEM_ICU),YES)
define gb_Executable__register_gendict
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 030384a..3452f67 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -23,6 +23,7 @@ gb_Executable_FILENAMES := $(foreach
group,$(gb_Executable_VALIDGROUPS),\
$(foreach
exe,$(gb_Executable_$(group)),$(exe):$(exe)$(gb_Executable_EXT)))
gb_Executable_FILENAMES := $(patsubst
uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
+gb_Executable_FILENAMES := $(patsubst
gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES_FOR_BUILD := $(subst
$(gb_Executable_EXT),$(gb_Executable_EXT_for_build),$(gb_Executable_FILENAMES))
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 3dfb56a2..66edd78 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -17,7 +17,7 @@ $(eval $(call
gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 99f0d98..86b4b546 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -453,6 +453,14 @@ End
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
End
+#define LIBO_EXECUTABLE(id,name) \
+ File id \
+ BIN_FILE_BODY; \
+ Dir = gid_Brand_Dir_Program; \
+ Name = name; \
+ Styles = (PACKED); \
+ End
+
#define GALLERY_NAME(id) \
#define GALLERY_FILELIST(id) \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a191c49..256636d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -128,17 +128,6 @@ File gid_File_Exe_Nsplugin
End
#endif
-File gid_File_Bin_Gengal
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Styles = (PACKED);
- #ifdef UNX
- Name = "gengal.bin";
- #else
- Name = "gengal.exe";
- #endif
-End
-
File gid_File_Bin_UIPreviewer
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index bc3eda5..52894dd 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -84,7 +84,6 @@ Module gid_Module_Root_Files_2
Files = (gid_File_shell_scripts,
gid_File_Bin_Pluginapp,
gid_File_Bin_Senddoc,
- gid_File_Bin_Gengal,
gid_File_Script_Gengal,
gid_File_Bin_Spadmin_Bin,
gid_File_Bin_Uri_Encode,
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index e240892..928ba92 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if
$(ENABLE_HEADLESS),, \
SAL_USE_VCLPLUGIN=svp \
)) \
- $(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
+ $(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
--destdir $(GALLERY_BASEDIR) \
@@ -105,7 +105,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_Gallery_get_target,%) : \
- $(call gb_Executable_get_runtime_dependencies,$(gb_GENGAL)) \
+ $(call gb_Executable_get_runtime_dependencies,gengal) \
$(gb_Gallery_EXTRA_DEPENCENCIES)
$(call gb_Gallery__command,$@,$*)
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk
b/solenv/gbuild/extensions/pre_BuildTools.mk
index 0362c73..76d94d8 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -7,13 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-
-ifeq (,$(filter WNT,$(OS_FOR_BUILD)))
- gb_GENGAL = gengal.bin
-else # windows appends the .exe
- gb_GENGAL = gengal
-endif
-
# Tools we need to build for cross-compiling
gb_BUILD_TOOLS = \
$(foreach executable, \
@@ -44,7 +37,7 @@ gb_BUILD_TOOLS = \
ulfex \
xrmex \
$(call gb_Helper_optional_for_host,DESKTOP, \
- $(gb_GENGAL) \
+ gengal \
HelpIndexer \
HelpLinker \
) \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 7be4ace..55cc2f1 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -17,26 +17,19 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-ifeq ($(OS),WNT)
-svx_GENGALBIN := gengal
-else
-svx_GENGALBIN := gengal.bin
-endif
-
-
-$(eval $(call gb_Executable_Executable,$(svx_GENGALBIN)))
+$(eval $(call gb_Executable_Executable,gengal))
-$(eval $(call gb_Executable_set_include,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_set_include,gengal,\
$$(INCLUDE) \
-I$(SRCDIR)/svx/inc/ \
-I$(SRCDIR)/svx/inc/pch \
))
-$(eval $(call gb_Executable_use_external,$(svx_GENGALBIN),boost_headers))
+$(eval $(call gb_Executable_use_external,gengal,boost_headers))
-$(eval $(call gb_Executable_use_sdk_api,$(svx_GENGALBIN)))
+$(eval $(call gb_Executable_use_sdk_api,gengal))
-$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_use_libraries,gengal,\
basegfx \
sal \
tl \
@@ -51,16 +44,16 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Executable_add_exception_objects,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_add_exception_objects,gengal,\
svx/source/gengal/gengal \
))
-$(eval $(call gb_Executable_use_static_libraries,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_use_static_libraries,gengal,\
vclmain \
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_use_system_win32_libs,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_use_system_win32_libs,gengal,\
kernel32 \
msvcrt \
oldnames \
@@ -69,7 +62,7 @@ $(eval $(call
gb_Executable_use_system_win32_libs,$(svx_GENGALBIN),\
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_libs,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_add_libs,gengal,\
-ldl \
-lpthread \
))
commit 944f3a6c6e48f1b5532fa16ab38918b9b3f9412e
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Jun 14 12:48:20 2013 +0200
gbuild: allow to use RepositoryFixes also for executables
Helps to kill package in cpputools.
And autoinstall uno executable.
Change-Id: Ib1d546371ec8d2b06381d88eff98dbc5b70da400
diff --git a/Repository.mk b/Repository.mk
index 281987e..93952d2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -121,13 +121,11 @@ $(eval $(call gb_Helper_register_executables,OOO, \
))
$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
+ $(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter
DESKTOP,$(BUILD_TYPE))),javaldx) \
$(if $(filter-out IOS,$(OS)), \
regmerge \
regview \
) \
- $(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter
DESKTOP,$(BUILD_TYPE))),javaldx) \
-))
-$(eval $(call gb_Helper_register_executables,UREBIN,\
$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
))
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 04cda5d..030384a 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -17,6 +17,15 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+# fixes for executables
+
+gb_Executable_FILENAMES := $(foreach group,$(gb_Executable_VALIDGROUPS),\
+ $(foreach
exe,$(gb_Executable_$(group)),$(exe):$(exe)$(gb_Executable_EXT)))
+
+gb_Executable_FILENAMES := $(patsubst
uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
+
+gb_Executable_FILENAMES_FOR_BUILD := $(subst
$(gb_Executable_EXT),$(gb_Executable_EXT_for_build),$(gb_Executable_FILENAMES))
+
# fixes for all the libraries that are named with too much creativity and do
# not follow any of the established nameschemes
diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
index e0f3cad..5807e3c 100644
--- a/cpputools/Module_cpputools.mk
+++ b/cpputools/Module_cpputools.mk
@@ -19,12 +19,6 @@ $(eval $(call gb_Module_add_targets,cpputools,\
Executable_uno \
))
-ifneq ($(OS),WNT)
-$(eval $(call gb_Module_add_targets,cpputools,\
- Package_bin \
-))
-endif
-
endif
# vim:set noet sw=4 ts=4:
diff --git a/cpputools/Package_bin.mk b/cpputools/Package_bin.mk
deleted file mode 100644
index 0a5a320..0000000
--- a/cpputools/Package_bin.mk
+++ /dev/null
@@ -1,15 +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/.
-#
-
-# because the installation system is so incredibly inflexible...
-$(eval $(call gb_Package_Package,cpputools_bin,$(gb_Executable_BINDIR)))
-
-$(eval $(call gb_Package_add_file,cpputools_bin,bin/uno.bin,uno))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index b2246e8..b160218 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -65,16 +65,6 @@ End
// Public Executables:
-#if defined WNT
-File gid_File_Exe_Uno
- BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
- Name = EXENAME(uno);
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "C66A9E2B-B16D-46A9-B9EC-772D9D3837F5";
-End
-#endif
-
#ifndef WNT
Shortcut gid_Shortcut_Exe_Uno
FileID = gid_File_Exe_StartupSh;
@@ -96,16 +86,6 @@ File gid_File_Exe_StartupSh
End
#endif
-#if !defined WNT
-File gid_File_Exe_UnoBin
- BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
- Name = "uno.bin";
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "4AE33B3E-B33E-4BA4-AADC-8D7ED303FDE9";
-End
-#endif
-
// Public Dynamic Libraries:
File gid_File_Dl_Cppu
@@ -621,9 +601,7 @@ Module gid_Module_Root_Ure_Hidden
gid_File_ThirdpartylicensereadmeHtml_Ure,
gid_File_Readme_Ure,
gid_File_License_Ure,
- gid_File_Exe_Uno,
gid_File_Exe_StartupSh,
- gid_File_Exe_UnoBin,
gid_File_Dl_Cli_Uno,
gid_File_Dl_Cli_Ure_Assembly,
gid_File_Dl_Policy_Cli_Ure_Assembly,
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 518d06e..6187199 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -24,7 +24,7 @@ $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk
$(GBUILDDIR)/AutoI
$(foreach lib,$(gb_Library_MODULE_$*),\
echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call
gb_Library_get_runtime_filename,$(lib)))" >> $@;)
$(foreach exe,$(gb_Executable_MODULE_$*),\
- echo
"$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(exe)$(gb_Executable_EXT))" >> $@;)
+ echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(call
gb_Executable_get_filename,$(exe)))" >> $@;)
$(call gb_AutoInstall_get_clean_target,%) :
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 2caa7d2..06541dd 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -33,7 +33,7 @@ $(dir $(call gb_Executable_get_runtime_target,%)).dir :
$(dir $(call gb_Executable_get_runtime_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_Executable_get_runtime_target,%) : $(call
gb_Executable_get_target_for_build,%)
+$(call gb_Executable_get_runtime_target,%) :
touch $@
.PHONY : $(call gb_Executable_get_clean_target,%)
@@ -54,7 +54,7 @@ ifeq (,$$(findstring $(1),$$(gb_Executable_KNOWN)))
$$(eval $$(call gb_Output_info,Currently known executables: $(sort
$(gb_Executable_KNOWN)),ALL))
$$(eval $$(call gb_Output_error,Executable $(1) must be registered in
Repository.mk))
endif
-$(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
+$(call gb_Executable__Executable_impl,$(1),$(call
gb_Executable_get_linktargetname,$(1)))
endef
@@ -65,6 +65,7 @@ $(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS))
$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
| $(dir $(call gb_Executable_get_target,$(1))).dir
$(call gb_Executable_get_runtime_target,$(1)) :| $(dir $(call
gb_Executable_get_runtime_target,$(1))).dir
+$(call gb_Executable_get_runtime_target,$(1)) : $(call
gb_Executable_get_target_for_build,$(1))
$(call gb_Executable_get_clean_target,$(1)) : $(call
gb_LinkTarget_get_clean_target,$(2))
$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Executable_Executable_platform,$(1),$(2))
@@ -94,7 +95,7 @@ $(call gb_Executable_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target
endef
define gb_Executable_set_targettype_gui
-$(call gb_LinkTarget_get_target,Executable/$(1)$(gb_Executable_EXT)) :
TARGETGUI := $(2)
+$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(1)))
: TARGETGUI := $(2)
endef
# The auxtarget is delivered via the rule in Package.mk.
diff --git a/solenv/gbuild/ExternalExecutable.mk
b/solenv/gbuild/ExternalExecutable.mk
index c87ea26..f934b62 100644
--- a/solenv/gbuild/ExternalExecutable.mk
+++ b/solenv/gbuild/ExternalExecutable.mk
@@ -121,11 +121,11 @@ endef
# Set the executable as internal
#
# Optionally set a specific executable target to use (if the target
-# returned by gb_Executable_get_target_for_build is not suitable).
+# $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build) is not suitable).
#
# gb_ExternalExecutable_set_internal executable call?
define gb_ExternalExecutable_set_internal
-$(call gb_ExternalExecutable__set_internal,$(1),$(if $(strip $(2)),$(2),$(call
gb_Executable_get_target_for_build,$(1))))
+$(call gb_ExternalExecutable__set_internal,$(1),$(if $(strip
$(2)),$(2),$(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index e87efe3..72ec59e 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -22,8 +22,6 @@
gb_CliLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliLibrary_EXT)
gb_CliNativeLibrary_get_target =
$(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliNativeLibrary_EXT)
gb_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT)
-gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
-gb_Executable_get_target_for_build =
$(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
gb_PackagePart_get_destinations = \
$(INSTDIR) \
@@ -51,6 +49,13 @@ gb_XcuDataTarget_get_outdir_target =
$(gb_Configuration_registry)/data/$(1)
gb_XcuLangpackTarget_get_outdir_target =
$(gb_Configuration_registry)/spool/$(1)
gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
+define gb_Executable_get_target
+$(patsubst $(1):%,$(OUTDIR)/bin/%,$(filter $(1):%,$(gb_Executable_FILENAMES)))
+endef
+
+define gb_Executable_get_target_for_build
+$(patsubst $(1):%,$(OUTDIR_FOR_BUILD)/bin/%,$(filter
$(1):%,$(gb_Executable_FILENAMES_FOR_BUILD)))
+endef
define gb_Library_get_target
$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter
$(1):%,$(gb_Library_FILENAMES)))
@@ -247,6 +252,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
CustomPackage \
DescriptionTranslateTarget \
Dictionary \
+ Executable \
ExternalPackage \
Extension \
Gallery \
@@ -316,7 +322,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
CliLibrary \
CliNativeLibrary \
CliUnoApi \
- Executable \
InstallScript \
Library \
StaticLibrary \
@@ -353,6 +358,10 @@ define gb_Library_get_filename
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_FILENAMES)))
endef
+define gb_Executable_get_filename
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Executable_FILENAMES)))
+endef
+
# Get dependencies needed for running the executable
#
# This is not strictly necessary, but it makes the use more similar to
@@ -372,7 +381,7 @@ define gb_Executable_get_command
$(gb_Helper_set_ld_path) $(2) $(call gb_Executable_get_target_for_build,$(1))
endef
-gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
+gb_Executable_get_linktargetname = Executable/$(call
gb_Executable_get_filename,$(1))
gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call
gb_StaticLibrary_get_filename,$(1))
commit 7369a8cad62ba6151ba8c16c41d0005fdf87f0ec
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Jun 14 12:02:56 2013 +0200
ucpp is not an ExternalExecutable
Change-Id: Ib9a82acd375d12c6050bc5674816993ef62eaa61
diff --git a/Repository.mk b/Repository.mk
index 543275e..281987e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -693,7 +693,6 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
genccode \
gencmn \
python \
- ucpp \
xmllint \
xsltproc \
))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 777369d..e70c3f9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2852,11 +2852,13 @@ endef
endif
+ifeq (,$(SYSTEM_UCPP))
define gb_Executable__register_idlc
$(call gb_Executable_add_runtime_dependencies,idlc,\
- $(call gb_ExternalExecutable_get_dependencies,ucpp) \
+ $(call gb_Executable_get_target_for_build,ucpp) \
)
endef
+endif
define gb_Executable__register_localize
$(call gb_Executable_add_runtime_dependencies,localize,\
@@ -2922,19 +2924,6 @@ endef
endif # SYSTEM_LIBXSLT_FOR_BUILD
-ifneq (,$(SYSTEM_UCPP))
-
-gb_ExternalExecutable__register_ucpp :=
-
-else # ! SYSTEM_UCPP
-
-define gb_ExternalExecutable__register_ucpp
-$(call gb_ExternalExecutable_set_internal,ucpp)
-
-endef
-
-endif # SYSTEM_UCPP
-
ifeq (,$(PYTHON_FOR_BUILD))
define gb_ExternalExecutable__register_python
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
