Skip to content

Commit f6070c3

Browse files
gitstergitster
committed
Merge branch 'jk/remove-remote-helpers-in-python'
Remove now disused remote-helpers framework for helpers written in Python. * jk/remove-remote-helpers-in-python: git_remote_helpers: remove little used Python library
2 parents 287c0fe + ae34ac1 commit f6070c3

File tree

16 files changed

+0
-1815
lines changed

16 files changed

+0
-1815
lines changed

‎Makefile‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,9 @@ SCRIPT_PERL += git-relink.perl
485485
SCRIPT_PERL += git-send-email.perl
486486
SCRIPT_PERL += git-svn.perl
487487

488-
SCRIPT_PYTHON += git-remote-testpy.py
489488
SCRIPT_PYTHON += git-p4.py
490489

491490
NO_INSTALL += git-remote-testgit
492-
NO_INSTALL += git-remote-testpy
493491

494492
# Generated files for scripts
495493
SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
@@ -1664,9 +1662,6 @@ ifndef NO_TCLTK
16641662
endif
16651663
ifndef NO_PERL
16661664
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' localedir='$(localedir_SQ)' all
1667-
endif
1668-
ifndef NO_PYTHON
1669-
$(QUIET_SUBDIR0)git_remote_helpers $(QUIET_SUBDIR1) PYTHON_PATH='$(PYTHON_PATH_SQ)' prefix='$(prefix_SQ)' all
16701665
endif
16711666
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
16721667

@@ -1835,12 +1830,7 @@ ifndef NO_PYTHON
18351830
$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
18361831
$(SCRIPT_PYTHON_GEN): % : %.py
18371832
$(QUIET_GEN)$(RM) $@ $@+ && \
1838-
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
1839-
--no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
1840-
instlibdir` && \
18411833
sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
1842-
-e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \
1843-
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
18441834
$< >$@+ && \
18451835
chmod +x $@+ && \
18461836
mv $@+ $@
@@ -2347,9 +2337,6 @@ ifndef NO_PERL
23472337
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
23482338
$(MAKE) -C gitweb install
23492339
endif
2350-
ifndef NO_PYTHON
2351-
$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
2352-
endif
23532340
ifndef NO_TCLTK
23542341
$(MAKE) -C gitk-git install
23552342
$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
@@ -2496,9 +2483,6 @@ clean: profile-clean coverage-clean
24962483
ifndef NO_PERL
24972484
$(MAKE) -C gitweb clean
24982485
$(MAKE) -C perl clean
2499-
endif
2500-
ifndef NO_PYTHON
2501-
$(MAKE) -C git_remote_helpers clean
25022486
endif
25032487
$(MAKE) -C templates/ clean
25042488
$(MAKE) -C t/ clean

‎git-remote-testpy.py‎

Lines changed: 0 additions & 305 deletions
This file was deleted.

‎git_remote_helpers/.gitignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)