From 6af55390f1ef542e408e32e9c273075a2671b81b Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 8 Oct 2015 10:43:12 +0200 Subject: Collabora Office branding (cherry picked from commit c276d5ba1491dc237812cdf3d877a4ecec2ee1dc) (cherry picked from commit c085f9176bda7bad0234d0087ff87f27086fc333) Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6 --- solenv/bin/modules/installer/download.pm | 2 +- solenv/bin/modules/installer/setupscript.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 63103816e89f..c1776053ec1e 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -290,7 +290,7 @@ sub get_downloadname_productname my $start = ""; - $start = $allvariables->{'PRODUCTNAME'}; + $start = $allvariables->{'PRODUCTNAME'}; $start =~ s/ /_/g; return $start; } diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index 6eefe01f0bd5..4a5a1003cb3e 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -166,7 +166,7 @@ sub add_lowercase_productname_setupscriptvariable $newline = "\%MASKEDPRODUCTNAME " . $value . "\n"; push(@{$variablesref} ,$newline); $value = $original; - $value =~ s/\s/\_/g; + $value =~ s/\s//g; $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n"; push(@{$variablesref} ,$newline); $newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n"; -- cgit 6-1'>distro/cib/libreoffice-6-1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/cli_ure
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-20 16:28:06 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-21 10:18:58 +0000
commit0a99b5a1b7325454fe3d1174d44354888aa22012 (patch)
tree9edc1d3cca42c07ae4767ad7ca3b150895ac5295 /cli_ure
parent0649622956431e0a1955cb80d1175025401ab5e5 (diff)
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>