[ITA] cmake-3.18.0-1 and related packages

classic Classic list List threaded Threaded
15 messages Options
Reply | Threaded
Open this post in threaded view
|

[ITA] cmake-3.18.0-1 and related packages

cygwin-apps mailing list
Hi!

I suggest an update to CMake v3.18.0 (Date: Wed Jul 15 07:19:20 2020 -0400).
https://github.com/Kitware/CMake/tree/v3.18.0

I'm not at all familiar with CMake, which is a very large system.
And, though I don't mind being an additional maintainer for cmake,
I guess it's difficult for me to maintain cmake packages just by myself.

> Current maintainers are: https://cygwin.com/cygwin-pkg-maint
> cmake                                        Tony Kelman/Marco Atzeri


New cygport and patch files are placed
to https://github.com/cygwin-lem/cmake-cygport/tree/n_3.18.0-1d
(I can't find any git repository for cmake.cygport).


New test package files are placed here:
https://app.box.com/s/8q5mpv4kv080jxsyc5tbongrerwfzbuz/folder/118159586901


cmake-3.18.0-1
cmake-doc-3.18.0-1
cmake-gui-3.18.0-1
bash-completion-cmake-3.18.0-1
emacs-cmake-3.18.0-1
vim-cmake-3.18.0-1

There are new additional packages: bash-completion-cmake and vim-cmake-3.18.0-1.
They contain new files in CMake v3.18.0 and not in earlier versions


Please, check them, except cmake-debuginfo files,
which are too large for me to upload to github.com or box.com):

cmake-3.18.0-1.i686/dist/cmake/bash-completion-cmake/bash-completion-cmake-3.18.0-1.hint
cmake-3.18.0-1.i686/dist/cmake/bash-completion-cmake/bash-completion-cmake-3.18.0-1.tar.xz
cmake-3.18.0-1.i686/dist/cmake/cmake-3.18.0-1-src.hint
cmake-3.18.0-1.i686/dist/cmake/cmake-3.18.0-1-src.tar.xz
cmake-3.18.0-1.i686/dist/cmake/cmake-3.18.0-1.hint
cmake-3.18.0-1.i686/dist/cmake/cmake-3.18.0-1.tar.xz
cmake-3.18.0-1.i686/dist/cmake/cmake-debuginfo/cmake-debuginfo-3.18.0-1.hint
cmake-3.18.0-1.i686/dist/cmake/cmake-debuginfo/cmake-debuginfo-3.18.0-1.tar.xz
cmake-3.18.0-1.i686/dist/cmake/cmake-doc/cmake-doc-3.18.0-1.hint
cmake-3.18.0-1.i686/dist/cmake/cmake-doc/cmake-doc-3.18.0-1.tar.xz
cmake-3.18.0-1.i686/dist/cmake/cmake-gui/cmake-gui-3.18.0-1.hint
cmake-3.18.0-1.i686/dist/cmake/cmake-gui/cmake-gui-3.18.0-1.tar.xz
cmake-3.18.0-1.i686/dist/cmake/emacs-cmake/emacs-cmake-3.18.0-1.hint
cmake-3.18.0-1.i686/dist/cmake/emacs-cmake/emacs-cmake-3.18.0-1.tar.xz
cmake-3.18.0-1.i686/dist/cmake/vim-cmake/vim-cmake-3.18.0-1.hint
cmake-3.18.0-1.i686/dist/cmake/vim-cmake/vim-cmake-3.18.0-1.tar.xz
cmake-3.18.0-1.x86_64/dist/cmake/bash-completion-cmake/bash-completion-cmake-3.18.0-1.hint
cmake-3.18.0-1.x86_64/dist/cmake/bash-completion-cmake/bash-completion-cmake-3.18.0-1.tar.xz
cmake-3.18.0-1.x86_64/dist/cmake/cmake-3.18.0-1-src.hint
cmake-3.18.0-1.x86_64/dist/cmake/cmake-3.18.0-1-src.tar.xz
cmake-3.18.0-1.x86_64/dist/cmake/cmake-3.18.0-1.hint
cmake-3.18.0-1.x86_64/dist/cmake/cmake-3.18.0-1.tar.xz
cmake-3.18.0-1.x86_64/dist/cmake/cmake-debuginfo/cmake-debuginfo-3.18.0-1.hint
cmake-3.18.0-1.x86_64/dist/cmake/cmake-debuginfo/cmake-debuginfo-3.18.0-1.tar.xz
cmake-3.18.0-1.x86_64/dist/cmake/cmake-doc/cmake-doc-3.18.0-1.hint
cmake-3.18.0-1.x86_64/dist/cmake/cmake-doc/cmake-doc-3.18.0-1.tar.xz
cmake-3.18.0-1.x86_64/dist/cmake/cmake-gui/cmake-gui-3.18.0-1.hint
cmake-3.18.0-1.x86_64/dist/cmake/cmake-gui/cmake-gui-3.18.0-1.tar.xz
cmake-3.18.0-1.x86_64/dist/cmake/emacs-cmake/emacs-cmake-3.18.0-1.hint
cmake-3.18.0-1.x86_64/dist/cmake/emacs-cmake/emacs-cmake-3.18.0-1.tar.xz
cmake-3.18.0-1.x86_64/dist/cmake/vim-cmake/vim-cmake-3.18.0-1.hint
cmake-3.18.0-1.x86_64/dist/cmake/vim-cmake/vim-cmake-3.18.0-1.tar.xz

--
Lem
Reply | Threaded
Open this post in threaded view
|

Re: [ITA] cmake-3.18.0-1 and related packages

cygwin-apps mailing list
On 17.07.2020 22:14, Lemures Lemniscati via Cygwin-apps wrote:
> Hi!
>
> I suggest an update to CMake v3.18.0 (Date: Wed Jul 15 07:19:20 2020 -0400).
> https://github.com/Kitware/CMake/tree/v3.18.0
>
> I'm not at all familiar with CMake, which is a very large system.
> And, though I don't mind being an additional maintainer for cmake,
> I guess it's difficult for me to maintain cmake packages just by myself.

cmake is a bit of pain, I can agree

>> Current maintainers are: https://cygwin.com/cygwin-pkg-maint
>> cmake                                        Tony Kelman/Marco Atzeri
>

technically as I am still here, cmake is not orphan


> New cygport and patch files are placed
> to https://github.com/cygwin-lem/cmake-cygport/tree/n_3.18.0-1d
> (I can't find any git repository for cmake.cygport).

all mine are together at

https://github.com/matzeri/cygwin-pkg


> New test package files are placed here:
> https://app.box.com/s/8q5mpv4kv080jxsyc5tbongrerwfzbuz/folder/118159586901

I will give a view

>
> cmake-3.18.0-1
> cmake-doc-3.18.0-1
> cmake-gui-3.18.0-1
> bash-completion-cmake-3.18.0-1
> emacs-cmake-3.18.0-1
> vim-cmake-3.18.0-1
>
> There are new additional packages: bash-completion-cmake and vim-cmake-3.18.0-1.
> They contain new files in CMake v3.18.0 and not in earlier versions
>
> --
> Lem
>

I have cmake-3.17.3-1 build and already packed, but I am no
really fine with testing

any reason why you need 3.18.0

Regards
Marco
Reply | Threaded
Open this post in threaded view
|

Re: [ITA] cmake-3.18.0-1 and related packages

cygwin-apps mailing list
Subject: Re: [ITA] cmake-3.18.0-1 and related packages
Date: Fri, 17 Jul 2020 23:13:55 +0200
From: Marco Atzeri via Cygwin-apps <[hidden email]>

> On 17.07.2020 22:14, Lemures Lemniscati via Cygwin-apps wrote:
> > Hi!
> >
> > I suggest an update to CMake v3.18.0 (Date: Wed Jul 15 07:19:20 2020 -0400).
> > https://github.com/Kitware/CMake/tree/v3.18.0
> >
> > I'm not at all familiar with CMake, which is a very large system.
> > And, though I don't mind being an additional maintainer for cmake,
> > I guess it's difficult for me to maintain cmake packages just by myself.
>
> cmake is a bit of pain, I can agree
>
> >> Current maintainers are: https://cygwin.com/cygwin-pkg-maint
> >> cmake                                        Tony Kelman/Marco Atzeri
> >
> technically as I am still here, cmake is not orphan
>
>
> > New cygport and patch files are placed
> > to https://github.com/cygwin-lem/cmake-cygport/tree/n_3.18.0-1d
> > (I can't find any git repository for cmake.cygport).
>
> all mine are together at
>
> https://github.com/matzeri/cygwin-pkg

Thank you, Marco.
I would like to support as far as I can.

Regards,

Lem
Reply | Threaded
Open this post in threaded view
|

Re: [ITA] cmake-3.18.0-1 and related packages

Achim Gratz
In reply to this post by cygwin-apps mailing list
Marco Atzeri via Cygwin-apps writes:
>> New cygport and patch files are placed
>> to https://github.com/cygwin-lem/cmake-cygport/tree/n_3.18.0-1d
>> (I can't find any git repository for cmake.cygport).
>
> all mine are together at
>
> https://github.com/matzeri/cygwin-pkg

You should put them on

https://cygwin.com/git-cygwin-packages/

preferrably as the canonical source.


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
Reply | Threaded
Open this post in threaded view
|

Re: [ITA] cmake-3.18.0-1 and related packages

cygwin-apps mailing list
On 18.07.2020 08:12, Achim Gratz wrote:

> Marco Atzeri via Cygwin-apps writes:
>>> New cygport and patch files are placed
>>> to https://github.com/cygwin-lem/cmake-cygport/tree/n_3.18.0-1d
>>> (I can't find any git repository for cmake.cygport).
>>
>> all mine are together at
>>
>> https://github.com/matzeri/cygwin-pkg
>
> You should put them on
>
> https://cygwin.com/git-cygwin-packages/
>
> preferrably as the canonical source.
>

I know, but it take times, specially as I will hate to lose
the history if I port only last version


>
> Regards,
> Achim.
>

Regards
Marco
Reply | Threaded
Open this post in threaded view
|

Re: [ITA] cmake-3.18.0-1 and related packages

Achim Gratz
Marco Atzeri via Cygwin-apps writes:
> I know, but it take times, specially as I will hate to lose
> the history if I port only last version

You can rewrite the git repo with filter-branch to keep the history.  I
did that with my packages since I also had them in a single repo.  I now
have them as submodules in a new repo, although the submodules wouldn't
strictly be necessary.


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

Factory and User Sound Singles for Waldorf rackAttack:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
Reply | Threaded
Open this post in threaded view
|

Re: [ITA] cmake-3.18.0-1 and related packages

Achim Gratz
Achim Gratz writes:
> Marco Atzeri via Cygwin-apps writes:
>> I know, but it take times, specially as I will hate to lose
>> the history if I port only last version
>
> You can rewrite the git repo with filter-branch to keep the history.  I
> did that with my packages since I also had them in a single repo.  I now
> have them as submodules in a new repo, although the submodules wouldn't
> strictly be necessary.

Here are a the scripts that I created for this conversion.  The first
one filters each subdirectory into its own branch.  The second one
imports one such branch into a new repo.  You need to define a cygpack:
alias in your gitconfig (global or local) to use it directly.  Obviously
you'll want to loop across all your packages, I did that directly in the
shell.  It goes without saying that you should do all operations on
fresh clones of your repositories so you can easily start over if
necessary.

The third script was for packages that I took over from Yaakov that he
had put earlier history on the Cygwin server (from Cygport, mostly) and
I had already local history fro my releases; it will fetch what's on
Cygwin and then append any local history.  If the relation is more
complicated than that you will either need to rewrite the history
manually or drop / branch off some of the intertwined history.

--8<- .gitconfig -cut here----------------start------------->8---
[url "git://cygwin.com/git/cygwin-packages"]
        InsteadOf = cygpack:
[url "ssh://[hidden email]/git/cygwin-packages"]
        pushInsteadOf = cygpack:
--8<- .gitconfig -cut here----------------end--------------->8---

--8<- splitgit.dash -cut here--------------start------------->8---
#!/bin/dash
pkgs=""
spkg=""
if [ $# -gt 2 ] ; then
    orepo=$1; shift
    nrepo=$1; shift
    pkgs=$1; shift
    spkg=$pkgs
else
    echo "Not enough arguments!\n$@"
    exit 1
fi
while [ $# -gt 0 ] ; do
    pkgs="$pkgs $1"
    spkg="$spkg|$1"
    shift
done
echo "$spkg"
# clone repo and keep reference to original
git clone $orepo $nrepo
cd $nrepo
git branch unsplit master
# stuff packages into separate subdirectories
git filter-branch --index-filter ' \
      git ls-files -s | \
      perl -pE '"'"'s:\t('$spkg'):\t$1/$1:'"'"' | \
      env GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info && \
      mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE" \
    ' HEAD
git branch subdirs
# split each subdir into a new branch
for pkg in $pkgs ; do
    git filter-branch -f --subdirectory-filter $pkg -- --all
    git branch $pkg
    git reset --hard  original/refs/heads/master
done
--8<- splitgit.dash -cut here-------------end--------------->8---

--8<- gitimport.dash -cut here------------start------------->8---
#!/usr/bin/dash
if [ $# -gt 1 ] ; then
    srepo=$(realpath $1); shift
    pkg=$1; shift
else
    echo "Not enough arguments!\n$@"
    exit 1
fi
echo "$pkg"
# create new git repo
git init $pkg
cd $pkg
# import history
git fetch -fu $srepo master:master
git reset --hard
git remote add origin cygpack:/$pkg
#
cd ..
--8<- gitimport.dash -cut here------------end--------------->8---

--8<- grafthist.dash -cut here------------start------------->8---
#!/bin/dash
if [ $# -gt 1 ] ; then
    srepo=$(realpath $1); shift
    pkg=$1; shift
else
    echo "Not enough arguments!\n$@"
    exit 1
fi
echo "$pkg"
# create new git repo
git clone git://cygwin.com/git/cygwin-packages/${pkg}.git || git init $pkg
cd $pkg
# import history
git fetch $srepo refs/heads/${pkg}:import
git checkout import
if [ "origin" = "$( git remote )" ] ; then
    # append imported history
    sha1=$( git show-ref refs/heads/master | cut -d\  -f 1 )
    echo $sha1
    git filter-branch -f \
      --commit-filter ' \
        if [ $# -eq 1 ] ; then \
          git commit-tree -p $( git show-ref refs/heads/master | cut -d" "  -f 1 ) $1 ; \
        else \
          git commit-tree "$@" ; \
        fi ' \
      --msg-filter ' \
        sed -e "s/initial commit/Take over maintenance/;s/^\* //" \
        ' \
      HEAD
fi
git branch -f master import
git reset --hard
cd ..
--8<- grafthist.dash -cut here------------end--------------->8---


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

Samples for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra
Reply | Threaded
Open this post in threaded view
|

Re: [ITA] cmake-3.18.0-1 and related packages

cygwin-apps mailing list
In reply to this post by Achim Gratz
Subject: Re: [ITA] cmake-3.18.0-1 and related packages
Date: Sat, 18 Jul 2020 09:01:20 +0200
From: Achim Gratz

> Marco Atzeri via Cygwin-apps writes:
> > I know, but it take times, specially as I will hate to lose
> > the history if I port only last version
>
> You can rewrite the git repo with filter-branch to keep the history.  I
> did that with my packages since I also had them in a single repo.  I now
> have them as submodules in a new repo, although the submodules wouldn't
> strictly be necessary.
>

All right. I've made a new history branch here by extracting with
git filter-branch and merge:
https://github.com/cygwin-lem/cygwin-pkg/tree/new_master_cmake

And attached a result of 'git log --pretty=fuller --graph --color=always'
as an HTML file.

Please review it. If it is OK, I'll push to the repo
https://cygwin.com/git-cygwin-packages/cmake.git .

Regards,

Lem
Reply | Threaded
Open this post in threaded view
|

cmake upstream has merged cygwin patches

cygwin-apps mailing list
Hi.

The cygwin patches for cmake-3.17.3 have been merged into its upstream
(though I should have discussed for it here).

Merged by there merge-requests:
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5092
https://gitlab.kitware.com/utils/kwsys/-/merge_requests/197


Merged patches for cmake-3.17.3-1 are

        perl-libs.patch
        3.17.3-case-sensitivity.patch
        3.17.3-opengl.patch
        3.17.3-findtclsh.patch
        3.17.3-cpuinfo.patch
        3.17.3-cygwin-paths.patch
https://github.com/matzeri/cygwin-pkg/tree/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake

and

0001-3.17.3-cpuinfo_suppl.patch
https://sourceware.org/pipermail/cygwin/2020-July/245563.html


Regards,

Lem

Reply | Threaded
Open this post in threaded view
|

Re: cmake upstream has merged cygwin patches

cygwin-apps mailing list
On 07.08.2020 18:06, Lemures Lemniscati via Cygwin-apps wrote:

> Hi.
>
> The cygwin patches for cmake-3.17.3 have been merged into its upstream
> (though I should have discussed for it here).
>
> Merged by there merge-requests:
> https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5092
> https://gitlab.kitware.com/utils/kwsys/-/merge_requests/197
>
>
> Merged patches for cmake-3.17.3-1 are
>
> perl-libs.patch
> 3.17.3-case-sensitivity.patch
> 3.17.3-opengl.patch
> 3.17.3-findtclsh.patch
> 3.17.3-cpuinfo.patch
> 3.17.3-cygwin-paths.patch
> https://github.com/matzeri/cygwin-pkg/tree/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake
>
> and
>
> 0001-3.17.3-cpuinfo_suppl.patch
> https://sourceware.org/pipermail/cygwin/2020-July/245563.html
>
>
> Regards,
>
> Lem
>

Thanks Lem,

I am impressed, in the past we had much more discussion for having our
patches merged upstream.

If you want to take over or just co-maintain,
let me know

Regards
Marco
Reply | Threaded
Open this post in threaded view
|

Re: cmake upstream has merged cygwin patches

cygwin-apps mailing list
On Fri, 7 Aug 2020 21:51:00 +0200, Marco Atzeri via Cygwin-apps

> On 07.08.2020 18:06, Lemures Lemniscati via Cygwin-apps wrote:
> > Hi.
> >
> > The cygwin patches for cmake-3.17.3 have been merged into its upstream
> > (though I should have discussed for it here).
> >
> > Merged by there merge-requests:
> > https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5092
> > https://gitlab.kitware.com/utils/kwsys/-/merge_requests/197
> >
> >
> > Merged patches for cmake-3.17.3-1 are
> >
> > perl-libs.patch
> > 3.17.3-case-sensitivity.patch
> > 3.17.3-opengl.patch
> > 3.17.3-findtclsh.patch
> > 3.17.3-cpuinfo.patch
> > 3.17.3-cygwin-paths.patch
> > https://github.com/matzeri/cygwin-pkg/tree/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake
> >
> > and
> >
> > 0001-3.17.3-cpuinfo_suppl.patch
> > https://sourceware.org/pipermail/cygwin/2020-July/245563.html
> >
> >
> > Regards,
> >
> > Lem
> >
> Thanks Lem,
>
> I am impressed, in the past we had much more discussion for having our patches merged upstream.
>
> If you want to take over or just co-maintain,
> let me know

I'd like to just co-maintain :).
Thank you.

Regards,

Lem
Reply | Threaded
Open this post in threaded view
|

Re: cmake upstream has merged cygwin patches

cygwin-apps mailing list
On 08.08.2020 02:47, Lemures Lemniscati via Cygwin-apps wrote:
> On Fri, 7 Aug 2020 21:51:00 +0200, Marco Atzeri via Cygwin-apps
>> On 07.08.2020 18:06, Lemures Lemniscati via Cygwin-apps wrote:
>>> Hi.
>>>

>> Thanks Lem,
>>
>> I am impressed, in the past we had much more discussion for having our patches merged upstream.
>>
>> If you want to take over or just co-maintain,
>> let me know
>
> I'd like to just co-maintain :).
> Thank you.
>
> Regards,
>
> Lem
>

you are up.

I am building cmake-3.17.3-2 with also your last patch
and put as default

Regards
Marco

Reply | Threaded
Open this post in threaded view
|

Re: cmake upstream has merged cygwin patches

cygwin-apps mailing list
On Mon, 10 Aug 2020 10:17:16 +0200, Marco Atzeri via Cygwin-apps

> On 08.08.2020 02:47, Lemures Lemniscati via Cygwin-apps wrote:
> > On Fri, 7 Aug 2020 21:51:00 +0200, Marco Atzeri via Cygwin-apps
> >> On 07.08.2020 18:06, Lemures Lemniscati via Cygwin-apps wrote:
> >>> Hi.
> >>>
>
> >> Thanks Lem,
> >>
> >> I am impressed, in the past we had much more discussion for having our patches merged upstream.
> >>
> >> If you want to take over or just co-maintain,
> >> let me know
> >
> > I'd like to just co-maintain :).
> > Thank you.
> >
> > Regards,
> >
> > Lem
> >
> you are up.
>
> I am building cmake-3.17.3-2 with also your last patch
> and put as default
>
> Regards
> Marco

Thank you, Marco!

Regards,
Lem
Reply | Threaded
Open this post in threaded view
|

cmake-3.19.0-1 and related packages

cygwin-apps mailing list
In reply to this post by cygwin-apps mailing list
Hi!

Marco and Tony,

cmake 3.19.0 has been released in the upstream.
  https://blog.kitware.com/cmake-3-19-0-available-for-download/


A new candidate cmake.cygport has been uploaded
  https://github.com/cygwin-lem/cygwin-pkg/blob/cmake_3.19.0-1/cmake/cmake.cygport ,
and pull-requested as https://github.com/matzeri/cygwin-pkg/pull/2

    Former patches have been merged into upstream 3.19.
    Use default src_install(), still cmake-mode.el will be properly installed.
    Add new packages: bash-completion-cmake and vim-cmake.

    Add BUILD_REQUIRES list, but it might be insufficient.

Generated packages except debuginfo have been uploaded to
  https://app.box.com/s/8q5mpv4kv080jxsyc5tbongrerwfzbuz

Regards,
Lem
Reply | Threaded
Open this post in threaded view
|

cmake-3.19.1-1 and related packages

cygwin-apps mailing list
In reply to this post by cygwin-apps mailing list
Hi!

Marco and Tony,

cmake 3.19.1 has been released in the upstream.
  https://blog.kitware.com/cmake-3-19-1-available-for-download/


A new candidate cmake.cygport has been uploaded
  https://github.com/cygwin-lem/cygwin-pkg/blob/cmake_3.19.1-1/cmake/cmake.cygport ,
and pull-requested as https://github.com/matzeri/cygwin-pkg/pull/3

    Former patches have been merged into upstream 3.19.
    Use default src_install(), still cmake-mode.el will be properly installed.
    Add new packages: bash-completion-cmake and vim-cmake.

    Add BUILD_REQUIRES list, but it might be insufficient.

Generated packages except debuginfo (300MB+) have been uploaded to
  https://app.box.com/s/8q5mpv4kv080jxsyc5tbongrerwfzbuz

Regards,
Lem