Re: [lmi] PATCH: Submodule changes

[Greg Chicares]

On 2020-10-09 14:30, Vadim Zeitlin wrote:
> On Fri, 9 Oct 2020 13:35:31 +0000 Greg Chicares <gchicares@sbcglobal.net> 
> wrote:
[...]
> GC> Okay, if I apply this one first:
> GC>   PR 160 Use submodules for wx and wxpdfdoc too
> GC> and this one second:
> GC>   PR 158 Ci linux
> 
>  This one is not going to apply cleanly on top of PR 160, so I'd rather
> rebase it on top of master once you merge PR 160. Of course, you can do it
> yourself too if you prefer, but I think it would be simpler and faster for
> me/us to do it instead.

Okay. I've applied PR 160 already, and I'll copy the terminal session
below just in case it's in any way useful, because this is a fairly
large set of changes and we want everything to go smoothly.

I had intended, but forgot, first to move aside four little commits
that I had made to 'install_msw.sh'. But there were no conflicts
because your only change to that file affected a single line in an
area that I hadn't changed, so it looks like git did the right thing,
and I think this is okay to push now.

Then I can ask a few questions about PR 160, while you rebase PR 158
on the new origin/master.

> GC> and examine but don't apply these two:
> 
>  Just a nitpick: I'd start by examining these two, _before_ applying 160.

Anticipating that I wouldn't really object to anything in PR 160,
I applied it, then scanned the changes with 'git log', then studied
the separate "virtual" PR 157 and PR 162 at github.com, and now I'm
studying the aggregate result of all the changes with a GUI file
comparer. This way works for me.

I have only one important question: the wx{W,P}* SHA1s are embedded in
the submodule stuff now AIUI, so should the following 'wx_commit*_sha'
variables...

$ git --no-pager grep _sha install_wx* 
install_wx.sh:vendor=${LMI_TRIPLET}-$gcc_version-$wx_commit_sha
install_wxpdfdoc.sh:build_dir="$exec_prefix/wxpdfdoc-ad_hoc/wxpdfdoc-$wxpdfdoc_commit_sha"

...still be used? AFAICT without actually rebuilding, those variables
ought to be empty now, right?

Here, for the record, is how I applied PR 160:

$git fetch xanadu                                 
remote: Enumerating objects: 23, done.
remote: Counting objects: 100% (23/23), done.
remote: Total 39 (delta 23), reused 23 (delta 23), pack-reused 16
Unpacking objects: 100% (39/39), done.
>From https://github.com/vadz/lmi
   61f55594..14d582d4  master             -> xanadu/master
 * [new branch]        wx-only-submodules -> xanadu/wx-only-submodules
 * [new branch]        wx-submodules      -> xanadu/wx-submodules
   d66edf01..b808e3a3  xmlwrapp-submodule -> xanadu/xmlwrapp-submodule

$git cherry-pick ..xanadu/wx-submodules           
Removing xmlwrapp-0.9.0.md5sums
Auto-merging workhorse.make
[master a020e993] Add xmlwrapp submodule and use its sources and headers from it
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Wed Oct 7 01:35:05 2020 +0200
 6 files changed, 26 insertions(+), 88 deletions(-)
 create mode 160000 third_party/xmlwrapp
 delete mode 100644 xmlwrapp-0.9.0.md5sums
[master a227fffb] Update xmlwrapp submodule to the latest version
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Wed Oct 7 16:00:00 2020 +0200
 2 files changed, 1 insertion(+), 8 deletions(-)
[master 22ba470d] Re-upgrade libxml2 to the latest version
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Wed Oct 7 16:11:52 2020 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)
Removing xml_xslt_wrapp.cpp
Auto-merging workhorse.make
Auto-merging install_msw.sh
Auto-merging .github/workflows/ci.yml
[master 70a973c8] Build xmlwrapp as external library, similarly to libxml2
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Wed Oct 7 23:34:32 2020 +0200
 9 files changed, 49 insertions(+), 80 deletions(-)
 rename install_libxml2_libxslt.sh => install_xml_libraries.sh (85%)
 delete mode 100644 xml_xslt_wrapp.cpp
Auto-merging .github/workflows/ci.yml
[master 4f0d5201] Fix caching xmlwrapp in GitHub CI workflow
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Thu Oct 8 01:58:05 2020 +0200
 1 file changed, 4 insertions(+), 3 deletions(-)
[master 9af93d48] Don't define unused and unnecessary LIBXML_USE_DLL symbol
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Thu Oct 8 02:06:24 2020 +0200
 1 file changed, 1 deletion(-)
[master c86548b1] Upgrade xmlwrapp to support building as DLL without 
auto-import
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Thu Oct 8 17:22:50 2020 +0200
 2 files changed, 3 insertions(+), 1 deletion(-)
[master fc15e234] Fix xml libraries building under Windows
 Author: Ilya Sinitsyn <isinitsyn@tt-solutions.com>
 Date: Fri Oct 9 14:11:29 2020 +0700
 1 file changed, 3 insertions(+)
[master ae54a1d2] Add wx submodule and use wxWidgets version from it
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Fri Oct 9 01:43:08 2020 +0200
 3 files changed, 9 insertions(+), 43 deletions(-)
 create mode 160000 third_party/wx
[master 24c5d740] Add wxpdfdoc submodule and use wxPdfDocument version from it
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Fri Oct 9 01:43:08 2020 +0200
 3 files changed, 10 insertions(+), 40 deletions(-)
 create mode 160000 third_party/wxpdfdoc
[master 5f266c68] Consistently use the same config.guess in all build scripts
 Author: Vadim Zeitlin <vadim@tt-solutions.com>
 Date: Fri Oct 9 14:36:26 2020 +0200
 2 files changed, 4 insertions(+), 4 deletions(-)

$git status
On branch master
Your branch is ahead of 'origin/master' by 15 commits.
  (use "git push" to publish your local commits)