archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add --with-git option

Browse source 
* configure.in, win32/configure.bat: add --with-git option to
  tell git command to use, or not to use git.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-04-10 01:22:48 +00:00
parent 68c9c97f13
commit 0ab20b48c5
5 changed files with 59 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
win32/Makefile.sub
View file

@ -393,14 +393,34 @@ top_srcdir = $(srcdir)
hdrdir = $(srcdir)/include
VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/missing;$(win_srcdir)
!ifndef GIT
GIT = git
!endif
!if "$(HAVE_GIT)" == "yes" || "$(HAVE_GIT)" == "no"
!else if "$(GIT)" == ""
HAVE_GIT = no
!else if [for %I in ($(GIT)) @if not "%~xI" == "" exit 1]
! if [for %I in ($(GIT)) @if not "%~$PATH:I" == "" exit 1]
HAVE_GIT = yes
! else
HAVE_GIT = no
! endif
!else
! if [for %x in (%PATHEXT:;= %) do @for %I in ($(GIT)%x) do @if not "%~$PATH:I" == . exit 1]
HAVE_GIT = yes
! else
HAVE_GIT = no
! endif
!endif
!if exist($(srcdir)/.svn)
VCS = svn
VCSUP = $(VCS) up $(SVNUPOPTIONS)
!else if exist($(srcdir)/.git/svn)
VCS = git svn
VCS = $(GIT) svn
VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS)
!else if exist($(srcdir)/.git)
VCS = git
VCS = $(GIT)
VCSUP = $(VCS) pull $(GITPULLOPTIONS)
!else
VCSUP = rem

14
win32/configure.bat
View file

@ -41,6 +41,8 @@ if "%1" == "--path" goto :path
if "%1" == "--with-baseruby" goto :baseruby
if "%1" == "--with-ntver" goto :ntver
if "%1" == "--with-libdir" goto :libdir
if "%1" == "--with-git" goto :git
if "%1" == "--without-git" goto :nogit
if "%1" == "--without-ext" goto :witharg
if "%1" == "--without-extensions" goto :witharg
if "%opt:~0,10%" == "--without-" goto :withoutarg
@ -179,6 +181,18 @@ goto :loop ;
shift
shift
goto :loop ;
:git
echo>> ~tmp~.mak "GIT=%~2" \
echo>>confargs.tmp %1=%2 \
shift
shift
goto :loop ;
:nogit
echo>> ~tmp~.mak "GIT=never-use" \
echo>> ~tmp~.mak "HAVE_GIT=no" \
echo>>confargs.tmp %1 \
shift
goto :loop ;
:witharg
echo>>confargs.tmp %1=%2\
set witharg=1