summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-24 03:42:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-24 03:42:28 +0000
commitcf94bb9a086ec6480c3c1cd4212e1ba6ffa232c1 (patch)
treec0f2ead6137e39e5e46bf0dc0ae96e711c34d707
parentf5e265949fcc0964523e035de9e8dd0ea395be54 (diff)
Don't download from Unicode.org
* tool/make-snapshot: use checked out headers for Unicode, to get rid of downloading data files from Unicode.org. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml2
-rwxr-xr-xtool/make-snapshot3
3 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index f8314c0d30..12539bc77f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ before_script:
- "cp -pr config.status .ext/include config_2nd"
- "diff -ru config_1st config_2nd"
- "make touch-unicode-files"
- - "make after-update BASERUBY=ruby"
+ - "make after-update BASERUBY=ruby UNICODE_FILES=."
- "make -s $JOBS"
- "make update-rubyspec"
diff --git a/appveyor.yml b/appveyor.yml
index 47b24b9189..f2cd1765b2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,7 +35,7 @@ build_script:
- cd %Platform%-mswin_%vs%
- ..\win32\configure.bat --without-ext=+,dbm,gdbm,readline --with-opt-dir=/usr/local --with-openssl-dir=%OPENSSL_DIR:\=/%
- nmake -l touch-unicode-files
- - nmake -l up
+ - nmake -l up UNICODE_FILES=.
- nmake -l
- nmake install-nodoc
test_script:
diff --git a/tool/make-snapshot b/tool/make-snapshot
index b650a35ec8..b235282350 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -330,6 +330,7 @@ def package(vcs, rev, destdir, tmp = nil)
"PWD"=>Dir.pwd,
"CONFIGURE"=>"configure",
"arch"=>"noarch",
+ "UNICODE_FILES"=>"",
}
vars["UNICODE_VERSION"] = $unicode_version if $unicode_version
args = vars.dup
@@ -339,6 +340,8 @@ def package(vcs, rev, destdir, tmp = nil)
prereq: clean-cache $(CLEAN_CACHE)
clean-cache $(CLEAN_CACHE): after-update
+touch-unicode-files:
+update-download:: touch-unicode-files
update-download:: update-gems
after-update:: extract-gems
extract-gems: update-gems