Merge pull request #1164 from Project-OSRM/appveyor_nuget
Install protoc on both Travis and AppVeyor.
This commit is contained in:
		
						commit
						7edf2bb2c2
					
				| @ -7,7 +7,7 @@ install: | |||||||
|  - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test |  - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test | ||||||
|  - sudo add-apt-repository -y ppa:boost-latest/ppa |  - sudo add-apt-repository -y ppa:boost-latest/ppa | ||||||
|  - sudo apt-get update >/dev/null |  - sudo apt-get update >/dev/null | ||||||
|  - sudo apt-get -q install libprotoc-dev libprotobuf7 libprotobuf-dev libosmpbf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev lua5.1 liblua5.1-0-dev rubygems libtbb-dev |  - sudo apt-get -q install protobuf-compiler libprotoc-dev libprotobuf7 libprotobuf-dev libosmpbf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev lua5.1 liblua5.1-0-dev rubygems libtbb-dev | ||||||
|  - sudo apt-get -q install g++-4.8 |  - sudo apt-get -q install g++-4.8 | ||||||
|  - sudo apt-get install libboost1.54-all-dev |  - sudo apt-get install libboost1.54-all-dev | ||||||
|  #luabind |  #luabind | ||||||
|  | |||||||
| @ -23,6 +23,7 @@ platform: x64 | |||||||
| 
 | 
 | ||||||
| install: | install: | ||||||
|   # by default, all script lines are interpreted as batch |   # by default, all script lines are interpreted as batch | ||||||
|  |   - nuget install Google.ProtocolBuffers | ||||||
|   - cd c:\projects\osrm |   - cd c:\projects\osrm | ||||||
|   - curl -O http://build.project-osrm.org/libs_osrm_%Configuration%.7z |   - curl -O http://build.project-osrm.org/libs_osrm_%Configuration%.7z | ||||||
|   - 7z x libs_osrm_%Configuration%.7z | find ":" |   - 7z x libs_osrm_%Configuration%.7z | find ":" | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user