[ANNOUNCEMENT] Test: cmake-3.17.3-1

[ANNOUNCEMENT] Test: cmake-3.17.3-1

[Marco Atzeri via Cygwin-announce]

To: cygwin-announce@cygwin.com
Subject: Test: cmake-3.17.3-1

Test version 3.17.3-1 of

   cmake
   cmake-doc
   cmake-gui
   emacs-cmake

are available in the Cygwin distribution.

Please report any issue or problem.
Also positive feedback in complex projects are appreciated

CHANGES
Last upstream release.

DESCRIPTION
CMake is an open-source, cross-platform family of tools
designed to build, test and package software


HOMEPAGE
http://www.cmake.org/

Marco Atzeri

If you have questions or comments, please send them to the
cygwin mailing list at: cygwin (at) cygwin (dot) com .

Re: [ANNOUNCEMENT] Test: cmake-3.17.3-1

[Lemures Lemniscati]

[-- Attachment #1: Type: text/plain, Size: 1128 bytes --]

Date: Fri, 17 Jul 2020 23:47:59 +0200
From: Marco Atzeri via Cygwin-announce <cygwin-announce@cygwin.com>

> To: cygwin-announce@cygwin.com
> Subject: Test: cmake-3.17.3-1
> 
> Test version 3.17.3-1 of
> 
>    cmake
>    cmake-doc
>    cmake-gui
>    emacs-cmake
> 
> are available in the Cygwin distribution.
> 
> Please report any issue or problem.
> Also positive feedback in complex projects are appreciated
> 

Hi!

Thank you for updating cmake.

Some errors'll occur in Source/kwsys/SystemInformation.cxx
since /proc/meminfo in Cygwin has only these fields

$ cat /proc/meminfo
MemTotal:       20824372 kB
MemFree:        13545156 kB
HighTotal:             0 kB
HighFree:              0 kB
LowTotal:       20824372 kB
LowFree:        13545156 kB
SwapTotal:       3145728 kB
SwapFree:        3131252 kB

In particular, we have no MemAvailable field in Cygwin.



I attached a patch 0001-3.17.3-cpuinfo_suppl.patch for this issue,
which should be applied after 3.17.3-cpuinfo.patch

The patch separates a case defined(__CYGWIN__) from a case defined(__linux)


Regards,

Lem

[-- Attachment #2: 0001-3.17.3-cpuinfo_suppl.patch --]
[-- Type: application/octet-stream, Size: 1399 bytes --]

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lemures Lemniscati <lemures.lemniscati@gmail.com>
Date: Sat, 18 Jul 2020 08:22:59 +0900
Subject: [PATCH] 3.17.3-cpuinfo_suppl

---
 Source/kwsys/SystemInformation.cxx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 1d070e5520..1a0cf7d0b7 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -3715,7 +3715,17 @@ SystemInformationImplementation::GetHostMemoryUsed()
   GlobalMemoryStatusEx(&statex);
   return (statex.ullTotalPhys - statex.ullAvailPhys) / 1024;
 #  endif
-#elif defined(__linux) || defined(__CYGWIN__)
+#elif defined(__CYGWIN__)
+  const char* names[3] = { "MemTotal:", "MemFree:", NULL };
+  SystemInformation::LongLong values[2] = { SystemInformation::LongLong(0) };
+  int ierr = GetFieldsFromFile("/proc/meminfo", names, values);
+  if (ierr) {
+    return ierr;
+    }
+  SystemInformation::LongLong& memTotal = values[0];
+  SystemInformation::LongLong& memFree = values[1];
+  return memTotal - memFree;
+#elif defined(__linux)
   const char* names[3] = { "MemTotal:", "MemAvailable:", NULL };
   SystemInformation::LongLong values[2] = { SystemInformation::LongLong(0) };
   int ierr = GetFieldsFromFile("/proc/meminfo", names, values);
-- 
2.27.0

Re: [ANNOUNCEMENT] Test: cmake-3.17.3-1

[Marco Atzeri]

On 18.07.2020 02:45, Lemures Lemniscati via Cygwin wrote:

> 
> Hi!
> 
> Thank you for updating cmake.
> 
> Some errors'll occur in Source/kwsys/SystemInformation.cxx
> since /proc/meminfo in Cygwin has only these fields
> 
> $ cat /proc/meminfo
> MemTotal:       20824372 kB
> MemFree:        13545156 kB
> HighTotal:             0 kB
> HighFree:              0 kB
> LowTotal:       20824372 kB
> LowFree:        13545156 kB
> SwapTotal:       3145728 kB
> SwapFree:        3131252 kB
> 
> In particular, we have no MemAvailable field in Cygwin.
> 
> 
> 
> I attached a patch 0001-3.17.3-cpuinfo_suppl.patch for this issue,
> which should be applied after 3.17.3-cpuinfo.patch
> 
> The patch separates a case defined(__CYGWIN__) from a case defined(__linux)
> 
> 
> Regards,
> 
> Lem
> 
> 

Thanks Lem

appreciated, I will add it for -2 before final release.

If you find anything else, let me know

Marco

Re: [ANNOUNCEMENT] Test: cmake-3.17.3-1

[Achim Gratz]

Lemures Lemniscati via Cygwin writes:
> Some errors'll occur in Source/kwsys/SystemInformation.cxx
> since /proc/meminfo in Cygwin has only these fields
>
> $ cat /proc/meminfo
> MemTotal:       20824372 kB
> MemFree:        13545156 kB
> HighTotal:             0 kB
> HighFree:              0 kB
> LowTotal:       20824372 kB
> LowFree:        13545156 kB
> SwapTotal:       3145728 kB
> SwapFree:        3131252 kB
>
> In particular, we have no MemAvailable field in Cygwin.
>
> I attached a patch 0001-3.17.3-cpuinfo_suppl.patch for this issue,
> which should be applied after 3.17.3-cpuinfo.patch
>
> The patch separates a case defined(__CYGWIN__) from a case defined(__linux)

I'd suggest we rather patch Cygwin to provide that field in meminfo.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Factory and User Sound Singles for Waldorf Q+, Q and microQ:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds

Re: [ANNOUNCEMENT] Test: cmake-3.17.3-1

[Marco Atzeri]

On 18.07.2020 08:14, Achim Gratz wrote:
> Lemures Lemniscati via Cygwin writes:
>> Some errors'll occur in Source/kwsys/SystemInformation.cxx
>> since /proc/meminfo in Cygwin has only these fields
>>
>> $ cat /proc/meminfo
>> MemTotal:       20824372 kB
>> MemFree:        13545156 kB
>> HighTotal:             0 kB
>> HighFree:              0 kB
>> LowTotal:       20824372 kB
>> LowFree:        13545156 kB
>> SwapTotal:       3145728 kB
>> SwapFree:        3131252 kB
>>
>> In particular, we have no MemAvailable field in Cygwin.
>>
>> I attached a patch 0001-3.17.3-cpuinfo_suppl.patch for this issue,
>> which should be applied after 3.17.3-cpuinfo.patch
>>
>> The patch separates a case defined(__CYGWIN__) from a case defined(__linux)
> 
> I'd suggest we rather patch Cygwin to provide that field in meminfo.
> 
> 
> Regards,
> Achim.


https://cygwin.com/acronyms/#PGA

I am sure Corinna will appreciate it

Re: [ANNOUNCEMENT] Test: cmake-3.17.3-1

[Lemures Lemniscati]

Date: Sat, 18 Jul 2020 07:47:40 +0200
From: Marco Atzeri via Cygwin <cygwin@cygwin.com>

> On 18.07.2020 02:45, Lemures Lemniscati via Cygwin wrote:
> 
> >
> > Hi!
> >
> > Thank you for updating cmake.
> >
> > Some errors'll occur in Source/kwsys/SystemInformation.cxx
> > since /proc/meminfo in Cygwin has only these fields
> >
> > $ cat /proc/meminfo
> > MemTotal:       20824372 kB
> > MemFree:        13545156 kB
> > HighTotal:             0 kB
> > HighFree:              0 kB
> > LowTotal:       20824372 kB
> > LowFree:        13545156 kB
> > SwapTotal:       3145728 kB
> > SwapFree:        3131252 kB
> >
> > In particular, we have no MemAvailable field in Cygwin.
> >
> >
> >
> > I attached a patch 0001-3.17.3-cpuinfo_suppl.patch for this issue,
> > which should be applied after 3.17.3-cpuinfo.patch
> >
> > The patch separates a case defined(__CYGWIN__) from a case defined(__linux)
> >
> >
> > Regards,
> >
> > Lem
> >
> > 
> Thanks Lem
> 
> appreciated, I will add it for -2 before final release.
> 
> If you find anything else, let me know

Thank you, Marco.

LGTM.


Regards,

Lem