[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone: 8a74ea90e4b85a9ce863ba8c3e
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone: 8a74ea90e4b85a9ce863ba8c3ea9e50a5402795a |
Date: |
Tue, 15 Mar 2011 23:32:21 +0100 (CET) |
revision: 8a74ea90e4b85a9ce863ba8c3ea9e50a5402795a
date: 2011-03-15T22:32:07
author: Richard Levitte <address@hidden>
branch: net.venge.monotone
changelog:
merge of '69fb47f8873dc0a50b7f4ec7738d917ace972288'
and 'bc5ba0e6087fcaf021f3e1c613f4fa1d260e1945'
manifest:
format_version "1"
new_manifest [9295349b48b1dd02cc672a2ef92580a9f4b3fe4e]
old_revision [69fb47f8873dc0a50b7f4ec7738d917ace972288]
patch "doc/Makefile.am"
from [dcc8331723e96245ccf9788fef5c02946580031e]
to [1b40f22318a63b321089da309cfe7c2cfdd1ccc2]
patch "notes/release-checklist.txt"
from [23f2cc440804c681a6ede691e3ddf03dda6c68f5]
to [f2dbe7eb183d5985529713039743b0cb78380718]
old_revision [bc5ba0e6087fcaf021f3e1c613f4fa1d260e1945]
patch "Makefile.am"
from [7a45d1120f9b2cef10580d6678009458332e48d3]
to [a1b913a9a042b4c35c3da9270cb64f0c1f5907e6]
============================================================
--- notes/release-checklist.txt 23f2cc440804c681a6ede691e3ddf03dda6c68f5
+++ notes/release-checklist.txt f2dbe7eb183d5985529713039743b0cb78380718
@@ -17,7 +17,7 @@
Unix: all doc/monotone.pdf doc/monotone.ps distcheck
- Win32: all check win32_installer
+ Win32: all check win32-installer
2) Write user-readable release notes at the top of the NEWS file,
============================================================
--- doc/Makefile.am dcc8331723e96245ccf9788fef5c02946580031e
+++ doc/Makefile.am 1b40f22318a63b321089da309cfe7c2cfdd1ccc2
@@ -36,10 +36,10 @@ EPS_FIGURES=$(PDF_FIGURES:.pdf=.eps)
EPS_FIGURES=$(PDF_FIGURES:.pdf=.eps)
# See the rules further down that does the work.
-PDF_FIGURES_copied = $(addprefix $(abs_builddir)/,$(PDF_FIGURES))
-PNG_FIGURES_copied = $(addprefix $(abs_builddir)/,$(PNG_FIGURES))
-PNG_IMAGES_copied = $(addprefix $(abs_builddir)/,$(PNG_IMAGES))
-HTML_EXTRA_copied = $(addprefix $(abs_builddir)/,$(HTML_EXTRA))
+PDF_FIGURES_copied = $(addprefix $(fix_abs_builddir)/,$(PDF_FIGURES))
+PNG_FIGURES_copied = $(addprefix $(fix_abs_builddir)/,$(PNG_FIGURES))
+PNG_IMAGES_copied = $(addprefix $(fix_abs_builddir)/,$(PNG_IMAGES))
+HTML_EXTRA_copied = $(addprefix $(fix_abs_builddir)/,$(HTML_EXTRA))
TEXI_FRAGMENTS = pcrepattern.texi pcresyntax.texi
@@ -66,19 +66,19 @@ figures/%.ps: figures/%.pdf
$(MKDIR_P) figures
pdftops $< $@
-$(abs_builddir)/figures/%.pdf: figures/%.pdf
+$(fix_abs_builddir)/figures/%.pdf: figures/%.pdf
$(MKDIR_P) figures
cmp -s $< $@ || cp $< $@
-$(abs_builddir)/figures/%.png: figures/%.png
+$(fix_abs_builddir)/figures/%.png: figures/%.png
$(MKDIR_P) figures
cmp -s $< $@ || cp $< $@
-$(abs_builddir)/images/%.png: images/%.png
+$(fix_abs_builddir)/images/%.png: images/%.png
$(MKDIR_P) images
cmp -s $< $@ || cp $< $@
-$(abs_builddir)/texinfo.css: texinfo.css
+$(fix_abs_builddir)/texinfo.css: texinfo.css
cmp -s $< $@ || cp $< $@
# Stealing code from automake and adapting, we want a HTML file tree as well
============================================================
--- Makefile.am 7a45d1120f9b2cef10580d6678009458332e48d3
+++ Makefile.am a1b913a9a042b4c35c3da9270cb64f0c1f5907e6
@@ -263,13 +263,19 @@ dist_mtnscripts_SCRIPTS = \
extra/mtn-hooks/monotone-ciabot.py \
extra/mtn-hooks/monotone-mail-notify
-# Some of the smaller programs do not have --help or --version, make
-# them exempt of the check for those. Programs intendend to be called
-# by mtn hooks don't need --help or --version; others should have
-# them. NOTE: each filename in this list MUST be surrounded by exactly
-# one space before and after.
-#
-AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = extra/bin/mtn-cleanup extra/mtn-hooks/monotone-ciabot.py extra/mtn-hooks/monotone-mail-notify
+# Some of the smaller programs do not have --help or --version,
+# make them exempt of the check for those. This specially applies
+# to programs intended to be called by mtn hooks, for which these
+# options aren't necessary.
+# NOTE: in the expansion of this variable, each filename MUST be
+# surrounded by one space before and after. Having a tab between
+# two file names will guarantee that they won't be exempt. This
+# is really a small but serious bug in the automake templates.
+# backslash+newline+whitespace will be reinterpreted as whitespace
+# by make.
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = \
+ extra/bin/mtn-cleanup extra/mtn-hooks/monotone-ciabot.py \
+ extra/mtn-hooks/monotone-mail-notify
# flags
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone: 8a74ea90e4b85a9ce863ba8c3ea9e50a5402795a,
code <=