diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-26 12:44:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-26 12:44:12 +0000 |
| commit | d1562fd068dfefd8bd75d53d098d587456c8c664 (patch) | |
| tree | f3ac622eedaf7556ac307b59c49d312a9f73b885 /defs | |
| parent | 9d08aaf5739dbec0544b81025578b7845e676a03 (diff) | |
| download | ruby-d1562fd068dfefd8bd75d53d098d587456c8c664.tar.gz | |
vcs.rb: commit
* tool/vcs.rb (commit): do commit, reset svn revision to sync git
mirror.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 3698f33521..d961e27f77 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -136,22 +136,10 @@ $(TIMESTAMPDIR)/.exec.time: $(Q) mkdir exec $(Q) exit > $@ -ifneq (,) -else ifeq ($(VCS),svn) -VCSCOMMIT = $(VCS) commit $(SVNCOMMITOPTIONS) -else ifeq ($(VCS),git svn) -VCSCOMMIT = $(VCS) dcommit $(GITSVNCOMMITOPTIONS) -VCSWAIT = sleep 2 # wait for svn to git sync -else ifeq ($(VCS),git) -VCSCOMMIT := $(VCS) push $(GITCOMMITOPTIONS) -endif -ifneq ($(VCSCOMMIT),) .PHONY: commit commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS))) - @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSCOMMIT) - $(Q)$(VCSWAIT) + @$(BASERUBY) -C "$(srcdir)" -I./tool -rvcs -e 'VCS.detect(".").commit' $(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY update-src srcs all-incs -endif ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2) extract-gems: update-gems |