Merge remote-tracking branch 'origin/rc/v1.5.0' into rc/v1.5.0

Author: borsboom

doc/install_and_upgrade.md

@@ -295,10 +295,18 @@ For more information and other shells, see [the shell auto-completion page](shel
 
 ## Upgrade
 
-There are essentially three different approaches to upgrade:
+There are essentially four different approaches to upgrade:
 
-* The `stack` tool itself ships with an `upgrade` command, which will build `stack` from source and install it to the default install path (see the previous section). You can use `stack upgrade` to get the latest official release, and `stack upgrade --git` to install from Git and live on the bleeding edge. If you follow this, make sure that this directory is on your `PATH` and takes precedence over the system installed `stack`. For more information, see [this discussion](https://github.com/commercialhaskell/stack/issues/237#issuecomment-126793301).
+* The `stack` tool itself ships with an `upgrade` command, which download a `stack` binary or build it from source and install it to the default install path (e.g. `~/.local/bin` or `%APPDATA%\local\bin`; see the [Path](#Path) section above). You can use `stack upgrade` to get the latest official release, and `stack upgrade --git` to install from Git and live on the bleeding edge. Make sure the default install directory is on your `PATH` and takes precedence over the system installed `stack`, or copy `stack` from that directory to the system location afterward. For more information, see [this discussion](https://github.com/commercialhaskell/stack/issues/237#issuecomment-126793301).
 
-* If you're using a package manager (e.g., the Ubuntu debs listed above) and are happy with sticking with the officially released binaries, simply follow your normal package manager strategies for upgrading (e.g. `apt-get update && apt-get upgrade`).
+* If you're using a package manager and are happy with sticking with the officially released binaries from the distribution (which may the lag behind latest version of Stack significantly), simply follow your normal package manager strategies for upgrading (e.g. `apt-get update && apt-get upgrade`).
 
-* If you're not using a package manager but want to stick with the official binaries (such as on Windows or Mac), you'll need to manually follow the steps above to download the newest binaries from the release page and replace the old binary.
+* The get.haskellstack.org script supports the `-f` argument to over-write the current stack executable.  For example:
+
+      curl -sSL https://get.haskellstack.org/ | sh -s - -f
+
+  or:
+
+      wget -qO- https://get.haskellstack.org/ | sh -s - -f
+
+* Manually follow the steps above to download the newest binaries from the release page and replace the old binary.

etc/scripts/get-stack.sh

@@ -7,12 +7,21 @@
 # or:
 #   'wget -qO- https://get.haskellstack.org/ | sh'
 #
+# By default, this installs 'stack' to '/usr/local/bin'.
+#
+# Arguments (use `... | sh -s - ARGUMENTS`)
+#
+# -q: reduce script's output
+# -f: force over-write even if 'stack' already installed
+# -d DESTDIR: change destination directory
+#
 # Make pull requests at:
 # https://github.com/commercialhaskell/stack/blob/master/etc/scripts/get-stack.sh
 #
 
 HOME_LOCAL_BIN="$HOME/.local/bin"
-USR_LOCAL_BIN="/usr/local/bin"
+DEFAULT_DEST="/usr/local/bin/stack"
+DEST=""
 QUIET=""
 FORCE=""
 STACK_TEMP_DIR=
@@ -108,7 +117,7 @@ print_bindist_notice() {
   fi
 }
 
-# Adds a `sudo` prefix if sudo is available to execute the given command
+# Adds a 'sudo' prefix if sudo is available to execute the given command
 # If not, the given command is run as is
 sudocmd() {
   $(command -v sudo) "$@"
@@ -454,15 +463,20 @@ install_from_bindist() {
     if ! tar xzf "$STACK_TEMP_DIR/$1.bindist" -C "$STACK_TEMP_DIR/$1"; then
       die "Extract bindist failed"
     fi
-    if ! sudocmd install -c -o 0 -g 0 -m 0755 "$STACK_TEMP_DIR/$1"/*/stack "$USR_LOCAL_BIN/stack"; then
-      die "Install to $USR_LOCAL_BIN/stack failed"
+    STACK_TEMP_EXE="$STACK_TEMP_DIR/$(basename "$DEST")"
+    mv "$STACK_TEMP_DIR/$1"/*/stack "$STACK_TEMP_EXE"
+    # First attempt to install 'stack' as current user, then try with sudo if it fails
+    if ! install -c -m 0755 "$STACK_TEMP_EXE" "$(dirname "$DEST")" 2>/dev/null; then
+      if ! sudocmd install -c -o 0 -g 0 -m 0755 "$STACK_TEMP_EXE" "$(dirname "$DEST")"; then
+        die "Install to $DEST failed"
+      fi
     fi
 
     post_install_separator
-    info "Stack has been installed to: $USR_LOCAL_BIN/stack"
+    info "Stack has been installed to: $DEST"
     info ""
 
-    check_usr_local_bin_on_path
+    check_dest_on_path
 }
 
 install_arm_binary() {
@@ -631,20 +645,26 @@ check_home_local_bin_on_path() {
 }
 
 # Check whether /usr/local/bin is on the PATH, and print a warning if not.
-check_usr_local_bin_on_path() {
-  if ! on_path "$USR_LOCAL_BIN" ; then
-    info "WARNING: '$USR_LOCAL_BIN' is not on your PATH."
+check_dest_on_path() {
+  if ! on_path "$(dirname $DEST)" ; then
+    info "WARNING: '$(dirname $DEST)' is not on your PATH."
     info ""
   fi
 }
 
 # Check whether Stack is already installed, and print an error if it is.
 check_stack_installed() {
-  if [ "$FORCE" != "true" ] && has_stack ; then
-    die "Stack $(stack_version) already appears to be installed at:
+  if has_stack ; then
+    if [ "$FORCE" = "true" ] ; then
+      [ "$DEST" != "" ] || DEST="$(stack_location)"
+    else
+      die "Stack $(stack_version) already appears to be installed at:
   $(stack_location)
 Use 'stack upgrade' or your OS's package manager to upgrade,
-or pass --force to this script to install anyway."
+or pass '-f' to this script to over-write the existing binary."
+    fi
+  else
+    [ "$DEST" != "" ] || DEST="$DEFAULT_DEST"
   fi
 }
 
@@ -662,6 +682,10 @@ while [ $# -gt 0 ]; do
       FORCE="true"
       shift
       ;;
+    -d|--dest)
+      DEST="$2/stack"
+      shift 2
+      ;;
     *)
       echo "Invalid argument: $1" >&2
       exit 1

etc/scripts/release.hs

@@ -103,8 +103,7 @@ options =
         "Label to give the uploaded release asset"
     , Option "" [noTestHaddocksOptName] (NoArg $ Right $ \g -> g{gTestHaddocks = False})
         "Disable testing building haddocks."
-      -- FIXME: Use 'static' flag in stack.cabal instead.  See https://github.com/commercialhaskell/stack/issues/3045.
-    , Option "" [staticOptName] (NoArg $ Right $ \g -> g{gBuildArgs = gBuildArgs g ++ ["--split-objs", "--ghc-options=-optc-Os -optl-static -fPIC"]})
+    , Option "" [staticOptName] (NoArg $ Right $ \g -> g{gBuildArgs = gBuildArgs g ++ ["--flag=stack:static"]})
         "Build a static binary."
     , Option "" [buildArgsOptName]
         (ReqArg
@@ -137,9 +136,7 @@ rules global@Global{..} args = do
         mapM_ (\f -> need [releaseDir </> f]) binaryPkgFileNames
 
     distroPhonies ubuntuDistro ubuntuVersions debPackageFileName
-    distroPhonies debianDistro debianVersions debPackageFileName
     distroPhonies centosDistro centosVersions rpmPackageFileName
-    distroPhonies fedoraDistro fedoraVersions rpmPackageFileName
 
     releaseDir </> "*" <.> uploadExt %> \out -> do
         let srcFile = dropExtension out
@@ -162,7 +159,7 @@ rules global@Global{..} args = do
                     c
             () <- cmd0 "install" gBuildArgs $ concat $ concat
                 [["--pedantic --no-haddock-deps"], [" --haddock" | gTestHaddocks]]
-            () <- cmd0 (Cwd "etc/scripts") "install" gBuildArgs "cabal-install"
+            () <- cmd0 (Cwd "etc/scripts") "install" "cabal-install"
             let cmd' c = cmd (AddPath [tmpDir] []) stackProgName (stackArgs global) c
             () <- cmd' "test" gBuildArgs "--pedantic --flag stack:integration-tests"
             return ()
@@ -240,9 +237,7 @@ rules global@Global{..} args = do
             (removeFile out)
 
     debDistroRules ubuntuDistro ubuntuVersions
-    debDistroRules debianDistro debianVersions
     rpmDistroRules centosDistro centosVersions
-    rpmDistroRules fedoraDistro fedoraVersions
 
   where
 
@@ -429,28 +424,14 @@ rules global@Global{..} args = do
     rpmPackageVersionStr _ = stackVersionStr global
 
     ubuntuVersions =
-        [ ("12.04", "precise")
-        , ("14.04", "trusty")
-        , ("14.10", "utopic")
-        , ("15.04", "vivid")
-        , ("15.10", "wily")
-        , ("16.04", "xenial")
-        , ("16.10", "yakkety") ]
-    debianVersions =
-        [ ("7", "wheezy")
-        , ("8", "jessie") ]
+        [ ("14.04", "trusty")
+        , ("16.04", "xenial") ]
     centosVersions =
         [ ("7", "el7")
         , ("6", "el6") ]
-    fedoraVersions =
-        [ ("22", "fc22")
-        , ("23", "fc23")
-        , ("24", "fc24") ]
 
     ubuntuDistro = "ubuntu"
-    debianDistro = "debian"
     centosDistro = "centos"
-    fedoraDistro = "fedora"
 
     anyDistroVersion distro = DistroVersion distro "*" "*"
 

etc/scripts/vagrant-distros.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -xe
-"$(dirname "$0")/with-vagrant.sh" debian-7-amd64 "$* upload-ubuntu-12.04 upload-ubuntu-14.04 upload-ubuntu-16.04 upload-ubuntu-16.10 upload-debian-8"
+"$(dirname "$0")/with-vagrant.sh" debian-7-amd64 "$* upload-ubuntu-14.04 upload-ubuntu-16.04"
 "$(dirname "$0")/with-vagrant.sh" centos-7-x86_64 "$* upload-centos-7"
 "$(dirname "$0")/with-vagrant.sh" centos-6-x86_64 "$* --binary-variant=gmp4 upload-centos-6"

etc/scripts/vagrant-releases.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -xe
-"$(dirname "$0")/with-vagrant.sh" alpine-3.4-x86_64 "--binary-variant=static --static $* release"
+"$(dirname "$0")/with-vagrant.sh" alpine-3.6-x86_64 "--binary-variant=static --static $* release"
 "$(dirname "$0")/with-vagrant.sh" freebsd-11.0-amd64 "$* release" "export LANG=en_US.UTF-8;"
 "$(dirname "$0")/with-vagrant.sh" debian-7-amd64 "$* release"
 "$(dirname "$0")/with-vagrant.sh" debian-7-i386 "$* release"

etc/vagrant/alpine-3.4-x86_64/Vagrantfile renamed to etc/vagrant/alpine-3.6-x86_64/Vagrantfile

@@ -1,5 +1,5 @@
 Vagrant.configure(2) do |config|
-  config.vm.box = "maier/alpine-3.4-x86_64"
+  config.vm.box = "maier/alpine-3.6-x86_64"
   config.vm.synced_folder ENV['STACK_BUILD_DIR'], "/vagrant-build", type: "rsync", rsync__verbose: true, rsync__exclude: [".stack-work/", "_release/", ".cabal-sandbox/", "cabal.sandbox.config", "dist/", ".#*#", "*.vdi", "*.vmdk"], rsync__args: ["--verbose", "--archive", "--delete", "-z", "--copy-links"], rsync__rsync_path: "/usr/bin/rsync", rsync__chown: false
   config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__verbose: true, rsync__exclude: [".stack-work/", "_release/", ".cabal-sandbox/", "cabal.sandbox.config", "dist/", ".#*#", "*.vdi", "*.vmdk"], rsync__args: ["--verbose", "--archive", "--delete", "-z", "--copy-links"], rsync__rsync_path: "/usr/bin/rsync", rsync__chown: false
   config.vm.provider "virtualbox" do |vb|
@@ -8,18 +8,9 @@ Vagrant.configure(2) do |config|
   config.ssh.forward_agent = true
   config.vm.provision "shell", inline: <<-SHELL
     set -xe
-    #FIXME: See https://github.com/commercialhaskell/stack/issues/3045, probably use:
-    #FIXME:    apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing ghc ghc-dev cabal
-    if ! grep 's3-us-west-2\.amazonaws\.com/alpine-ghc/7\.10' /etc/apk/repositories; then
-      echo "https://s3-us-west-2.amazonaws.com/alpine-ghc/7.10" |sudo tee -a /etc/apk/repositories
-    fi
-    if ! test -s /etc/apk/keys/[email protected]; then
-      curl -o /etc/apk/keys/[email protected] https://raw.githubusercontent.com/mitchty/alpine-ghc/master/mitch.tishmack%40gmail.com-55881c97.rsa.pub
-    fi
-    apk -q update
-    apk add alpine-sdk linux-headers musl-dev gmp-dev zlib-dev ghc git rsync gnupg xz
-    cp /usr/lib/gcc/x86_64-alpine-linux-musl/5.3.0/crtbeginT.o /usr/lib/gcc/x86_64-alpine-linux-musl/5.3.0/crtbeginT.o.orig
-    cp /usr/lib/gcc/x86_64-alpine-linux-musl/5.3.0/crtbeginS.o /usr/lib/gcc/x86_64-alpine-linux-musl/5.3.0/crtbeginT.o
+    apk update
+    apk add alpine-sdk linux-headers musl-dev gmp-dev zlib-dev git rsync gnupg xz
+    apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/edge/community ghc ghc-dev cabal
     if ! which stack; then
       curl -sSL https://www.stackage.org/stack/linux-x86_64-static \
         | tar xzvf - --wildcards --strip-components=1 -C /usr/local/bin '*/stack'