Petr writes:
> All of my recent patches, with two changes:
> - fix a bug in autoconfDefines in Setup.lhs that Kowey spotted in review
> - fix a bug I introduced in ShellHarness in "grand unified pwd hack" (see
> issue1330)
Here's the bare minimum necessary to get the to-be-deprecated sequence
autoconf && ./configure && make
to work on my system. I don't doubt I have missed some -DFOO=Bar's,
in which case someone can test it and tell me. I don't have a vast
array of heterogeneous machines to test on.
Mon Jan 26 23:56:44 EST 2009 Trent W. Buck <[email protected]>
* Have autoconf forget about .hs.in.
New patches:
[Have autoconf forget about .hs.in.
Trent W. Buck <[email protected]>**20090126125644
Ignore-this: 4fa6a3ce806c726dcaec5771d3059c8b
] hunk ./GNUmakefile 39
# ALL Haskell source files, then filtering out the exceptions. The
# first few entries are hard-coded in because they are generated by
# ./configure and thus might not exist when find runs.
-DARCS_FILES = src/Autoconf.hs src/Context.hs src/ThisVersion.hs \
+DARCS_FILES = src/Context.hs \
$(filter-out src/DateTester.% src/Darcs/Patch/Check.% \
src/Darcs/Patch/Properties.% src/Darcs/Patch/QuickCheck.% \
src/Darcs/Patch/Test.% src/Darcs/Patch/Unit.% src/win32/%, \
hunk ./GNUmakefile 395
#only remove src/Context.hs if we have a darcs inventory to rebuild it from
if test -f _darcs/inventory; then rm -f src/Context.hs; fi
# these files might be around from before they were renamed to .hs (Nov 2008)
- rm -f src/ThisVersion.lhs src/Autoconf.lhs
distclean:: clean
rm -rf config.status config.log autoconf.mk config.cache autom4te.cache
hunk ./GNUmakefile 398
- rm -f doc/manual/darcs.ps doc/manual/darcs.pdf doc/manual/patch-theory.pdf src/Autoconf.hs darcs.idv
- rm -f src/ThisVersion.hs tools/cgi/README tools/cgi/darcs.cgi tools/cgi/cgi.conf
+ rm -f doc/manual/darcs.ps doc/manual/darcs.pdf doc/manual/patch-theory.pdf darcs.idv
+ rm -f tools/cgi/README tools/cgi/darcs.cgi tools/cgi/cgi.conf
rm -f config.command
rm -rf snapshots
hunk ./GNUmakefile 415
configure: configure.ac aclocal.m4
autoconf
-autoconf.mk src/Autoconf.hs tools/cgi/darcs.cgi : % : %.in config.status
+autoconf.mk tools/cgi/darcs.cgi : % : %.in config.status
./config.status
config.status: configure
hunk ./autoconf.mk.in 59
install:: @INSTALLWHAT@
ifeq ('@I_AM_IN_REPO@', 'yes')
-release/STATE src/ThisVersion.hs doc/index.html: _darcs/hashed_inventory src/ThisVersion.hs.in \
+release/STATE doc/index.html: _darcs/hashed_inventory \
release/determine_release_state.pl \
doc/index.html.in config.status
perl release/determine_release_state.pl $(DARCS_VERSION) > release/STATE
hunk ./autoconf.mk.in 67
PATH=".:$$PATH" darcs changes --context | cat config.command - \
| ./stringify Context context > $@
else
-src/ThisVersion.hs doc/index.html: release/STATE src/ThisVersion.hs.in \
+doc/index.html: release/STATE \
release/determine_release_state.pl \
doc/index.html.in config.status
perl release/determine_release_state.pl $(DARCS_VERSION)
hunk ./configure.ac 42
DARCS_VERSION=$PACKAGE_VERSION
AC_SUBST(DARCS_VERSION)
+AC_DEFINE(PACKAGE_VERSION_STATE,"FIXME")
dnl See if we are in a darcs repo and also have darcs available,
dnl and whether we're in a repository...
hunk ./configure.ac 310
if test "$enable_mmap" = "no" || test "$SYS" = "windows" ; then
USE_MMAP="False"
fi
+AC_DEFINE(HAVE_MMAP)
AC_SUBST(USE_MMAP)
TARGETS="darcs doc/darcs.1"
hunk ./configure.ac 413
SENDMAIL=""
HAVE_SENDMAIL="False"
else
+ AC_DEFINE_UNQUOTED(SENDMAIL,"$SENDMAIL")
HAVE_SENDMAIL="True"
fi ])
AC_SUBST(SENDMAIL)
hunk ./configure.ac 625
dnl Look for a suitable diff command
AC_CHECK_PROGS(DIFF, [gdiff gnudiff diff])
+AC_DEFINE_UNQUOTED(DIFF,"$DIFF")
dnl Look for NullSoft Installer System
hunk ./configure.ac 665
AC_DEFUN([AC_DATAROOTDIR_CHECKED])
-AC_CONFIG_FILES([autoconf.mk src/Autoconf.hs
+AC_CONFIG_FILES([autoconf.mk
tools/cgi/darcs.cgi tools/cgi/README tools/cgi/cgi.conf
release/darcs.spec])
AC_OUTPUT
hunk ./release/determine_release_state.pl 50
print "$official_version ($state)\n";
-if (open(FIN,"src/ThisVersion.hs.in") && open(FOUT,">src/ThisVersion.hs.tmp")) {
- while (<FIN>) {
- s/\...@darcs_version_state\@/$state/g;
- s/\...@darcs_version\@/$official_version/g;
- print FOUT $_;
- }
- close(FIN);
- close(FOUT);
-}
-
-
-my $replace = 1;
-if (open(FIN,"src/ThisVersion.hs") && open(FTMP,"src/ThisVersion.hs.tmp")) {
- my ($old, $new);
- read FIN, $old, 10000;
- read FTMP, $new, 10000;
- $replace = $old ne $new;
- close(FIN);
- close(FTMP);
-}
-
-if ($replace) {
- rename "src/ThisVersion.hs.tmp", "src/ThisVersion.hs";
-} else {
- unlink "src/ThisVersion.hs.tmp";
-}
-
if (open(FIN,"doc/index.html.in") && open(FOUT,">doc/index.html")) {
while (<FIN>) {
s/VERSION/$official_version/g;
Context:
[(cabal build) build 'witnesses' only with -ftype-witnesses
Bertram Felgenhauer <[email protected]>**20090122224907
Ignore-this: 6d627163a3d4258baf22f34e304bd767
]
[(cabal build) add two missing modules to darcs library
Bertram Felgenhauer <[email protected]>**20090122224608
Ignore-this: 6164fef661fa5f31cae007e523012e68
]
[Tell the configure script to require haskeline>=0.6.0.
Judah Jacobson <[email protected]>**20090122214543
Ignore-this: 13e0549a6a2c75eb22f3b75a915908e7
]
[use forM_ from the standard library
Florent Becker <[email protected]>**20090122125344
Ignore-this: 4d9c0e4b98f9f43a0b519584806ddd1a
]
[Remove LANGUAGE GADTs pragma in Darcs.Show (GHC 6.6 compatibility)
Eric Kow <[email protected]>**20090122102846
Ignore-this: 488aa7c372f5deee415ae2bae0c578ac
]
[Remove duplication in fields in the .cabal file
Duncan Coutts <[email protected]>**20090122021052
Looks like it was a copy and paste error.
]
[Remove unused ghc -threaded flag in library section
Duncan Coutts <[email protected]>**20090122021038
The -threaded flag applies only to linking programs.
Despte this, ghc regects the combinaton of using the -threaded
and profiling flags, even for building a library. New Cabal
versions will ignore the -threaded flag when building programs
but not for libs because that combination is senseless. So there
is a positive benefit to dropping it from the darcs library as
it will let people build a profiling darcs with ghc-6.8 without
having to modify the .cabal file to drop the -threaded flag.
]
[Clean up after shell harness.
Trent W. Buck <[email protected]>**20090122050123
We were only cleaning .o and .hi files within src. Doing "make test"
results in some .o and .hi files elsewhere. We should add these
directories to the "find src" calls above, but this hack is easier to
understand and should suffice until we finish switching to Cabal.
]
[Syntax highlighting for new-style NEWS entries.
Trent W. Buck <[email protected]>**20090122064107]
[NEWS for Darcs 2.2.0.
Trent W. Buck <[email protected]>**20090122064014]
[Use conventional name "NEWS" for "new in $version" notes.
Trent W. Buck <[email protected]>**20090122063959]
[Resolve issue1292: re-encode line input from the Haskeline backend.
Judah Jacobson <[email protected]>**20090121172422
Ignore-this: e6c94db8cbef0f8fa3f3d0011c6ef88f
This patch bumps dependencies to haskeline-0.6.* (which provides the required
functionality) and terminfo-0.3.* (which is required by that version of
Haskeline). Haskeline is also enabled by default now that non-ASCII line input
works correctly.
]
[mv -fglasgow-exts to Darcs.Show
[email protected]**20090120150052
Ignore-this: 21000375294de932f303baadba815b8b
]
[Remove obsolete import.
Trent W. Buck <[email protected]>**20090118014801
Ignore-this: d6bd196c7d088b7e7121637d7c1b1323
]
[Refactor initial argument dispatcher.
Trent W. Buck <[email protected]>**20090117081533
Ignore-this: fe101e61cc7b46a8c6b4415f08c737b
]
[Simplify some of my own code.
Trent W. Buck <[email protected]>**20090117015505
Ignore-this: 42a7df5c21ae0416441572380490e127
]
[Haddocks for HashedIO
[email protected]**20090116170955
Ignore-this: 1c54191a243bd11d6d22d74600251587
]
[Haddocks for Cache
[email protected]**20090116170931
Ignore-this: 3aa035bd5f805929113a616df9faefb6
]
[Haddock for Darcs.External.fetchFile
[email protected]**20090116170742
Ignore-this: 96041231ca2800c3fcde4f56ec49e267
]
[Refactor: use more guards.
Trent W. Buck <[email protected]>**20090115072617
Ignore-this: b41bb970198ed1f42aebdfc63c90e115
]
[Resolve issue1311: Use time zones from GNU coreutils; improve doc.
Dave Love <[email protected]>**20090112135012
Ignore-this: 883bc4ccdb1d27fde14ec9c76a4d2a45
]
[omit empty line at the end of output in darcs diff
Christian Kellermann <[email protected]>**20090114110607
Ignore-this: d71a3d5460fbe21244c4eba77dc47885
]
[Clean up when previous test crashed.
Trent W. Buck <[email protected]>**20090113001345]
[Make "make clean" remove microbench.
Trent W. Buck <[email protected]>**20090111152130
Put the clean target directly below the build target, so it's harder
to get them out of sync in future.
]
[Fix test optimize_relink.sh when no hard linking available
Thorkil Naur <[email protected]>**20090113223335
The semicolon in the echo command causes the test to fail with the
message
> optimize_relink.sh: line 37: assuming: command not found
when no hard linking is available.
]
[Consistently use sh (not csh) prompts in user manual.
Trent W. Buck <[email protected]>**20090111114801
The sh prompt ($) was already used elsewhere in the manual, and I
choose to standardize on it instead of csh (%) because sh (especially
bash) seems more widespread and recognizable as the user shell prompt.
]
[resolve issue1270: don't show the motd when --xml-output is given
[email protected]**20090109090726
Ignore-this: e1dae49ceb510668a1358e2103268cc3
]
[Get setpref description in manual.
Dave Love <[email protected]>**20090111151941
Ignore-this: 89b0d00a82582d03fdf51cd9822dba65
]
[Example for issue1284.
Trent W. Buck <[email protected]>**20090111051101]
[resolve issue1235: added --summary to obliterate
Rob Hoelz <[email protected]>**20090110032907]
[Haddock for Darcs.Repository.Format
Florent Becker <[email protected]>**20090108160035
Ignore-this: f88f0223ebbbe5694845dd1060e6f978
]
[Remove stale comment (we now require GHC 6.6)
Eric Kow <[email protected]>**20081231080929
Ignore-this: b19da9fabc8d2e38bccafc84a77fa278
]
[do not use concatenation in src/Context.hs
Florent Becker <[email protected]>**20090107135552
Ignore-this: 9e86505a445730b7653e75f08e8ff81e
]
[Print malicious paths and optional way around them when they cause a failure.
David Caldwell <[email protected]>**20090105101628
Ignore-this: cdb706087869e19e046bc0dd424ca38d
]
[Fix typo in --dont-restrict-paths documentation.
David Caldwell <[email protected]>**20090105024208
Ignore-this: 16197eeef34dedddeda036b47747f234
]
[Add --restrict-paths (and --dont-restrict-paths) to "darcs apply".
David Caldwell <[email protected]>**20090102101737
Ignore-this: f6ab937573bf0d5397361ddefed902c9
]
[Add --restrict-paths (and --dont-restrict-paths) to "darcs pull".
David Caldwell <[email protected]>**20090102101726
Ignore-this: dd3bc04632d341be16709e0aee6753ec
]
[Revert --restrict-paths removal.
David Caldwell <[email protected]>**20090102101705
Ignore-this: 1fba1f9a589aaabb1fa27a268f7c972e
]
[Resolve issue1302: set closed bugs to resolved (not resolved-in-unstable).
Trent W. Buck <[email protected]>**20090105001351]
[make stringify cut the string
[email protected]**20090104102125
Ignore-this: e1a0cd83fce5085f60b812d894ca26e7
This avoids choking utilities such as grep (or emacs' internal grep) which parse haskell files line-by-line.
]
[make unit's return value depend on all tests
Florent Becker <[email protected]>**20090102184930
Ignore-this: fce3636c70bcb4a80413823c88e3ac6a
]
[Resolve issue1285: remove "cabal test" intermediaries.
Trent W. Buck <[email protected]>**20090103095347]
[Resolve issue1206: Countable Nouns.
Trent W. Buck <[email protected]>**20090101062452
Use the conventional term "Countable" instead of "Numbered".
]
[Improve readability of bug reporting.
Trent W. Buck <[email protected]>**20081226120833
Moving "at <location>" to the first line gives the descriptive string
a line all to itself. For example, darcs show bug:
darcs: bug at src/Darcs/Commands/ShowBug.lhs:57 compiled Nov 4 2008 12:05:43
This is actually a fake bug in darcs.
]
[Use imperative mood for primitive matcher help.
Trent W. Buck <[email protected]>**20081228114434]
[Check GADT witnesses when doing Cabal-based builds.
Petr Rockai <[email protected]>**20081228111229]
[Fix haddock error
Eric Kow <[email protected]>**20081227204218
Ignore-this: 60f05d20e5f37312f6b477067114fac7
]
[Haddock for primitiveMatchers (untested).
Trent W. Buck <[email protected]>**20081227141921]
[Rewrite primitive matcher examples.
Trent W. Buck <[email protected]>**20081227141845]
[Rewrite "darcs help --match" output.
Trent W. Buck <[email protected]>**20081227141819
Add an introductory paragraph, and put all the examples into a single
code block, since one-line paragraphs are kind hard to read.
]
[Delete superfluous "Introduction" headings.
Trent W. Buck <[email protected]>**20081227034129
I don't think it's useful to grant a subsection heading to the single
introductory paragraph of a section.
]
[Refactor error text for readability.
Trent W. Buck <[email protected]>**20081109144007]
[Tweak user manual's title page.
Trent W. Buck <[email protected]>**20081227011031
It annoyed me that the user manual was just called "Darcs", not "Darcs
User Manual".
]
[Improve readability of bug reporting.
Trent W. Buck <[email protected]>**20081226104243
Moving "at <location>" to the first line gives the descriptive string
a line all to itself. For example, darcs show bug:
darcs: bug at src/Darcs/Commands/ShowBug.lhs:57 compiled Nov 4 2008 12:05:43
This is actually a fake bug in darcs.
]
[Haddockize developer comment.
Trent W. Buck <[email protected]>**20081214041902]
[Darcs.ColorPrinter: factor out getPolicy call
[email protected]**20081222180227
Ignore-this: aee5b5415ee8bbfe1dac06e240b90080
Less redundancy. 'getPolicy' is being called with the same args, and it's
not like the environmental variables are going to change in between each
call.
]
[Make it possible to run just specific tests from cabal commandline.
Petr Rockai <[email protected]>**20081223083742
All of `cabal test repair-corrupt bugs/newlines bugs/issue27.sh` should work as
expected. The implementation is not very efficient, but seems to work fine.
]
[Neatify "cabal test" option munging in Setup.lhs.
Petr Rockai <[email protected]>**20081223080811]
[Sort the list of tests that are run by cabal.
Petr Rockai <[email protected]>**20081223073642]
[Remove now-unused replacePristine.
Petr Rockai <[email protected]>**20081210065138]
[resolve issue948: rewrite darcsman.
Trent W. Buck <[email protected]>**20081221081934
Significant changes are:
- Avoid duplicating groups from TheCommands.
- Due to growing command_helps, list commands in SYNOPSIS.
- Use subsections (.SS) for groups.
- Include (with fancy markup!) command arguments.
- Include darcs help --match.
- Copy-and-paste description from darcs.cabal.
- Remove AUTHORS section as suggested by man-pages(7).
- Declare my copyright.
]
[Tweak punctuation in "darcs help --match".
Trent W. Buck <[email protected]>**20081221080949
Manpages treat apostrophes in the first line specially. Use `TeX
style' quotes instead, so this string can be included in the manpage.
Also omit mention of &&, || and ! until I find time to clarify that
they are aliases for the human-readable and, or and not.
]
[TAG 2.2.0
Petr Rockai <[email protected]>**20090115150916]
Patch bundle hash:
2fde54e354b28c068389a019c898fa645ec4f278
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
