{"thread":{"id":"22123","subject":"[PATCH] mingw: enable NO_PYTHON","startedAt":"2010-01-07T21:52:39Z","lastAt":"2010-01-08T13:55:49Z","messageCount":9,"participants":["Erik Faye-Lund","Johannes Sixt","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"131040","messageId":"1262901159-1436-1-git-send-email-kusmabite@gmail.com","threadId":"22123","inReplyTo":null,"subject":"[PATCH] mingw: enable NO_PYTHON","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@googlemail.com","sentAt":"2010-01-07T21:52:39Z","receivedAt":"2010-01-07T21:52:39Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"Python is not commonly installed on Windows machines, so\nwe should disable it there by default.\n\nSigned-off-by: Erik Faye-Lund <kusmabite@gmail.com>\n---\n\nThis patch is against Junio's current master, and enables\nmsysgit to compile upstream git again after Sverre's addition\nof the python remote-helpers (2fe40b6).\n\n Makefile |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 1c7668a..a2780a2 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1028,6 +1028,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n \tBLK_SHA1 = YesPlease\n \tNO_INET_PTON = YesPlease\n \tNO_INET_NTOP = YesPlease\n+\tNO_PYTHON = YesPlease\n \tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch\n \tCOMPAT_CFLAGS += -DSTRIP_EXTENSION=\\\".exe\\\"\n \tCOMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o\n-- \n1.6.6.95.g82b1b.dirty\n"},{"id":"131047","messageId":"40aa078e1001071400j21900ed1n415394491d469b8c@mail.gmail.com","threadId":"22123","inReplyTo":"1262901159-1436-1-git-send-email-kusmabite@gmail.com","subject":"Re: [PATCH] mingw: enable NO_PYTHON","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@googlemail.com","sentAt":"2010-01-07T22:00:20Z","receivedAt":"2010-01-07T22:00:20Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"Uhm, I just realized that I sent out a patch that wasn't clean against\nJunio's master after all. I'll send out a fixed one ASAP.\n\nSorry about the noise.\n\nOn Thu, Jan 7, 2010 at 10:52 PM, Erik Faye-Lund\n<kusmabite@googlemail.com> wrote:\n> Python is not commonly installed on Windows machines, so\n> we should disable it there by default.\n>\n> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>\n> ---\n>\n> This patch is against Junio's current master, and enables\n> msysgit to compile upstream git again after Sverre's addition\n> of the python remote-helpers (2fe40b6).\n>\n>  Makefile |    1 +\n>  1 files changed, 1 insertions(+), 0 deletions(-)\n>\n> diff --git a/Makefile b/Makefile\n> index 1c7668a..a2780a2 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -1028,6 +1028,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n>        BLK_SHA1 = YesPlease\n>        NO_INET_PTON = YesPlease\n>        NO_INET_NTOP = YesPlease\n> +       NO_PYTHON = YesPlease\n>        COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch\n>        COMPAT_CFLAGS += -DSTRIP_EXTENSION=\\\".exe\\\"\n>        COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o\n> --\n> 1.6.6.95.g82b1b.dirty\n>\n>\n\n\n\n-- \nErik \"kusma\" Faye-Lund\n"},{"id":"131048","messageId":"1262902037-4420-1-git-send-email-kusmabite@gmail.com","threadId":"22123","inReplyTo":"40aa078e1001071400j21900ed1n415394491d469b8c@mail.gmail.com","subject":"[PATCH] mingw: disable Python","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@googlemail.com","sentAt":"2010-01-07T22:07:17Z","receivedAt":"2010-01-07T22:07:17Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"Python is not commonly installed on Windows machines, so\nwe should disable it there by default.\n\nSigned-off-by: Erik Faye-Lund <kusmabite@gmail.com>\n---\n\nThis patch is against Junio's current master, and enables\nmsysgit to compile upstream git again after Sverre's addition\nof the python remote-helpers (2fe40b6).\n\n Makefile |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 015bfab..0004c52 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1027,6 +1027,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n \tOBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo\n \tNO_REGEX = YesPlease\n \tBLK_SHA1 = YesPlease\n+\tNO_PYTHON = YesPlease\n \tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch\n \tCOMPAT_CFLAGS += -DSTRIP_EXTENSION=\\\".exe\\\"\n \tCOMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o\n-- \n1.6.6.90.g50bc9.dirty\n"},{"id":"131073","messageId":"4B46E7D6.3080702@viscovery.net","threadId":"22123","inReplyTo":"1262902037-4420-1-git-send-email-kusmabite@gmail.com","subject":"Re: [PATCH] mingw: disable Python","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-01-08T08:07:50Z","receivedAt":"2010-01-08T08:07:50Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Erik Faye-Lund schrieb:\n> Python is not commonly installed on Windows machines, so\n> we should disable it there by default.\n> \n> --- a/Makefile\n> +++ b/Makefile\n> @@ -1027,6 +1027,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n> +\tNO_PYTHON = YesPlease\n\nI'm worried that with this solution it is impossible to re-enable Python\nin config.mak (how do you undefine a Makefile variable?); it would be\nnecessary to hack Makefile.\n\nWouldn't it be superior to set\n\n\tPYTHON_PATH =\n\nin the MinGW section[*]. It works because there is this heuristic later:\n\nifeq ($(PYTHON_PATH),)\nNO_PYTHON=NoThanks\nendif\n\nTo enable Python, the user would have to set PYTHON_PATH in config.mak.\n\n[I have only Python 1.6 to test (doh!), so I can only tell that it gets\nused during 'make', but this fails due to missing modules, so I cannot\ntell whether there would be a usable result if Python were sufficiently\nrecent.]\n\n[*] You should probably set the MSVC section as well, even if you cannot\ntest it. The effect of the change is predictable enough, I think.\n\n-- Hannes\n"},{"id":"131074","messageId":"alpine.DEB.1.00.1001081135180.4272@intel-tinevez-2-302","threadId":"22123","inReplyTo":"4B46E7D6.3080702@viscovery.net","subject":"Re: [PATCH] mingw: disable Python","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2010-01-08T10:35:40Z","receivedAt":"2010-01-08T10:35:40Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 8 Jan 2010, Johannes Sixt wrote:\n\n> Erik Faye-Lund schrieb:\n> > Python is not commonly installed on Windows machines, so\n> > we should disable it there by default.\n> > \n> > --- a/Makefile\n> > +++ b/Makefile\n> > @@ -1027,6 +1027,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n> > +\tNO_PYTHON = YesPlease\n> \n> I'm worried that with this solution it is impossible to re-enable Python\n> in config.mak (how do you undefine a Makefile variable?);\n\nHow about\n\n\tNO_PYTHON=\n\nin config.mak?\n\nCiao,\nDscho\n"},{"id":"131075","messageId":"40aa078e1001080249t16b0ee01i5ceb8e7ad2426e70@mail.gmail.com","threadId":"22123","inReplyTo":"alpine.DEB.1.00.1001081135180.4272@intel-tinevez-2-302","subject":"Re: [PATCH] mingw: disable Python","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@googlemail.com","sentAt":"2010-01-08T10:49:22Z","receivedAt":"2010-01-08T10:49:22Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Fri, Jan 8, 2010 at 9:07 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:\n> Wouldn't it be superior to set\n>\n>        PYTHON_PATH =\n\nYes, I think it would. I've tested it (I've got Python 2.6 installed\nin c:\\Python26\\, so with your fix I can re-enable it by setting\n\"PYTHON_PATH=/c/Python26/python.exe\" in config.mak.\n\nOn Fri, Jan 8, 2010 at 11:35 AM, Johannes Schindelin\n<Johannes.Schindelin@gmx.de> wrote:\n> Hi,\n>\n> On Fri, 8 Jan 2010, Johannes Sixt wrote:\n>\n>> Erik Faye-Lund schrieb:\n>> > Python is not commonly installed on Windows machines, so\n>> > we should disable it there by default.\n>> >\n>> > --- a/Makefile\n>> > +++ b/Makefile\n>> > @@ -1027,6 +1027,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n>> > +   NO_PYTHON = YesPlease\n>>\n>> I'm worried that with this solution it is impossible to re-enable Python\n>> in config.mak (how do you undefine a Makefile variable?);\n\n> How about\n>\n>        NO_PYTHON=\n>\n> in config.mak?\n>\n\nThat doesn't work for me, at least not out of the box. NO_PYTHON is\nstill defined, it's just defined to an empty string. I guess we could\nchange to Makefile to accept empty NO_PYTHON as enabled, but since\nHannes' suggestion works fine, I think I'll stick with it, even if\nit's a little inconsistent with the other stuff in the MinGW-section\nof Makefile.\n\nI'll resend a bit later.\n\n-- \nErik \"kusma\" Faye-Lund\n"},{"id":"131085","messageId":"7vpr5kpvmh.fsf@alter.siamese.dyndns.org","threadId":"22123","inReplyTo":"40aa078e1001080249t16b0ee01i5ceb8e7ad2426e70@mail.gmail.com","subject":"Re: [PATCH] mingw: disable Python","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-01-08T13:35:34Z","receivedAt":"2010-01-08T13:35:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Erik Faye-Lund <kusmabite@googlemail.com> writes:\n\n>> On Fri, 8 Jan 2010, Johannes Sixt wrote:\n>>\n>>> Erik Faye-Lund schrieb:\n>>> > Python is not commonly installed on Windows machines, so\n>>> > we should disable it there by default.\n>>> >\n>>> > --- a/Makefile\n>>> > +++ b/Makefile\n>>> > @@ -1027,6 +1027,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n>>> > +   NO_PYTHON = YesPlease\n>>>\n>>> I'm worried that with this solution it is impossible to re-enable Python\n>>> in config.mak (how do you undefine a Makefile variable?);\n>\n>> How about\n>>\n>>        NO_PYTHON=\n>>\n>> in config.mak?\n>\n> That doesn't work for me, at least not out of the box. NO_PYTHON is\n> still defined, it's just defined to an empty string.\n\nI think Dscho is right.  \"ifdef FOO\" yields (and should yield) false if\nFOO is set to empty.\n\n-- >8 -- cut here and try it for yourself -- >8 --\n#!/bin/sh\n\nrm -f config.mk\n\ncat >Makefile <<\\EOF\n# The default is...\nall::\nFROTZ = NITFOL\n-include config.mk\nifdef FROTZ\nall::\n\techo FROTZ is $(FROTZ)\nelse\nall::\n\techo FROTZ is not defined\nendif\nEOF\n\nmake\n# says \"NITFOL\"\n\necho \"FROTZ =\" >config.mk\nmake\n# says \"not defined\"\n\nexit\n-- 8< --\n"},{"id":"131089","messageId":"4B4738AF.9020101@viscovery.net","threadId":"22123","inReplyTo":"7vpr5kpvmh.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] mingw: disable Python","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-01-08T13:52:47Z","receivedAt":"2010-01-08T13:52:47Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Junio C Hamano schrieb:\n> Erik Faye-Lund <kusmabite@googlemail.com> writes:\n>>> On Fri, 8 Jan 2010, Johannes Sixt wrote:\n>>>> (how do you undefine a Makefile variable?);\n>>> How about\n>>>\n>>>        NO_PYTHON=\n>>>\n>>> in config.mak?\n>> That doesn't work for me, at least not out of the box. NO_PYTHON is\n>> still defined, it's just defined to an empty string.\n> \n> I think Dscho is right.  \"ifdef FOO\" yields (and should yield) false if\n> FOO is set to empty.\n\nIndeed. Strange. It didn't work when I tested it a few hours ago, but no\nit works as you say. According to the docs, 'ifdef' actually does not test\ndefined-ness, but emptyness. So, Erik's original version is fine:\n\nAcked-by: Johannes Sixt <j6t@kdbg.org>\n\n-- Hannes\n"},{"id":"131090","messageId":"40aa078e1001080555w1656032dr7d5cc3ca52fffe7f@mail.gmail.com","threadId":"22123","inReplyTo":"7vpr5kpvmh.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] mingw: disable Python","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@googlemail.com","sentAt":"2010-01-08T13:55:49Z","receivedAt":"2010-01-08T13:55:49Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Fri, Jan 8, 2010 at 2:35 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> Erik Faye-Lund <kusmabite@googlemail.com> writes:\n>\n>>> On Fri, 8 Jan 2010, Johannes Sixt wrote:\n>>>\n>>>> Erik Faye-Lund schrieb:\n>>>> > Python is not commonly installed on Windows machines, so\n>>>> > we should disable it there by default.\n>>>> >\n>>>> > --- a/Makefile\n>>>> > +++ b/Makefile\n>>>> > @@ -1027,6 +1027,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n>>>> > +   NO_PYTHON = YesPlease\n>>>>\n>>>> I'm worried that with this solution it is impossible to re-enable Python\n>>>> in config.mak (how do you undefine a Makefile variable?);\n>>\n>>> How about\n>>>\n>>>        NO_PYTHON=\n>>>\n>>> in config.mak?\n>>\n>> That doesn't work for me, at least not out of the box. NO_PYTHON is\n>> still defined, it's just defined to an empty string.\n>\n> I think Dscho is right.  \"ifdef FOO\" yields (and should yield) false if\n> FOO is set to empty.\n>\n\nIn that case I guess I messed up my test. I'll retest.\n\nYes, I messed up. \"NO_PYTHON=\" works like a charm.\n\nSo, no repost :)\n\n-- \nErik \"kusma\" Faye-Lund\n"}]}