From 49d279f89d9094ce29cc3fa5a219d2a29e552229 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 29 Jul 2022 15:41:09 +0000 Subject: windows: include the Python bits when building Git for Windows While Git for Windows does not _ship_ Python (in order to save on bandwidth), MSYS2 provides very fine Python interpreters that users can easily take advantage of, by using Git for Windows within its SDK. Previously, we excluded the Python bits, mostly due to historical reasons: In the Git for Windows v1.x days, we built Git using MSys/MinGW, without support for any Python scripts. Therefore, let's move out the `NO_PYTHON` definition from the generic part of the MINGW section (which includes special handling for MSYS2/Git for Windows, for the long-superseded msysGit environment, as well as for the setup of probably just one developer remaining with their MSys1) into the two sections that cover different environments than Git for Windows' SDK. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano diff --git a/config.mak.uname b/config.mak.uname index ce83cad..fd7b6a9 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -656,7 +656,6 @@ ifeq ($(uname_S),MINGW) UNRELIABLE_FSTAT = UnfortunatelyYes OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo NO_REGEX = YesPlease - NO_PYTHON = YesPlease ETAGS_TARGET = ETAGS NO_POSIX_GOODIES = UnfortunatelyYes DEFAULT_HELP_FORMAT = html @@ -686,6 +685,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) INTERNAL_QSORT = YesPlease HAVE_LIBCHARSET_H = YesPlease NO_GETTEXT = YesPlease + NO_PYTHON = YesPlease COMPAT_CFLAGS += -D__USE_MINGW_ACCESS else ifneq ($(shell expr "$(uname_R)" : '1\.'),2) @@ -730,6 +730,7 @@ else else COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO NO_CURL = YesPlease + NO_PYTHON = YesPlease endif endif endif -- cgit v0.10.2-6-g49f6 From 7934c74463909e8d84c55d2de7ff3917dd71c6cb Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 29 Jul 2022 15:41:10 +0000 Subject: mingw: remove unneeded `NO_GETTEXT` directive In f9206ce2681 (mingw: let's use gettext with MSYS2, 2016-01-26), we flipped the switch to build Git for Windows with support for gettext. However, the way we flipped the switch was by changing the value of the `NO_GETTEXT` variable from a non-empty string to the empty string, as if there was any `NO_GETTEXT` definition we needed to override. But that was a mistake: while there _is_ a definition, it is in the `THIS_IS_MSYSGIT` section, i.e. it does not affect the Git for Windows part at all. Let's just remove that unnecessary line. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano diff --git a/config.mak.uname b/config.mak.uname index fd7b6a9..e897b80 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -717,7 +717,6 @@ else INSTALL = /bin/install INTERNAL_QSORT = YesPlease HAVE_LIBCHARSET_H = YesPlease - NO_GETTEXT = USE_GETTEXT_SCHEME = fallthrough USE_LIBPCRE = YesPlease NO_CURL = -- cgit v0.10.2-6-g49f6 From 2f0623aaa7bef3ec8f82014842f084dde3976569 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 29 Jul 2022 15:41:11 +0000 Subject: mingw: remove unneeded `NO_CURL` directive In df5218b4c30 (config.mak.uname: support MSys2, 2016-01-13), we introduced support for building Git for Windows in the then-brand new Git for Windows v2.x build environment that was based off of MSYS2. To do that, we split the non-msysGit part (that targeted MSys1) in two, and instead of sharing the `NO_CURL = YesPlease` setting with MSys1, we overrode it for MSYS2 with the empty value because we very much want to build Git for Windows with libcurl. But that was unnecessary: we never set that variable beforehand, therefore there is no need to override it. Let's just remove that unnecessary line. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano diff --git a/config.mak.uname b/config.mak.uname index e897b80..d63629f 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -719,7 +719,6 @@ else HAVE_LIBCHARSET_H = YesPlease USE_GETTEXT_SCHEME = fallthrough USE_LIBPCRE = YesPlease - NO_CURL = USE_NED_ALLOCATOR = YesPlease ifeq (/mingw64,$(subst 32,64,$(prefix))) # Move system config into top-level /etc/ -- cgit v0.10.2-6-g49f6