diff options
| author | Jisi Liu <liujisi@google.com> | 2016-08-26 14:54:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-26 14:54:44 -0700 |
| commit | 4fd4471de240627be8d18f6b5667f934fc4c166f (patch) | |
| tree | 78d59714818ffa5339bf4c4c8391d522de8a66c6 | |
| parent | 45d04d02960817b42b8ccc1c4f7063a4ad998d33 (diff) | |
| parent | 1760feb621a913189b90fe8595fffb74bce84598 (diff) | |
| download | protobuf-4fd4471de240627be8d18f6b5667f934fc4c166f.tar.gz protobuf-4fd4471de240627be8d18f6b5667f934fc4c166f.tar.bz2 protobuf-4fd4471de240627be8d18f6b5667f934fc4c166f.zip | |
Merge pull request #2014 from pherl/fixgmock
Change autogen.sh to download the zip from github
| -rw-r--r-- | appveyor.yml | 12 | ||||
| -rwxr-xr-x | autogen.sh | 13 |
2 files changed, 18 insertions, 7 deletions
diff --git a/appveyor.yml b/appveyor.yml index ce797c69..2ea3cb78 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,9 +19,15 @@ environment: test: off install: - - ps: Start-FileDownload https://googlemock.googlecode.com/files/gmock-1.7.0.zip - - 7z x gmock-1.7.0.zip - - rename gmock-1.7.0 gmock + - ps: Start-FileDownload https://github.com/google/googlemock/archive/release-1.7.0.zip + - 7z x release-1.7.0.zip + - del /Q release-1.7.0.zip + - rename googlemock-release-1.7.0 gmock + - ps: Start-FileDownload https://github.com/google/googletest/archive/release-1.7.0.zip + - 7z x release-1.7.0.zip + - del /Q release-1.7.0.zip + - rename googletest-release-1.7.0 gtest + - move gtest gmock - ps: Start-FileDownload https://go.microsoft.com/fwlink/?LinkID=809122 -FileName dotnetsdk.exe - dotnetsdk.exe /install /quiet /norestart @@ -31,10 +31,15 @@ fi # directory is set up as an SVN external. if test ! -e gmock; then echo "Google Mock not present. Fetching gmock-1.7.0 from the web..." - curl $curlopts -O https://googlemock.googlecode.com/files/gmock-1.7.0.zip - unzip -q gmock-1.7.0.zip - rm gmock-1.7.0.zip - mv gmock-1.7.0 gmock + curl $curlopts -L -O https://github.com/google/googlemock/archive/release-1.7.0.zip + unzip -q release-1.7.0.zip + rm release-1.7.0.zip + mv googlemock-release-1.7.0 gmock + + curl $curlopts -L -O https://github.com/google/googletest/archive/release-1.7.0.zip + unzip -q release-1.7.0.zip + rm release-1.7.0.zip + mv googletest-release-1.7.0 gmock/gtest fi set -ex |