diff --git a/Mmakefile b/Mmakefile index ced3f7a03..18dd6e33a 100644 --- a/Mmakefile +++ b/Mmakefile @@ -178,6 +178,8 @@ tar: README INSTALL # Package up the mercury directory and the tests directory, # but with some subdirectories excluded, into a gzipped tar # archive that will unpack into mercury-$(VERSION). + # Put the extras directory into a gzipped tar archive that + # will unpack into mercury-$(VERSION)-extras. cd .. && ( \ mv mercury mercury-$(VERSION); \ mv tests mercury-$(VERSION)/tests; \ @@ -185,10 +187,14 @@ tar: README INSTALL mv mercury-$(VERSION)/trial stuff-to-exclude; \ mv mercury-$(VERSION)/bytecode stuff-to-exclude; \ mv mercury-$(VERSION)/lp_solve stuff-to-exclude; \ + mv mercury-$(VERSION)/extras mercury-$(VERSION)-extras; \ tar -cf - mercury-$(VERSION) | \ gzip -9 > mercury-$(VERSION).tar.gz; \ mv stuff-to-exclude/* mercury-$(VERSION); \ rmdir stuff-to-exclude; \ + tar -cf - mercury-$(VERSION)-extras | \ + gzip -9 > mercury-$(VERSION)-extras.tar.gz; \ + mv mercury-$(VERSION)-extras mercury-$(VERSION)/extras; \ mv mercury-$(VERSION)/tests tests; \ mv mercury-$(VERSION) mercury \ ) diff --git a/tools/test_mercury b/tools/test_mercury index 26f0dc36d..959e19a29 100755 --- a/tools/test_mercury +++ b/tools/test_mercury @@ -311,7 +311,8 @@ case $HOST in murlibobo) mmake MMAKEFLAGS='EXTRA_MCFLAGS="-O5 --opt-space" -j6' tar && cd .. && rm -f mercury-latest-unstable/* && - mv mercury-$version.tar.gz mercury-latest-unstable + mv mercury-$version.tar.gz mercury-latest-unstable && + mv mercury-$version-extras.tar.gz mercury-latest-unstable } || status=1 ;; esac @@ -388,9 +389,13 @@ case $status in rm -f mercury-latest-stable/* && ln mercury-latest-unstable/mercury-$version.tar.gz \ mercury-latest-stable/mercury-$version.tar.gz && + ln mercury-latest-unstable/mercury-$version-extras.tar.gz + mercury-latest-stable/mercury-$version-extras.tar.gz && rm -f /home/tsa/ftp/pub/mercury/beta-releases/mercury-rotd-*.tar.gz cp mercury-latest-stable/mercury-$version.tar.gz \ /home/tsa/ftp/pub/mercury/beta-releases + cp mercury-latest-stable/mercury-$version-extras.tar.gz \ + /home/tsa/ftp/pub/mercury/beta-releases ;; esac echo "test_mercury exiting successfully at `date`" 1>&2