mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
06e81f5783c96ea3d07ecbc11e2085ff41adcff0
libreoffice/cli_ure/Library_cli_cppuhelper_native.mk

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

52 lines
1.3 KiB
Makefile
Raw Normal View History

gbuildize cli_ure Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-07-29 11:49:31 +02:00
# -*- 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/.
#
fix warnings in cli_ure Change-Id: I4e081473612403e0bf277e8dbf5f1b9a15541dd7
2012-10-21 19:08:03 -04:00
include $(SRCDIR)/cli_ure/version/version.txt
fdo#55290: use the right native library name It turns out that the native library cannot be renamed after creation. The right name must be used from the beginning, otherwise publishing is failing with the follow error (gacutil -i): "Failure adding assembly to the cache: Invalid file or assembly name. The name of the file must be the name of the assembly plus .dll or .exe." To rectify that create the native lib as cli_cppuhelper.dll, rename the signed assembly to assembly/cli_cppuhelper.dll and teach scp2 to pick up the right one: assembly/cli_cppuhelper.dll (and not cli_cppuhelper.dll). Change-Id: I2073b617cd440865ae4ab838bb801329f2b07194
2012-10-28 21:20:14 +01:00
$(eval $(call gb_Library_Assembly,cli_cppuhelper))
gbuildize cli_ure Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-07-29 11:49:31 +02:00
fdo#55290: use the right native library name It turns out that the native library cannot be renamed after creation. The right name must be used from the beginning, otherwise publishing is failing with the follow error (gacutil -i): "Failure adding assembly to the cache: Invalid file or assembly name. The name of the file must be the name of the assembly plus .dll or .exe." To rectify that create the native lib as cli_cppuhelper.dll, rename the signed assembly to assembly/cli_cppuhelper.dll and teach scp2 to pick up the right one: assembly/cli_cppuhelper.dll (and not cli_cppuhelper.dll). Change-Id: I2073b617cd440865ae4ab838bb801329f2b07194
2012-10-28 21:20:14 +01:00
$(eval $(call gb_Library_add_ldflags,cli_cppuhelper,\
fix warnings in cli_ure Change-Id: I4e081473612403e0bf277e8dbf5f1b9a15541dd7
2012-10-21 19:08:03 -04:00
-ignore:4248 \
gbuild, cli_ure: Win32 make issues with back and forward slashes It looks like what works is to give the source file names with backslashes but everything else with forward slashes? Change-Id: Iaf910ab5fc41984d1315a30b164a334d28344c16
2014-06-02 00:44:38 +02:00
-keyfile:$(SRCDIR)/cli_ure/source/cliuno.snk \
fix warnings in cli_ure Change-Id: I4e081473612403e0bf277e8dbf5f1b9a15541dd7
2012-10-21 19:08:03 -04:00
))
fdo#55290: use the right native library name It turns out that the native library cannot be renamed after creation. The right name must be used from the beginning, otherwise publishing is failing with the follow error (gacutil -i): "Failure adding assembly to the cache: Invalid file or assembly name. The name of the file must be the name of the assembly plus .dll or .exe." To rectify that create the native lib as cli_cppuhelper.dll, rename the signed assembly to assembly/cli_cppuhelper.dll and teach scp2 to pick up the right one: assembly/cli_cppuhelper.dll (and not cli_cppuhelper.dll). Change-Id: I2073b617cd440865ae4ab838bb801329f2b07194
2012-10-28 21:20:14 +01:00
$(eval $(call gb_Library_add_ldflags,cli_cppuhelper,\
cli_ure: cleanup in Library_cli_cppuhelper_native Change-Id: I76b4815208354e78eb3575982235b6f26f1e02fd
2013-09-21 01:36:56 +02:00
-delayload:$(call gb_Library_get_filename,cppuhelper) \
-delayload:$(call gb_Library_get_filename,cppu) \
-delayload:$(call gb_Library_get_filename,sal) \
gbuildize cli_ure Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-07-29 11:49:31 +02:00
))
fdo#55290: use the right native library name It turns out that the native library cannot be renamed after creation. The right name must be used from the beginning, otherwise publishing is failing with the follow error (gacutil -i): "Failure adding assembly to the cache: Invalid file or assembly name. The name of the file must be the name of the assembly plus .dll or .exe." To rectify that create the native lib as cli_cppuhelper.dll, rename the signed assembly to assembly/cli_cppuhelper.dll and teach scp2 to pick up the right one: assembly/cli_cppuhelper.dll (and not cli_cppuhelper.dll). Change-Id: I2073b617cd440865ae4ab838bb801329f2b07194
2012-10-28 21:20:14 +01:00
$(eval $(call gb_Library_use_internal_bootstrap_api,cli_cppuhelper,\
gbuildize cli_ure Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-07-29 11:49:31 +02:00
udkapi \
))
fdo#55290: use the right native library name It turns out that the native library cannot be renamed after creation. The right name must be used from the beginning, otherwise publishing is failing with the follow error (gacutil -i): "Failure adding assembly to the cache: Invalid file or assembly name. The name of the file must be the name of the assembly plus .dll or .exe." To rectify that create the native lib as cli_cppuhelper.dll, rename the signed assembly to assembly/cli_cppuhelper.dll and teach scp2 to pick up the right one: assembly/cli_cppuhelper.dll (and not cli_cppuhelper.dll). Change-Id: I2073b617cd440865ae4ab838bb801329f2b07194
2012-10-28 21:20:14 +01:00
$(eval $(call gb_Library_use_libraries,cli_cppuhelper,\
gbuildize cli_ure Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-07-29 11:49:31 +02:00
cppu \
cppuhelper \
gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT: add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d
2012-09-28 15:31:46 +02:00
sal \
))
fdo#55290: use the right native library name It turns out that the native library cannot be renamed after creation. The right name must be used from the beginning, otherwise publishing is failing with the follow error (gacutil -i): "Failure adding assembly to the cache: Invalid file or assembly name. The name of the file must be the name of the assembly plus .dll or .exe." To rectify that create the native lib as cli_cppuhelper.dll, rename the signed assembly to assembly/cli_cppuhelper.dll and teach scp2 to pick up the right one: assembly/cli_cppuhelper.dll (and not cli_cppuhelper.dll). Change-Id: I2073b617cd440865ae4ab838bb801329f2b07194
2012-10-28 21:20:14 +01:00
$(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper,\
gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT: add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d
2012-09-28 15:31:46 +02:00
advapi32 \
gbuildize cli_ure Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-07-29 11:49:31 +02:00
delayimp \
mscoree \
cli_ure: remove obsolete USE_DEBUG_RUNTIME check for msvcmrt This is handled in com_MSC_class.mk now. Change-Id: I5e4c2e791e9acd623d7c5ce352b5c39b6cb939b4
2013-04-18 20:27:05 +02:00
msvcmrt \
gbuildize cli_ure Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-07-29 11:49:31 +02:00
))
When building with clang-cl on Windows, build CLR code with MSVC ...as clang-cl doesn't support the /clr switch. * In configure.ac, capture the MSCV version (that would be used if CC hadn't been overridden to use clang-cl) into MSVC_CXX. * The logic which flags to pass into gb_CObject__command_pattern is coded into the platform-agnostic LinkTarget.mk, so it's too late to try and filter all relevant flags in com_GCC_class.mk, depending on whether a given .cxx file is a normal one built with the normal $CXX or a special /clr one built with $MSVC_CXX. Thus, a new CxxClrObject class had to be introduced that captures this information early. * When building with clang-cl, the generated config_host/config_*.h files contain values suitable for clang-cl, but not for MSVC. But the .cxx files compiled with MSVC happen to include config_global.h, and would fail. Hack around that problem for now by introducing a hard-coded, minimal solenv/clang-cl/config_global.h that is found first when buliding such a CxxClrObject. Needs cleaning-up properly. Change-Id: Iff8aac51c0b4fa906b14503c692640dda0996d33 Reviewed-on: https://gerrit.libreoffice.org/34509 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-20 16:28:06 +01:00
$(eval $(call gb_Library_add_cxxclrobjects,cli_cppuhelper,\
gbuildize cli_ure Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-07-29 11:49:31 +02:00
cli_ure/source/native/native_bootstrap \
cli_ure/source/native/path \
))
When building with clang-cl on Windows, build CLR code with MSVC ...as clang-cl doesn't support the /clr switch. * In configure.ac, capture the MSCV version (that would be used if CC hadn't been overridden to use clang-cl) into MSVC_CXX. * The logic which flags to pass into gb_CObject__command_pattern is coded into the platform-agnostic LinkTarget.mk, so it's too late to try and filter all relevant flags in com_GCC_class.mk, depending on whether a given .cxx file is a normal one built with the normal $CXX or a special /clr one built with $MSVC_CXX. Thus, a new CxxClrObject class had to be introduced that captures this information early. * When building with clang-cl, the generated config_host/config_*.h files contain values suitable for clang-cl, but not for MSVC. But the .cxx files compiled with MSVC happen to include config_global.h, and would fail. Hack around that problem for now by introducing a hard-coded, minimal solenv/clang-cl/config_global.h that is found first when buliding such a CxxClrObject. Needs cleaning-up properly. Change-Id: Iff8aac51c0b4fa906b14503c692640dda0996d33 Reviewed-on: https://gerrit.libreoffice.org/34509 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-20 16:28:06 +01:00
$(eval $(call gb_Library_add_generated_cxxclrobjects,cli_cppuhelper,\
gbuildize cli_ure Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-07-29 11:49:31 +02:00
CustomTarget/cli_ure/source/native/assembly \
))
# vim: set noet sw=4 ts=4:
Reference in New Issue Copy Permalink