simplified vcpkg deps lists

Signed-off-by: Mikhail Boldyrev <miboldyrev@gmail.com>
hyperledger · Nov 2, 2019 · 2d6c29c · 2d6c29c
1 parent c788df9
commit 2d6c29c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 45 deletions.
diff --git a/.packer/win/scripts/vcpkg.ps1 b/.packer/win/scripts/vcpkg.ps1
@@ -18,10 +18,8 @@ echo "Run bootstrap-vcpkg.bat"
 Invoke-Expression "$vcpkg_path\bootstrap-vcpkg.bat"
 
 echo "Installing vcpkg packages"
-Invoke-Expression "$vcpkg_path\vcpkg.exe install (Get-Content -Path $iroha_vcpkg_path\VCPKG_DEPS_LIST).replace(`":`",`":x64-windows`")"
-
-echo "Installing rx-cpp"
-Invoke-Expression "$vcpkg_path\vcpkg.exe install --head (Get-Content -Path $iroha_vcpkg_path\VCPKG_HEAD_DEPS_LIST).replace(`":`",`":x64-windows`")"
+Invoke-Expression "$vcpkg_path\vcpkg.exe install --triplet x64-windows (Get-Content -Path $iroha_vcpkg_path\VCPKG_DEPS_LIST)"
+Invoke-Expression "$vcpkg_path\vcpkg.exe install --triplet x64-windows --head (Get-Content -Path $iroha_vcpkg_path\VCPKG_HEAD_DEPS_LIST)"
 
 echo "Run vcpkg.exe integrate install"
 Invoke-Expression "$vcpkg_path\vcpkg.exe integrate install"
diff --git a/vcpkg/VCPKG_BOOST_LOCALE_DEPS_LIST b/vcpkg/VCPKG_BOOST_LOCALE_DEPS_LIST
diff --git a/vcpkg/VCPKG_DEPS_LIST b/vcpkg/VCPKG_DEPS_LIST
@@ -1,23 +1,23 @@
-protobuf:
-grpc:
-tbb:
-gtest:
-gflags:
-soci[boost,postgresql]:
-rapidjson:
-fmt:
-spdlog:
-boost-filesystem:
-boost-system:
-boost-thread:
-boost-variant:
-boost-multiprecision:
-boost-bimap:
-boost-format:
-boost-circular-buffer:
-boost-assign:
-boost-uuid:
-boost-accumulators:
-boost-property-tree:
-boost-process:
-iroha-ed25519:
+protobuf
+grpc
+tbb
+gtest
+gflags
+soci[boost,postgresql]
+rapidjson
+fmt
+spdlog
+boost-filesystem
+boost-system
+boost-thread
+boost-variant
+boost-multiprecision
+boost-bimap
+boost-format
+boost-circular-buffer
+boost-assign
+boost-uuid
+boost-accumulators
+boost-property-tree
+boost-process
+iroha-ed25519
diff --git a/vcpkg/VCPKG_HEAD_DEPS_LIST b/vcpkg/VCPKG_HEAD_DEPS_LIST
@@ -1 +1 @@
-rxcpp:
+rxcpp
diff --git a/vcpkg/VCPKG_NO_SANITIZERS_DEPS_LIST b/vcpkg/VCPKG_NO_SANITIZERS_DEPS_LIST
@@ -0,0 +1,15 @@
+boost-assert
+boost-build
+boost-config
+boost-function
+boost-integer
+boost-iterator
+boost-modular-build-helper
+boost-smart-ptr
+boost-static-assert
+boost-system
+boost-thread
+boost-type-traits
+boost-unordered
+boost-vcpkg-helpers
+libiconv
diff --git a/vcpkg/build_iroha_deps.sh b/vcpkg/build_iroha_deps.sh
@@ -8,5 +8,5 @@ git clone https://github.com/microsoft/vcpkg $vcpkg_path
 git -C $vcpkg_path checkout $(cat "$iroha_vcpkg_path"/VCPKG_COMMIT_SHA)
 for i in "$iroha_vcpkg_path"/patches/*.patch; do git -C $vcpkg_path apply $i; done;
 $vcpkg_path/bootstrap-vcpkg.sh
-$vcpkg_path/vcpkg install $(cat "$iroha_vcpkg_path"/VCPKG_DEPS_LIST | cut -d':' -f1 | tr '\n' ' ')
-$vcpkg_path/vcpkg install --head $(cat "$iroha_vcpkg_path"/VCPKG_HEAD_DEPS_LIST | cut -d':' -f1 | tr '\n' ' ')
+cat "$iroha_vcpkg_path"/VCPKG_DEPS_LIST | xargs $vcpkg_path/vcpkg install
+cat "$iroha_vcpkg_path"/VCPKG_HEAD_DEPS_LIST | xargs $vcpkg_path/vcpkg install --head