From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Han-Wen Nienhuys <hanwen@google.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 6/6] vcxproj: adjust for the reftable changes
Date: Mon, 04 May 2020 10:12:48 -0700 [thread overview]
Message-ID: <xmqqbln3hbe7.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <d05b9b9a2e0a49b1bacf0dafb99d36cd213181dc.1588599086.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Mon, 04 May 2020 13:31:26 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> This allows Git to be compiled via Visual Studio again after integrating
> the `hn/reftable` branch.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> config.mak.uname | 2 +-
> contrib/buildsystems/Generators/Vcxproj.pm | 11 ++++++++++-
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/config.mak.uname b/config.mak.uname
> index 0ab8e009383..8a01a0da3f1 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -700,7 +700,7 @@ vcxproj:
> # Make .vcxproj files and add them
> unset QUIET_GEN QUIET_BUILT_IN; \
> perl contrib/buildsystems/generate -g Vcxproj
> - git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
> + git add -f git.sln {*,*/lib,*/libreftable,t/helper/*}/*.vcxproj
>
> # Generate the LinkOrCopyBuiltins.targets and LinkOrCopyRemoteHttp.targets file
> (echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
> diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
> index 5c666f9ac03..33a08d31652 100644
> --- a/contrib/buildsystems/Generators/Vcxproj.pm
> +++ b/contrib/buildsystems/Generators/Vcxproj.pm
> @@ -77,7 +77,7 @@ sub createProject {
> my $libs_release = "\n ";
> my $libs_debug = "\n ";
> if (!$static_library) {
> - $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
> + $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib|reftable\/libreftable\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
> $libs_debug = $libs_release;
> $libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
> $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
> @@ -231,6 +231,7 @@ sub createProject {
> EOM
> if (!$static_library || $target =~ 'vcs-svn' || $target =~ 'xdiff') {
> my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"};
> + my $uuid_libreftable = $$build_structure{"LIBS_reftable/libreftable_GUID"};
> my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};
>
> print F << "EOM";
> @@ -240,6 +241,14 @@ sub createProject {
> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
> </ProjectReference>
> EOM
> + if (!($name =~ /xdiff|libreftable/)) {
Wow. That is messy. I find it somewhat funny that this is not just
libreftable, i.e. "don't include/refer to libreftable in itself",
but as long as it works, I won't complain ;-)
Thanks for helping the tip of 'pu' moving forward.
> + print F << "EOM";
> + <ProjectReference Include="$cdup\\reftable\\libreftable\\libreftable.vcxproj">
> + <Project>$uuid_libreftable</Project>
> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
> + </ProjectReference>
> +EOM
> + }
> if (!($name =~ 'xdiff')) {
> print F << "EOM";
> <ProjectReference Include="$cdup\\xdiff\\lib\\xdiff_lib.vcxproj">
next prev parent reply other threads:[~2020-05-04 17:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 13:31 [PATCH 0/6] Minimal patch series to fix the CI runs of hn/reftable Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 1/6] fixup! Add reftable library Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 2/6] " Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 3/6] " Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 4/6] " Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 5/6] " Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 6/6] vcxproj: adjust for the reftable changes Johannes Schindelin via GitGitGadget
2020-05-04 17:12 ` Junio C Hamano [this message]
2020-05-04 15:56 ` [PATCH 0/6] Minimal patch series to fix the CI runs of hn/reftable Junio C Hamano
2020-05-05 8:02 ` Johannes Schindelin
2020-05-04 17:04 ` Han-Wen Nienhuys
2020-05-05 8:00 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbln3hbe7.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=hanwen@google.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.