Stephan Bergmann
811769f009
...as emsdk 5.0.3 deprecated the predefined EMSCRIPTEN macro (see <https://github.com/emscripten-core/emscripten/commit/506052bd8b4e23ded7f2351c62ca3b24d40c8cf3> "Warn about usage of deprecated EMSCRIPTEN macro. NFC (#26381)"), causing failures like > In file included from static/source/unoembindhelpers/PrimaryBindings.cxx:29: > In file included from include/sfx2/viewsh.hxx:35: > In file included from include/editeng/outliner.hxx:32: > In file included from include/tools/color.hxx:26: > include/osl/endian.h:66:15: error: macro 'EMSCRIPTEN' has been marked as deprecated: use __EMSCRIPTEN__ instead [-Werror,-Wdeprecated-pragma] > 66 | #elif defined EMSCRIPTEN > | ^ > /home/sberg/emsdk/5.0.4/emsdk/emscripten/main/cache/sysroot/include/emscripten/emscripten.h:35:66: note: macro marked 'deprecated' here > 35 | #pragma clang deprecated(EMSCRIPTEN, "use __EMSCRIPTEN__ instead") > | ^ To avoid confusion, also suppress the -D$(OS) in solenv/gbuild/platform/unxgcc.mk that would unnecessarily keep defining EMSCRIPTEN. Change-Id: Ic1f187cf1c6417cd95d4092e9cea01a665bd1b2f Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/34 Reviewed-by: Michael Stahl <michael.stahl@collabora.com> Tested-by: Jenkins CPCI <releng@collaboraoffice.com> (cherry picked from commit 50291c2ed83bdb49bb827a4a12905d94b8c42035) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205167 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
95 lines
3.2 KiB
C++
95 lines
3.2 KiB
C++
/* -*- 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/config.h>
|
|
|
|
#if defined(LINUX)
|
|
# include <stdio.h>
|
|
#endif
|
|
#if defined(__FreeBSD__)
|
|
# include <sys/utsname.h>
|
|
#endif
|
|
#if defined(__EMSCRIPTEN__)
|
|
#include <emscripten/version.h>
|
|
#endif
|
|
|
|
#include <config_features.h>
|
|
#if HAVE_FEATURE_OPENGL
|
|
#include <vcl/opengl/OpenGLContext.hxx>
|
|
#endif
|
|
#include <unx/geninst.h>
|
|
#include <o3tl/string_view.hxx>
|
|
|
|
SalGenericInstance::~SalGenericInstance()
|
|
{
|
|
}
|
|
|
|
OUString SalGenericInstance::getOSVersion()
|
|
{
|
|
OUString aKernelVer = u"unknown"_ustr;
|
|
#if defined(LINUX)
|
|
FILE* pVersion = fopen( "/proc/version", "r" );
|
|
if ( pVersion )
|
|
{
|
|
char aVerBuffer[512];
|
|
if ( fgets ( aVerBuffer, 511, pVersion ) )
|
|
{
|
|
aKernelVer = OUString::createFromAscii( aVerBuffer );
|
|
// "Linux version 3.16.7-29-desktop ..."
|
|
std::u16string_view aVers = o3tl::getToken(aKernelVer, 2, ' ' );
|
|
// "3.16.7-29-desktop ..."
|
|
size_t nTooDetailed = aVers.find( '.', 2);
|
|
if (nTooDetailed < 1 || nTooDetailed > 8)
|
|
aKernelVer = "Linux (misparsed version)";
|
|
else // "3.16.7-29-desktop ..."
|
|
aKernelVer = OUString::Concat("Linux ") + aVers.substr(0, nTooDetailed);
|
|
}
|
|
fclose( pVersion );
|
|
}
|
|
#elif defined(__FreeBSD__)
|
|
struct utsname stName;
|
|
if ( uname( &stName ) != 0 )
|
|
return aKernelVer;
|
|
|
|
sal_Int32 nDots = 0;
|
|
sal_Int32 nIndex = 0;
|
|
aKernelVer = OUString::createFromAscii( stName.release );
|
|
while ( nIndex++ < aKernelVer.getLength() )
|
|
{
|
|
const char c = stName.release[ nIndex ];
|
|
if ( c == ' ' || c == '-' || ( c == '.' && nDots++ > 0 ) )
|
|
break;
|
|
}
|
|
aKernelVer = OUString::createFromAscii(stName.sysname) + " " + aKernelVer.copy(0, nIndex);
|
|
#elif defined(__EMSCRIPTEN__)
|
|
#if defined __EMSCRIPTEN_MAJOR__
|
|
aKernelVer = u"Emscripten "_ustr + OUString::number(__EMSCRIPTEN_MAJOR__) + u"."_ustr
|
|
+ OUString::number(__EMSCRIPTEN_MINOR__) + u"."_ustr
|
|
+ OUString::number(__EMSCRIPTEN_TINY__);
|
|
#else
|
|
aKernelVer = u"Emscripten "_ustr + OUString::number(__EMSCRIPTEN_major__) + u"."_ustr
|
|
+ OUString::number(__EMSCRIPTEN_minor__) + u"."_ustr
|
|
+ OUString::number(__EMSCRIPTEN_tiny__);
|
|
#endif
|
|
#endif
|
|
return aKernelVer;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|