QuickCheck 2 and Haddock 2 are not available for Debian, so today I
finally gave in and installed them via "cabal install". This meant
that I could at last run "make disttest" and avoid introducing
regressions in my patches.
Since I find it hard to believe anyone but David would bother
installing GHC *inside* wine, I'm inclined to believe that nobody else
has actually run "make disttest" since Franchise was added -- or if
they ran it, they didn't actually read the output.
Mon Nov 3 20:45:30 EST 2008 Trent W. Buck <[EMAIL PROTECTED]>
* Reduce disttest noise for teetotalers.
Without wine installed, "make disttest" was printing nine copies of:
/bin/sh: wine: not found
test: 1: =: argument expected
This DOES NOT fix the case where wine is installed, but GHC is not
available from wine:
wine runghc Setup.hs configure
wine: could not load L"C:\\windows\\system32\\runghc.exe": Module not
found
make: *** [disttest] Error 126
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
New patches:
[Reduce disttest noise for teetotalers.
Trent W. Buck <[EMAIL PROTECTED]>**20081103094530
Without wine installed, "make disttest" was printing nine copies of:
/bin/sh: wine: not found
test: 1: =: argument expected
This DOES NOT fix the case where wine is installed, but GHC is not
available from wine:
wine runghc Setup.hs configure
wine: could not load L"C:\\windows\\system32\\runghc.exe": Module not found
make: *** [disttest] Error 126
] hunk ./GNUmakefile 414
runghc Setup.hs configure
runghc Setup.hs build -j4
runghc Setup.hs clean
- - $(call echo_without_wine,'**************************************')
- - $(call echo_without_wine,Not testing with older version of wine)
- - $(call echo_without_wine,'**************************************')
- - $(call echo_with_wine,'****************************************')
- - $(call echo_with_wine,Test franchise build of darcs under wine)
- - $(call echo_with_wine,'****************************************')
- - $(call with_wine,wine runghc Setup.hs configure)
- - $(call with_wine,wine runghc Setup.hs build -j4)
- - $(call with_wine,wine runghc Setup.hs clean)
+ @echo '****************************************'
+ @echo Test franchise build of darcs under wine
+ @echo '****************************************'
+ @printf %s "Checking for wine 1.0... "
+ifneq (wine-1.0,$(shell wine --version 2>/dev/null))
+ @echo no
+else
+ @echo yes
+ wine runghc Setup.hs configure
+ wine runghc Setup.hs build -j4
+ wine runghc Setup.hs clean
+endif
@echo '**************************'
@echo Running old autoconf tests
@echo '**************************'
hunk ./GNUmakefile 444
TEST_FILTER_FILE := tests_to_run
SHELL_HARNESS := perl ../tests/shell_harness
- -define with_wine
- - @if test "wine-1.0" = `wine --version`; then echo "$1"; $1; fi
- -endef
- -
- -define echo_with_wine
- - @if test "wine-1.0" = `wine --version`; then echo "$1"; fi
- -endef
- -
- -define echo_without_wine
- - @if test !"wine-1.0" = `wine --version`; then echo "$1"; fi
- -endef
- -
# $1 - description
# $2 - setup
define shell_harness
Context:
[resolve conflict in makefile.
David Roundy <[EMAIL PROTECTED]>**20081103002009
Ignore-this: 3677a2bad189f858b1ac06e56b9e4c2f
]
[fixup SRC_DIRS
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081029190715]
[a slight simplification
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081028185358]
[clarify SlurpDirectory interface
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081028072911]
[cleanup some patterns
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081028065424]
[simplify slurp_has_anycase
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081026200442]
[another obvious use of the SlurpyMap
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081026192715]
[bug fix
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081026185518]
[make use of the SlurpyDir Map in the obvious places
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081026153749]
[dumb changeover of SlurpDir contents from [] to Map
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081026135906]
[refactor Slurpy to common up name component between File/Dir
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081026123722]
[Remove unpleasant sequencing operators (;) from haddock targets.
Trent W. Buck <[EMAIL PROTECTED]>**20081023061830
Make is will abort a run when any command fails. Using ;\\\n to join
separate lines means make can't detect if the first line fails. Also,
continuation lines are ugly.
When disabling failure propagation is intentional and desired, you can
achieve this explicitly by starting the command with a hyphen (-).
]
[Remove obsolete "deb" target.
Trent W. Buck <[EMAIL PROTECTED]>**20081023060745
I maintain the Debian darcs package, and I don't use this target.
I doubt anyone else has a use for it.
]
[Explain ghcflags_fancy.
Trent W. Buck <[EMAIL PROTECTED]>**20081023053956]
[Tweak C_OBJS declaration.
Trent W. Buck <[EMAIL PROTECTED]>**20081023033409]
[DARCS_FILES_DEPS is never bound, so don't evaluate it.
Trent W. Buck <[EMAIL PROTECTED]>**20081023030902]
[Generate SRC_DIRS programmatically.
Trent W. Buck <[EMAIL PROTECTED]>**20081023024212
The -name sys -prune -o ... -print part is a hack to skip the
src/win32/sys, which is probably safe to include in the list, but I
didn't want to take any chances.
]
[Typo: inadequate quotation in configure.ac.
Trent W. Buck <[EMAIL PROTECTED]>**20081101072848]
[ByteStringUtils: simply re-export BS functions for GHC > 6.6
Spencer Janssen <[EMAIL PROTECTED]>**20081028042219]
[cleaner implementation of linesPS test
Don Stewart <[EMAIL PROTECTED]>**20081026232500
Ignore-this: 6e3af59e5a5a3bdc4a6a62502056955a
]
[remove dead code
Don Stewart <[EMAIL PROTECTED]>**20081026231432
Ignore-this: 5a4a4b4cdcf0309214a93a88f4543421
]
[pack the small string, rather than unpack the bytestring
Don Stewart <[EMAIL PROTECTED]>**20081026194321
Ignore-this: eff62569f383215d2be31a7810ed187c
]
[remove quadratic blowups from mapPrimFL
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081029190730]
[resolve another replace conflict.
David Roundy <[EMAIL PROTECTED]>**20081102122813
Ignore-this: ee690c9cde6a07b1c15441fe90c03eeb
]
[use fmap in unit.lhs
Jason Dagit <[EMAIL PROTECTED]>**20081028064753
Ignore-this: af4cbe231e58d9b9e4ad332b30542a68
]
[use fmap in Patch.Apply
Jason Dagit <[EMAIL PROTECTED]>**20081028064147
Ignore-this: b58bdab550fcc5acc75e2ef3a53ed490
]
[use fmap in Match
Jason Dagit <[EMAIL PROTECTED]>**20081028060342
Ignore-this: 6b81e2f9cf92d8dad5186709b11d5750
]
[use fmap in Lock
Jason Dagit <[EMAIL PROTECTED]>**20081028060232
Ignore-this: faa5607b5a1d1b741ddebec3c0836907
]
[use fmap in External
Jason Dagit <[EMAIL PROTECTED]>**20081028060146
Ignore-this: f22668532d19292d4b45a7dc62f33134
]
[use fmap in Diff
Jason Dagit <[EMAIL PROTECTED]>**20081028060047
Ignore-this: f99385acad67e2b39d3d6b0c78faae1a
]
[use fmap in Commands.Send
Jason Dagit <[EMAIL PROTECTED]>**20081028055751
Ignore-this: bbf45d660eeed9f295d58f151464ce8a
]
[use fmap in Commands.Annotate
Jason Dagit <[EMAIL PROTECTED]>**20081028055323
Ignore-this: 8493690ea502127655a4cde85296acef
]
[use fmap in ByteStringUtils
Jason Dagit <[EMAIL PROTECTED]>**20081028054836
Ignore-this: 900d79b15507324b793c694c063a2e19
]
[add test of lazy get of lazy get.
David Roundy <[EMAIL PROTECTED]>**20081102121358
Ignore-this: e10b727babff3ef33ddbc7bd9816b3f9
]
[simplify Setup.hs a bit.
David Roundy <[EMAIL PROTECTED]>**20081102121344
Ignore-this: abd70cfa96a253f61ef9de57ba5b39e4
]
[compensate for bugfix in franchise in defineAs.
David Roundy <[EMAIL PROTECTED]>**20081102022049
Ignore-this: fc5be27e41e8b1cc4d21eec2a47884d2
]
[rewrite partitionFL and partitionRL to reduce the number of commutes they do
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081028222841
Ignore-this: e1861f289d56911b595653ae2f3891bf
This patch avoids a quadratic blowup when most/all patches fail the predicate
- previously they would all be commuted past each other. Now we accumulate them
until a patch that passes the predicate comes along, and then only commute as
necessary.
]
[don't link into the manual, since this is fragile.
David Roundy <[EMAIL PROTECTED]>**20081101135932
Ignore-this: 4d1f7f6ddaa3b9f215e254faf76b59ae
The trouble is that these sections can change pretty easily, and I'd rather
not have to update the index.html.in when this happens.
]
[improve front page of http://darcs.net
Eric P. Mangold <[EMAIL PROTECTED]>**20081030014049
I was a little confused by the wording on the darcs.net front-page.
Where it says "Originally developed by David Roundy" that made me
think that Mr. Roundy might not be involved in development anymore.
The kind folks on IRC set me straight, however :)
So I improved the wording in a couple places and added a section that
says a few things about the current state of the development
community.
]
[revert hashing change that ignores all but last 20 bytes of each line.
David Roundy <[EMAIL PROTECTED]>**20081031170230
Ignore-this: f97249571125d049bed9f3ae1d0a10a0
]
[resolve conflicts
David Roundy <[EMAIL PROTECTED]>**20081030182815
Ignore-this: f874ea6f34ddc5a745504b4ba988840d
]
[Unused import police
Eric Kow <[EMAIL PROTECTED]>**20081026080744]
[fixup ByteString compatibility for sake of ghc6.6
Jason Dagit <[EMAIL PROTECTED]>**20081028033305]
[clean up module imports after ByteString changes
Jason Dagit <[EMAIL PROTECTED]>**20081027001651]
[small merges
Don Stewart <[EMAIL PROTECTED]>**20081027000055
Ignore-this: 4c5dc100a17c5cbad4b4d24b71877cc1
]
[Remove all references to FastPackedString the module. Gone
Don Stewart <[EMAIL PROTECTED]>**20081026235917
Ignore-this: 2dd5679d9b33bed79c180a75fcd8c7a0
]
[remove last references to the PackedString type
Don Stewart <[EMAIL PROTECTED]>**20081026235151
Ignore-this: fe2c138c24305f85888d62a65b0c7c8
]
[clean up module imports after ByteString changes
Jason Dagit <[EMAIL PROTECTED]>**20081026234541]
[remove dead code
Don Stewart <[EMAIL PROTECTED]>**20081026232258
Ignore-this: 56cc675677fad6a10a77dc53b2f4f44f
]
[remove all references to unsafeWithCStringLenPS
Don Stewart <[EMAIL PROTECTED]>**20081026232045
Ignore-this: 1819ebbbcbf1d248c7e1715b5125ba97
]
[remove all references to mallocForeignPtr
Don Stewart <[EMAIL PROTECTED]>**20081026231851
Ignore-this: 59fa33be88801523d5e47c5eef85e973
]
[remove all references to createPS
Don Stewart <[EMAIL PROTECTED]>**20081026231230
Ignore-this: 619c8813cded454c829647ee89e37e4e
]
[and in tests
Don Stewart <[EMAIL PROTECTED]>**20081026231013
Ignore-this: 67fd51ccf6a8f0d3517788a115d87428
]
[remove all traces of packString
Don Stewart <[EMAIL PROTECTED]>**20081026230403
Ignore-this: 7ee645d5f5bddbd0265411e7868ca0f5
]
[remove all references to breakOnPS
Don Stewart <[EMAIL PROTECTED]>**20081026223727
Ignore-this: 60f6808d17ab581316bbe2bf9a0f8de2
]
[remove all references to spanEndPS
Don Stewart <[EMAIL PROTECTED]>**20081026223054
Ignore-this: 9cea6233b902f5a4652dae9e9759895b
]
[remove all references to indexPSW (only ever used as 'head')
Don Stewart <[EMAIL PROTECTED]>**20081026222913
Ignore-this: 7a25b911d1b320eb7ec3396eb1fff75d
]
[remove all references to generatePS
Don Stewart <[EMAIL PROTECTED]>**20081026222613
Ignore-this: 3673c57fa1eff4e1cf798c59fc967229
]
[clean up imports in other modules after ByteString refactorings
Jason Dagit <[EMAIL PROTECTED]>**20081026201508]
[Remove all references to dropWhilePS, clean up silly_lex while I'm here
Don Stewart <[EMAIL PROTECTED]>**20081026195652
Ignore-this: 29abf7de4539ae4957b70283df4dcf23
]
[pure haskell implementation of breakSpace, from Data.ByteString
Don Stewart <[EMAIL PROTECTED]>**20081026193729
Ignore-this: cbedb39a15ad4626f2561aa22f73a370
]
[remove fpstring.c:first_nonwhite, in favor of pure haskell implementation
Don Stewart <[EMAIL PROTECTED]>**20081026192211
Ignore-this: 7780e5f310a5785ffa3df332ec68972a
fpstring.c defined first_nonwhite, also provided via
Data.ByteString.Char8, however darcs uses a restricted definition of
ISSPACE, so we just port that over.
]
[remove all references to dropPS
Don Stewart <[EMAIL PROTECTED]>**20081026183226
Ignore-this: c75ac479bf0a9c2b37e5e5d511950940
]
[remove all references to concatPS
Don Stewart <[EMAIL PROTECTED]>**20081026182717
Ignore-this: 4b40da286f924625c4a2f6d71df1d3f6
]
[remove all references to findLastPS
Don Stewart <[EMAIL PROTECTED]>**20081026182232
Ignore-this: 7ff10d123f12bd12c76d5eff857367f0
]
[remove all references to breakPS
Don Stewart <[EMAIL PROTECTED]>**20081026182122
Ignore-this: 7e878cd0c3066b2a51a7f7df11f2c498
]
[remove all references to findPS
Don Stewart <[EMAIL PROTECTED]>**20081026181842
Ignore-this: 6ac31cb52cc1d63f4339177b21b853bc
]
[remove all references to packWords
Don Stewart <[EMAIL PROTECTED]>**20081026181624
Ignore-this: 91cff1fa32b422143d3dac87e5560329
]
[remove all references to takePS
Don Stewart <[EMAIL PROTECTED]>**20081026181041
Ignore-this: 122b854846d68e8659c8b6ab3b3ce3e2
]
[Remove appendPS, dead code
Don Stewart <[EMAIL PROTECTED]>**20081026180523
Ignore-this: 174c217104948ac658bac1e14b72b803
]
[remove all references to initPS
Don Stewart <[EMAIL PROTECTED]>**20081026180435
Ignore-this: 465e6980cd79e5d920f418ac471256b6
]
[remove all references to tailPS
Don Stewart <[EMAIL PROTECTED]>**20081026175536
Ignore-this: 845990c011fb3236826d62a45e0d96bc
]
[remove all references to nilPS
Don Stewart <[EMAIL PROTECTED]>**20081026174711
Ignore-this: 9a9261c1cef9028614734f4f363e33f5
]
[remove writeFilePS usage from HTTP.hs
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081026102421]
[Remove all references to unpackPS
Don Stewart <[EMAIL PROTECTED]>**20081026025309
Ignore-this: 839f30a7611668a1f158305f84f84751
]
[optimise use of unpack in Format.lhs
Don Stewart <[EMAIL PROTECTED]>**20081026022702
Ignore-this: ac72de83c3d453bab443089e85d2cf9a
]
[Optimize inefficiency when unpacking string for tok replace
Don Stewart <[EMAIL PROTECTED]>**20081026022129
Ignore-this: 26ede7c95f78e5b6c6b19c5e1c01127b
]
[Optimize hunk handling not to needlessly unpack bytestrings
Don Stewart <[EMAIL PROTECTED]>**20081026021727
Ignore-this: 93866b5b7a2d0b0dc7b98a1fbfd2b58f
]
[Don't unpack the same bytestring twice in two lines
Don Stewart <[EMAIL PROTECTED]>**20081026021141
Ignore-this: 7e673b449491eb467a21446048c17f50
]
[Optimize ignore_junk to not unpack the bytestring
Don Stewart <[EMAIL PROTECTED]>**20081026020635
Ignore-this: 3ab0d287de52b89434650f4a53bc0719
]
[remove nullPS from Darcs.Patch.Test
Jason Dagit <[EMAIL PROTECTED]>**20081026020430]
[Remove all references to nullPS
Don Stewart <[EMAIL PROTECTED]>**20081026015325
Ignore-this: 4ecc1ab4ca8f16a15090faaeb2cc063b
]
[remove all references to headPS
Don Stewart <[EMAIL PROTECTED]>**20081026013626
Ignore-this: d0e026a45ea9a16ff4f7301755caa9f4
]
[make BC.last depend on GADT_WITNESSES in Diff.lhs
Jason Dagit <[EMAIL PROTECTED]>**20081026013303]
[remove all references to splitAtPS
Don Stewart <[EMAIL PROTECTED]>**20081026012749
Ignore-this: f86b7f5fab8da6af5f6539510f068627
]
[More explict import lists
Don Stewart <[EMAIL PROTECTED]>**20081026012036
Ignore-this: a47ccb6c58a2a1d9c80974cfa832b05f
]
[explicit import lists
Don Stewart <[EMAIL PROTECTED]>**20081026011834
Ignore-this: de2b0cb8b1c3a7f102cb39a3c2822f2c
]
[remove all referenes to lengthPS
Don Stewart <[EMAIL PROTECTED]>**20081026011551
Ignore-this: 8c027d1510415cc3e6840162bce88d85
]
[replace reimplementation of c2w with bytestring's c2w
Don Stewart <[EMAIL PROTECTED]>**20081026005846
Ignore-this: 7be4c2d3e34b5ad1a4d1f89eedd79c73
]
[remove references to indexPS
Don Stewart <[EMAIL PROTECTED]>**20081026005455
Ignore-this: 868c3fa12869acf0ea3b7ddcd4504e16
]
[remove references to lastPS
Don Stewart <[EMAIL PROTECTED]>**20081026004952
Ignore-this: d374d4f54aedc9d9dcd8928793658c11
]
[remove references anyPS
Don Stewart <[EMAIL PROTECTED]>**20081026004428
Ignore-this: 41ae735dfca929b453d589d2e0494791
]
[remove references to hGetPS
Don Stewart <[EMAIL PROTECTED]>**20081026004032
Ignore-this: beab20131ee0453a7b8b44e3bf7391a3
]
[remove references to hPutPS
Don Stewart <[EMAIL PROTECTED]>**20081026003558
Ignore-this: 4c56823bf1cce0da3ce0f9b27bc2058
]
[Remove all references to hGetContentsPS
Don Stewart <[EMAIL PROTECTED]>**20081026002401
Ignore-this: d97a8ad95f0bf3de561b7ad081c42a10
]
[remove references to readFilePS
Don Stewart <[EMAIL PROTECTED]>**20081026001942
Ignore-this: c45ef1b82c5ba8243269b07e3b59ec49
]
[Remove references to writeFilePS
Don Stewart <[EMAIL PROTECTED]>**20081026000739
Ignore-this: de68ac72bd06f21d0f8634490c95cd71
]
[Remove splitPS in favor of its definition
Don Stewart <[EMAIL PROTECTED]>**20081025235851
Ignore-this: def77f09fee27b7224d9935ab9dcb6d0
]
[Remove OldFastPackedString entirely
Don Stewart <[EMAIL PROTECTED]>**20081025234228
Ignore-this: aa5fdf008176143575de7a966fb43874
]
[just hash the last 20 characters in LCS
Ganesh Sittampalam <[EMAIL PROTECTED]>**20081025122331]
[TAG unstable before bytestring patches.
David Roundy <[EMAIL PROTECTED]>**20081030175727
Ignore-this: 8af46543d274b193a6904883c9608559
]
Patch bundle hash:
7919c17e4b783f00f6d9e833976ecb1fc8c781c2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkkOybsACgkQLpef9iTtxAbuAACfeK8yvvhBJI4inKpwtCbc/3H8
2SoAoOAlVvhIiAo7YOyKioZqcrqH8CEs
=a8OC
-----END PGP SIGNATURE-----
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
