Skip to content

Commit

Permalink
Bits of tidying during release
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Pierce committed Jan 27, 2018
1 parent f804e03 commit f70d64c
Show file tree
Hide file tree
Showing 4 changed files with 244 additions and 80 deletions.
25 changes: 13 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,26 @@ endif
DOWNLOADDIR=/tmp/$(NAME)-$(VERSION)
# DOWNLOADDIR=$(REALDOWNLOADDIR)

# OLD
# Do this when it's time to create a new beta-release from the development trunk
beta:
@echo "Makefile needs fixing"
@exit 1
@tools/ask tools/exportmsg.txt
(cd ..; svn copy trunk branches/$(BRANCH))
(cd ../branches/$(BRANCH); svn commit -m "New release branch")
@echo
@echo "Press RETURN to export it... "
@read JUNK
$(MAKE) -C ../branches/$(BRANCH) export
#beta:
# @echo "Makefile needs fixing"
# @exit 1
# @tools/ask tools/exportmsg.txt
# (cd ..; svn copy trunk branches/$(BRANCH))
# (cd ../branches/$(BRANCH); svn commit -m "New release branch")
# @echo
# @echo "Press RETURN to export it... "
# @read JUNK
# $(MAKE) -C ../branches/$(BRANCH) export

# Do this in a release branch to export a new tarball (e.g., after fixing a bug)
# (builds a beta release)
export:
@echo
@echo "CHECKLIST:"
@echo " - Bump version number in src/Makefile.ProjectInfo"
@echo " - Bump minor version number in src/Makefile.ProjectInfo"
@echo " - Move everything interesting from src/RECENTNEWS to doc/changes.tex"
@echo " - Do 'make checkin'"
@echo ""
@echo "If all this is done, hit RETURN (otherwise Ctrl-C and do it)"
@read JUNK
Expand Down
2 changes: 1 addition & 1 deletion doc/changes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
\item Ported to 10.13, High Sierra, and Apple's new APFS (earlier
versions of Unison break because of new behavior of AppleDouble files)
\item Replaced Growl with OS X native notification center.
\end{itemioze}
\end{itemize}
\item Miscellaneous:
\begin{itemize}
\item The OCaml compiler version is now included in the ``connection header
Expand Down
25 changes: 23 additions & 2 deletions src/NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@

Changes in Version 2.49.543
Changes in Version 2.51.2

Changes since 2.48:
* Repository transplanted from SVN to Git and moved to GitHub ()
(https://github.com/bcpierce00/unison).
* Add a new preference, 'atomic', for specifying directories that
should be treated atomically: if there are changes within such a
directory in both replicase, the whole directory is marked as a
conflict instead of propagating any of the changes. Thanks to
Julian Squires for submitting this patch!
* OSX / macOS
+ Ported to 10.13, High Sierra, and Apple's new APFS (earlier
versions of Unison break because of new behavior of
AppleDouble files)
+ Replaced Growl with OS X native notification center.
* Miscellaneous:
+ The OCaml compiler version is now included in the "connection
header -- the string that's printed when connecting to a
remote server -- to facilitate debugging version mismatch
issues.
+ Compatible with OCaml 4.06.
+ Added a DockerFile for the convenience of Docker users.
+ Many small bugfixes and UI improvements.

Changes since 2.45:
* Incorporated a patch from Christopher Zimmermann to replace the
Expand Down Expand Up @@ -1175,7 +1197,6 @@ Changes in Version 2.49.543
and on the command line.
You can achieve a similar effect, though, by breaking your profile
into two:

default.prf =
root = blah
root = foo
Expand Down
Loading

0 comments on commit f70d64c

Please sign in to comment.