[PATCH] git-gui: Remove ancient Cygwin compatibility code

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] git-gui: Remove ancient Cygwin compatibility code

Adam Dinwoodie
From 50c9cbb6ce31529316ba004194f63a24ae59b4b0 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <[hidden email]>
Date: Fri, 13 May 2016 11:52:32 +0100
Subject: [PATCH] git-gui: Remove unused Cygwin compatibility code

Cygwin-distributed builds of git-gui have patched out the
Cygwin-specific compatibility code in the Makefile before compiling
since at least the start of 2012 (specifically since at least Git
v1.7.9).  The compatibility code is clearly not necessary, so remove it
from the official git-gui code as well.

Signed-off-by: Adam Dinwoodie <[hidden email]>
---

I originally submitted this patch back in December, but it didn't
generate any more discussion than Junio saying "this looks like a good
thing to have."  I'm resubmitting to try to generate further discussion
/ agreement to include the patch.

An equivalent patch has been included in the downstream Cygwin releases
since v1.7.9, and therefore is clearly stable and not causing any
notable problems.

I've based this patch off the git-gui tree rather than the main Git tree
per the SubmittingPatches doc.  Pipe it through `sed
's!Makekfile!git-gui/\0!g'` for a version that applies cleanly to the
main Git source tree.

 Makefile | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index fe30be3..a0adf3d 100644
--- a/Makefile
+++ b/Makefile
@@ -136,25 +136,11 @@
 GITGUI_RELATIVE :=
 GITGUI_MACOSXAPP :=
 
-ifeq ($(uname_O),Cygwin)
- GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
-
- # Is this a Cygwin Tcl/Tk binary?  If so it knows how to do
- # POSIX path translation just like cygpath does and we must
- # keep libdir in POSIX format so Cygwin packages of git-gui
- # work no matter where the user installs them.
- #
- ifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /))
- gg_libdir_sed_in := $(gg_libdir)
- else
- gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
- endif
-else
- ifeq ($(exedir),$(gg_libdir))
- GITGUI_RELATIVE := 1
- endif
- gg_libdir_sed_in := $(gg_libdir)
-endif
+ifeq ($(exedir),$(gg_libdir))
+ GITGUI_RELATIVE := 1
+endif
+gg_libdir_sed_in := $(gg_libdir)
+
 ifeq ($(uname_S),Darwin)
  ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
  GITGUI_MACOSXAPP := YesPlease
--
2.8.2.692.g8d9a515
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html