From 1a02f38cf336aa9db09d183218a3a48a81977b9e Mon Sep 17 00:00:00 2001 From: robk-tahoe <robk-tahoe@allmydata.com> Date: Tue, 26 Feb 2008 17:03:53 -0700 Subject: [PATCH] mac build: updates to respect UPLOAD_DEST argument to make the make mac-upload target now requires an UPLOAD_DEST argument to be given, which is the rsync destination (including trailing '/') to which the version stamped directory containing the .dmg should be placed. the account the build is running as (e.g. 'buildslave') should have ssh access to the account specified in that dest. one might also consider locking the key down to the target directory by adding something like command="rsync --server -vlogDtpr . /home/amduser/public_html/dist/mac-blah/" to the corresponding authorized_key entry on the target machine. --- Makefile | 2 +- mac/Makefile | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ca4a1afc..90b759c0 100644 --- a/Makefile +++ b/Makefile @@ -441,7 +441,7 @@ mac-dist: VERSION=$(VER) $(MAKE) -C mac diskimage mac-upload: - VERSION=$(VER) $(MAKE) -C mac upload + VERSION=$(VER) $(MAKE) -C mac upload UPLOAD_DEST=$(UPLOAD_DEST) mac-cleanup: VERSION=$(VER) $(MAKE) -C mac cleanup diff --git a/mac/Makefile b/mac/Makefile index cb614478..37fd985b 100644 --- a/mac/Makefile +++ b/mac/Makefile @@ -16,14 +16,20 @@ diskimage: hdiutil internet-enable -yes Allmydata-$(VERSION).dmg rm -r Allmydata-$(VERSION) allmydata-rw.dmg allmydata-ro.dmg +ifdef UPLOAD_DEST upload: mkdir $(VERSION) - mv Allmydata-$(VERSION).dmg $(VERSION)/ + cp Allmydata-$(VERSION).dmg $(VERSION)/ chmod -R go+rx $(VERSION)/ - rsync -av $(VERSION) amduser@svn.allmydata.com:/home/amduser/public_html/dist/tahoe/mac/ + rsync -av $(VERSION) $(UPLOAD_DEST) + rm -r $(VERSION) +else +upload: + $(error UPLOAD_DEST must be set when using upload target. e.g. make upload UPLOAD_DEST=amduser@svn.allmydata.com:/home/amduser/public_html/dist/tahoe/mac-blah/) +endif cleanup: - rm -r $(VERSION) + rm Allmydata-$(VERSION).dmg clean: rm -rf build dist -- 2.45.2