From a991dde8f59196e84410e8e0a3a83cb89d366704 Mon Sep 17 00:00:00 2001 From: gspia Date: Thu, 30 Jun 2016 08:17:33 +0300 Subject: [PATCH] deps versions update --- README.md | 1 + deps/heist | 2 +- deps/io-streams | 2 +- deps/io-streams-haproxy | 2 +- deps/snap-core | 2 +- deps/snap-server | 2 +- deps/xmlhtml | 2 +- pullLatestMaster.sh | 20 ++++++++++++++++++++ 8 files changed, 27 insertions(+), 6 deletions(-) create mode 100755 pullLatestMaster.sh diff --git a/README.md b/README.md index 82fca786..3027484e 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ run ./init-sandbox.sh cabal install +(You may want to look at pull.sh or pullLatestMaster.sh.) This updates all the Snap Framework dependencies to the correct version, creates a sandbox, and installs everything. The snap library is built using [Cabal](http://www.haskell.org/cabal/) and diff --git a/deps/heist b/deps/heist index 8e1a2023..3ec7c1ea 160000 --- a/deps/heist +++ b/deps/heist @@ -1 +1 @@ -Subproject commit 8e1a202387416f154c90f12275675792271fa1db +Subproject commit 3ec7c1ea9187f3c7aa1ea0b9af86999c43781ca8 diff --git a/deps/io-streams b/deps/io-streams index 22b36fe8..a0e88e1f 160000 --- a/deps/io-streams +++ b/deps/io-streams @@ -1 +1 @@ -Subproject commit 22b36fe84a969e2b4caa3ee66d9a2bf2789fd25b +Subproject commit a0e88e1ffe8769907dc4f2200c20fcd0c55ac330 diff --git a/deps/io-streams-haproxy b/deps/io-streams-haproxy index ab208d49..10aa3169 160000 --- a/deps/io-streams-haproxy +++ b/deps/io-streams-haproxy @@ -1 +1 @@ -Subproject commit ab208d49fe73c9cf05e46c0d929eec311fb0cfd9 +Subproject commit 10aa31692920ccb73adf27ca73b00ca37c1c6acb diff --git a/deps/snap-core b/deps/snap-core index b5ca1f08..55c055f9 160000 --- a/deps/snap-core +++ b/deps/snap-core @@ -1 +1 @@ -Subproject commit b5ca1f086f8cd49a8f139e2547d597a87ddc3ef1 +Subproject commit 55c055f9e6b8b7c884247ffa7df382c2759b966e diff --git a/deps/snap-server b/deps/snap-server index f2c4ced4..7a5c3890 160000 --- a/deps/snap-server +++ b/deps/snap-server @@ -1 +1 @@ -Subproject commit f2c4ced4f3414a3a2e7eaf422c5002a8decb2512 +Subproject commit 7a5c389046e071bafe7d196378c678ced0ab985f diff --git a/deps/xmlhtml b/deps/xmlhtml index afddf8e9..8a53a990 160000 --- a/deps/xmlhtml +++ b/deps/xmlhtml @@ -1 +1 @@ -Subproject commit afddf8e9f02d25b45778d3a9503c9b26e2a6b024 +Subproject commit 8a53a990185a1e7e26ee550d2b29d3a28480cbc5 diff --git a/pullLatestMaster.sh b/pullLatestMaster.sh new file mode 100755 index 00000000..00c552dd --- /dev/null +++ b/pullLatestMaster.sh @@ -0,0 +1,20 @@ +#! /bin/sh + +# This script is a convenient shortcut for pulling and updating all +# submodules. + +# The following gets the versions parent (snap) is pointing, not necessaraly the +# latest. +git pull && git submodule update --init --recursive + +# This will get the latest. Use with care.. +git submodule foreach "(git checkout master; git pull --recurse-submodules)&" + +# This will show, what has changed +# git status + +# Haven't tried the following: +# git submodule init +# git submodule update +# git submodule foreach 'git fetch origin; git checkout $(git rev-parse --abbrev-ref HEAD); git reset --hard origin/$(git rev-parse --abbrev-ref HEAD); git submodule update --recursive; git clean -dfx' +