# # # patch "ChangeLog" # from [e2fd0804a517a3c62c2619e07fb1401d4c9c50ee] # to [462a0dd3b759d4d509d17e87a8005b8acdf9027e] # # patch "Makefile.am" # from [c9577f4e9a331ff0110753c599226cc3cc304731] # to [a61f337bcc2bf1d209eb7accc833a634207470aa] # # patch "tests/t_empty_env.at" # from [af591814e1d48a9a9a804faef42b81c4c3bc7511] # to [8478ee958c97601d85cf9129efd85674e34442cf] # # patch "tests/t_netsync_notes.at" # from [fe5855379bb052b21d11c429bbbc89eb495d5bac] # to [10ac197fb65d91349b2c11164f03af8c0f45dc9a] # # patch "win32/monotone.iss" # from [48ab358ef0443f95fd1db2d14767914ffb6cbe60] # to [f9c71207ff1d42c58cfdf76018e3c77fb83fbd4a] # ============================================================ --- ChangeLog e2fd0804a517a3c62c2619e07fb1401d4c9c50ee +++ ChangeLog 462a0dd3b759d4d509d17e87a8005b8acdf9027e @@ -1,3 +1,18 @@ +2006-03-18 Matthew Gregan + + * Makefile.am: Fix a couple of cases where documentation was + failing to build. If you're building outside of the source dir we + need to copy figures/ and std_hooks.lua into the build dir. + + * win32/monotone.iss: Include zlib1.dll in installer package. + + * tests/t_empty_env.at: Copy zlib1.dll into the current directory + like we have to for libiconv-2.dll. While here, add a check for + LD_LIBRARY_PATH and cause the test to be skipped if it is set. + + * tests/t_netsync_notes.at: Canonicalise output in a few places so + that the test passes on CRLF platforms. + 2006-03-17 Richard Levitte * tests/t_netsync_notes.at: New test to check that the ============================================================ --- Makefile.am c9577f4e9a331ff0110753c599226cc3cc304731 +++ Makefile.am a61f337bcc2bf1d209eb7accc833a634207470aa @@ -530,15 +530,21 @@ # automake doesn't build html docs monotone.html: monotone.texi version.texi std_hooks.lua texinfo.css + cp -r $(srcdir)/figures . + cp $(srcdir)/std_hooks.lua . makeinfo --no-split --no-headers --output $@ --html $< perl -i.perlbak -pe 's@@\n@' $@ - rm -f monotone.html.perlbak + rm -f address@hidden + cp $(srcdir)/texinfo.css . # The .perlbak thing is needed, otherwise the perl executions fails on MinGW html: monotone.texi version.texi std_hooks.lua texinfo.css + cp $(srcdir)/std_hooks.lua . + mkdir -p $@ + cp -r $(srcdir)/figures $@ + makeinfo --number-sections --html --output $@ $< + perl -i.perlbak -pe 's@@\n@' $@/*.html + rm -f $@/*.perlbak + cp $(srcdir)/texinfo.css $@ + - mkdir -p html - makeinfo --number-sections --html --output html $< - perl -i.perlbak -pe 's@@\n@' html/*.html - rm -f html/*.perlbak - cp texinfo.css html ============================================================ --- tests/t_empty_env.at af591814e1d48a9a9a804faef42b81c4c3bc7511 +++ tests/t_empty_env.at 8478ee958c97601d85cf9129efd85674e34442cf @@ -1,8 +1,16 @@ AT_SETUP([empty environment]) MONOTONE_SETUP +# sigh. skip this test if the user happens to have LD_LIBRARY_PATH set, +# because there's a chance it might be set so that their monotone binary can +# find boost DSOs or something. +AT_CHECK(if test "$LD_LIBRARY_PATH"; then + exit 77; +fi) + AT_CHECK(if test "$OSTYPE" = "msys"; then cp $(which libiconv-2.dll) . + cp $(which zlib1.dll) . fi) AT_CHECK(env -i MONOTONE --help, [2], [ignore], [ignore]) ============================================================ --- tests/t_netsync_notes.at fe5855379bb052b21d11c429bbbc89eb495d5bac +++ tests/t_netsync_notes.at 10ac197fb65d91349b2c11164f03af8c0f45dc9a @@ -76,6 +76,7 @@ revision: cert.key = address@hidden end ----------------------------------------------------- ]) +CANONICALISE(testnotes.log) AT_CHECK(cmp testnotes.log testnotes.test, [0], [ignore], [ignore]) AT_CHECK(MONOTONE tag $VER0 testtag, [], [ignore], [ignore]) @@ -90,6 +91,7 @@ cert: key = address@hidden end ----------------------------------------------------- ]) +CANONICALISE(testnotes.log) AT_CHECK(cmp testnotes.log testnotes.test, [0], [ignore], [ignore]) AT_CLEANUP ============================================================ --- win32/monotone.iss 48ab358ef0443f95fd1db2d14767914ffb6cbe60 +++ win32/monotone.iss f9c71207ff1d42c58cfdf76018e3c77fb83fbd4a @@ -20,6 +20,7 @@ Source: "..\html\*.*"; DestDir: "{app}\documentation"; Flags: ignoreversion Source: "..\COPYING"; DestDir: "{app}"; Flags: ignoreversion Source: "\mingw\bin\libiconv-2.dll"; DestDir: "{app}" +Source: "\mingw\bin\zlib1.dll"; DestDir: "{app}" Source: "..\figures\*.png"; DestDir: "{app}\documentation\figures"; Flags: ignoreversion [Tasks]