From c5f3e8f7e47779a6babfb489c44a53ce925ad38d Mon Sep 17 00:00:00 2001 From: Ryan Thomas <rthomas@atlassian.com> Date: Fri, 20 Mar 2015 23:10:36 +0000 Subject: [PATCH] Add a new target to release using sftp instead of scp --- Cabal/Makefile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Cabal/Makefile b/Cabal/Makefile index d0b3b2a329..297683ca94 100644 --- a/Cabal/Makefile +++ b/Cabal/Makefile @@ -2,13 +2,13 @@ VERSION=1.22.2.0 #KIND=devel -KIND=rc -#KIND=cabal-latest +#KIND=rc +KIND=cabal-latest PREFIX=/usr/local HC=ghc GHCFLAGS=-Wall -threaded -SSH_USER=$(USER) +SSH_USER=cabal-site all: build @@ -23,6 +23,8 @@ SDIST_STAMP=dist/Cabal-$(VERSION).tar.gz DISTLOC=dist/release DIST_STAMP=$(DISTLOC)/Cabal-$(VERSION).tar.gz +TMP := $(shell mktemp -d) + COMMA=, setup: $(SOURCES) Setup.hs @@ -111,6 +113,14 @@ release: $(DIST_STAMP) scp -r $(DISTLOC) $(SSH_USER)@haskell.org:/home/web/haskell.org/cabal/release/cabal-$(VERSION) ssh $(SSH_USER)@haskell.org 'cd /home/web/haskell.org/cabal/release && rm -f $(KIND) && ln -s cabal-$(VERSION) $(KIND)' +release-new: $(DIST_STAMP) + @echo "cd cabal/release" > $(TMP)/cabal-sftp-$(VERSION) + @echo "mkdir cabal-$(VERSION)" >> $(TMP)/cabal-sftp-$(VERSION) + @echo "cd cabal-$(VERSION)" >> $(TMP)/cabal-sftp-$(VERSION) + @echo "lcd $(DISTLOC)" >> $(TMP)/cabal-sftp-$(VERSION) + @echo "put *" >> $(TMP)/cabal-sftp-$(VERSION) + sftp -b $(TMP)/cabal-sftp-$(VERSION) $(SSH_USER)@wiki.haskell.org + # tags... TAGSSRCDIRS = Distribution Language -- GitLab