Re: [PATCH 1/3] msvc: copy the correct `.pdb` files in the Makefile target `install`
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Aug 17, 2020, 05:51 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2008170750090.56@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20200817092431.GA1259595@coredump.intra.peff.net>
Hi Peff,
On Mon, 17 Aug 2020, Jeff King wrote:
Show 27 quoted lines
> On Mon, Aug 17, 2020 at 09:07:51AM +0000, Johannes Schindelin wrote: > > > - $(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)' > > - $(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)' > > - $(INSTALL) git-upload-pack.pdb '$(DESTDIR_SQ)$(bindir_SQ)' > > - $(INSTALL) git-credential-store.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-http-fetch.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-http-push.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-imap-send.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-remote-http.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-remote-testsvn.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-sh-i18n--envsubst.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > - $(INSTALL) git-show-index.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > + $(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS),$(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)))) '$(DESTDIR_SQ)$(bindir_SQ)' > > + $(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS) $(REMOTE_CURL_ALIASES),$(PROGRAMS))) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > Oh, this is much better than what my patch does. :) > > The rest of the series looks like a good direction to me, but is outside > the scope of my series. I'd be happy to pick this first patch up for a > re-roll of mine (which would require tweaking the rest of the patches on > top to stop removing things from the .pdb list). Or we could just leave > this as a separate topic and deal with the merge conflict (which would > obviously resolve in favor of yours).
Please feel totally free to cherry-pick my 1/3 as your 1/5 (but please do fix up the author email address, if you don't mind).
I have no problem with my patch series depending on yours, to make merging easier.
Ciao, Dscho