mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-21 05:53:12 +00:00
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.
This commit is contained in:
parent
301dd3d489
commit
1a02f38cf3
2
Makefile
2
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
|
||||
|
12
mac/Makefile
12
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
|
||||
|
Loading…
Reference in New Issue
Block a user