{"thread":{"id":"54199","subject":"[PATCH] contrib/buildsystems: fix expat library name for generated vcxproj","startedAt":"2020-09-07T06:00:14Z","lastAt":"2020-09-07T20:09:36Z","messageCount":2,"participants":["Orgad Shaneh via GitGitGadget","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"405114","messageId":"pull.728.git.1599458405948.gitgitgadget@gmail.com","threadId":"54199","inReplyTo":null,"subject":"[PATCH] contrib/buildsystems: fix expat library name for generated vcxproj","fromName":"Orgad Shaneh via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-07T06:00:05Z","receivedAt":"2020-09-07T06:00:14Z","isPatch":true,"sender":{"key":"orgads@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1246544?v=4"},"body":"From: Orgad Shaneh <orgads@gmail.com>\n\nexpat.lib -> libexpat.lib (libexpatd.lib for debug build).\n\nSigned-off-by: Orgad Shaneh <orgads@gmail.com>\n---\n    contrib/buildsystems: fix expat library name for generated vcxproj\n    \n    expat.lib -> libexpat.lib (libexpatd.lib for debug build).\n    \n    Signed-off-by: Orgad Shaneh orgads@gmail.com [orgads@gmail.com]\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-728%2Forgads%2Fvcxproj-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-728/orgads/vcxproj-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/728\n\n contrib/buildsystems/Generators/Vcxproj.pm | 1 +\n contrib/buildsystems/engine.pl             | 2 +-\n 2 files changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm\nindex 5c666f9ac0..d2584450ba 100644\n--- a/contrib/buildsystems/Generators/Vcxproj.pm\n+++ b/contrib/buildsystems/Generators/Vcxproj.pm\n@@ -80,6 +80,7 @@ sub createProject {\n       $libs_release = join(\";\", sort(grep /^(?!libgit\\.lib|xdiff\\/lib\\.lib|vcs-svn\\/lib\\.lib)/, @{$$build_structure{\"$prefix${name}_LIBS\"}}));\n       $libs_debug = $libs_release;\n       $libs_debug =~ s/zlib\\.lib/zlibd\\.lib/g;\n+      $libs_debug =~ s/libexpat\\.lib/libexpatd\\.lib/g;\n       $libs_debug =~ s/libcurl\\.lib/libcurl-d\\.lib/g;\n     }\n \ndiff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl\nindex 070978506a..2ff9620459 100755\n--- a/contrib/buildsystems/engine.pl\n+++ b/contrib/buildsystems/engine.pl\n@@ -349,7 +349,7 @@ sub handleLinkLine\n         } elsif (\"$part\" eq \"-lcurl\") {\n             push(@libs, \"libcurl.lib\");\n         } elsif (\"$part\" eq \"-lexpat\") {\n-            push(@libs, \"expat.lib\");\n+            push(@libs, \"libexpat.lib\");\n         } elsif (\"$part\" eq \"-liconv\") {\n             push(@libs, \"libiconv.lib\");\n         } elsif ($part =~ /^[-\\/]/) {\n\nbase-commit: e19713638985533ce461db072b49112da5bd2042\n-- \ngitgitgadget\n"},{"id":"405139","messageId":"nycvar.QRO.7.76.6.2009072208430.56@tvgsbejvaqbjf.bet","threadId":"54199","inReplyTo":"pull.728.git.1599458405948.gitgitgadget@gmail.com","subject":"Re: [PATCH] contrib/buildsystems: fix expat library name for generated vcxproj","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-09-07T20:09:28Z","receivedAt":"2020-09-07T20:09:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Orgad,\n\nOn Mon, 7 Sep 2020, Orgad Shaneh via GitGitGadget wrote:\n\n> From: Orgad Shaneh <orgads@gmail.com>\n>\n> expat.lib -> libexpat.lib (libexpatd.lib for debug build).\n\nGood point, I forgot to verify that this is also needed for `vcxproj`, not\nonly for `MSVC=1`...\n\nThanks,\nDscho\n\n>\n> Signed-off-by: Orgad Shaneh <orgads@gmail.com>\n> ---\n>     contrib/buildsystems: fix expat library name for generated vcxproj\n>\n>     expat.lib -> libexpat.lib (libexpatd.lib for debug build).\n>\n>     Signed-off-by: Orgad Shaneh orgads@gmail.com [orgads@gmail.com]\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-728%2Forgads%2Fvcxproj-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-728/orgads/vcxproj-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/728\n>\n>  contrib/buildsystems/Generators/Vcxproj.pm | 1 +\n>  contrib/buildsystems/engine.pl             | 2 +-\n>  2 files changed, 2 insertions(+), 1 deletion(-)\n>\n> diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm\n> index 5c666f9ac0..d2584450ba 100644\n> --- a/contrib/buildsystems/Generators/Vcxproj.pm\n> +++ b/contrib/buildsystems/Generators/Vcxproj.pm\n> @@ -80,6 +80,7 @@ sub createProject {\n>        $libs_release = join(\";\", sort(grep /^(?!libgit\\.lib|xdiff\\/lib\\.lib|vcs-svn\\/lib\\.lib)/, @{$$build_structure{\"$prefix${name}_LIBS\"}}));\n>        $libs_debug = $libs_release;\n>        $libs_debug =~ s/zlib\\.lib/zlibd\\.lib/g;\n> +      $libs_debug =~ s/libexpat\\.lib/libexpatd\\.lib/g;\n>        $libs_debug =~ s/libcurl\\.lib/libcurl-d\\.lib/g;\n>      }\n>\n> diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl\n> index 070978506a..2ff9620459 100755\n> --- a/contrib/buildsystems/engine.pl\n> +++ b/contrib/buildsystems/engine.pl\n> @@ -349,7 +349,7 @@ sub handleLinkLine\n>          } elsif (\"$part\" eq \"-lcurl\") {\n>              push(@libs, \"libcurl.lib\");\n>          } elsif (\"$part\" eq \"-lexpat\") {\n> -            push(@libs, \"expat.lib\");\n> +            push(@libs, \"libexpat.lib\");\n>          } elsif (\"$part\" eq \"-liconv\") {\n>              push(@libs, \"libiconv.lib\");\n>          } elsif ($part =~ /^[-\\/]/) {\n>\n> base-commit: e19713638985533ce461db072b49112da5bd2042\n> --\n> gitgitgadget\n>\n"}]}