Sat Dec 3 17:28:59 MST 2005 Will <[EMAIL PROTECTED]>
* use System.Posix.sleep and fix the win32 implementation
Make Lock.lhs use the sleep function from System.Posix rather than importing
the C implementation. Also fix the the win32 implementation to call SleepEx
rather than sleep from unistd.h which has been deprecated in recent versions
of mingw.
Sat Dec 3 19:26:13 MST 2005 Will <[EMAIL PROTECTED]>
* use autoconf to determine which GHC modules to use
GNUmakefile had the util and text packages hard coded, but the util package
appears to be missing from the current ghc-6-4-branch. Instead of hard
coding packages, use autoconf to include them when necessary.
Sat Dec 3 20:58:55 MST 2005 Will <[EMAIL PROTECTED]>
* skip tests that fail because of windows or msys
New patches:
[use System.Posix.sleep and fix the win32 implementation
Will <[EMAIL PROTECTED]>**20051204002859
Make Lock.lhs use the sleep function from System.Posix rather than importing
the C implementation. Also fix the the win32 implementation to call SleepEx
rather than sleep from unistd.h which has been deprecated in recent versions
of mingw.
] {
hunk ./Lock.lhs 46
- throwErrno, getErrno, eEXIST, CInt, CUInt )
+ throwErrno, getErrno, eEXIST, CInt )
hunk ./Lock.lhs 58
+import System.Posix ( sleep )
hunk ./Lock.lhs 78
-foreign import ccall unsafe "unistd.h sleep" sleep
- :: CUInt -> IO CUInt
-
hunk ./win32/System/Posix.hs 75
-foreign import ccall "stdlib.h _sleep" c_sleep :: CULong -> IO ()
+foreign import ccall "winbase.h SleepEx" c_SleepEx :: CULong -> CUInt -> IO CInt
hunk ./win32/System/Posix.hs 77
-sleep :: Integer -> IO ()
-sleep n = c_sleep (1000 * fromIntegral n)
+sleep :: Integer -> IO CInt
+sleep n = c_SleepEx (1000 * fromIntegral n) 1
}
[use autoconf to determine which GHC modules to use
Will <[EMAIL PROTECTED]>**20051204022613
GNUmakefile had the util and text packages hard coded, but the util package
appears to be missing from the current ghc-6-4-branch. Instead of hard
coding packages, use autoconf to include them when necessary.
] {
hunk ./GNUmakefile 14
-GHCFLAGS += -Wall -Werror -package util -I.
+GHCFLAGS += -Wall -Werror -I.
hunk ./GNUmakefile 188
-preproc: GHCFLAGS += -package text
hunk ./GNUmakefile 297
- @$(GHC) $(GHCFLAGS) -package util -package text -M -optdep-f -optdep.depend $^
+ @$(GHC) $(GHCFLAGS) -M -optdep-f -optdep.depend $^
hunk ./configure.ac 137
+dnl See if we need a package for QuickCheck
+
+GHC_CHECK_MODULE(Debug.QuickCheck( quickCheck ), QuickCheck, quickCheck True)
+
+dnl See if we need the util or mtl packages for Control.Monad
+
+GHC_CHECK_MODULE(Control.Monad.Error, util, putStr undefined)
+GHC_CHECK_MODULE(Control.Monad.Error, mtl, putStr undefined)
+
}
[skip tests that fail because of windows or msys
Will <[EMAIL PROTECTED]>**20051204035855] {
hunk ./tests/merging_newlines.pl 21
+close(T1);
hunk ./tests/merging_newlines.pl 26
+open(T1,">>one.txt");
hunk ./tests/pull.pl 53
+ } elsif ($^O =~ /msys/i) {
+ pass('this test fails on windows, so ignore it');
hunk ./tests/record.pl 19
-{
+if ($^O =~ /msys/i) {
+ pass 'test does not work on msys due to stdin oddities';
+} else {
hunk ./tests/set_scripts_executable.pl 21
-{
+if ($^O =~ /msys/i) {
+ pass 'test does not work on windows';
+} else {
hunk ./tests/whatsnew.pl 41
-touch(qw/\\/);
hunk ./tests/whatsnew.pl 42
-my $before = darcs(qw/add \\\\/);
-my $what = darcs('whatsnew');
-unlike($what, qr/no changes/i, $test_name);
+if ($^O =~ /msys/i) {
+ pass 'test does not work on windows';
+} else {
+ touch(qw/\\/);
+
+ my $before = darcs(qw/add \\\\/);
+ my $what = darcs('whatsnew');
+ unlike($what, qr/no changes/i, $test_name);
+}
}
Context:
[Make send --ouput - to print to stdout
Esa Ilari Vuokko <[EMAIL PROTECTED]>**20051129201708]
[Support apply --verify for bundles signed by GnuPG in Windows
Esa Ilari Vuokko <[EMAIL PROTECTED]>**20051126223238]
[TAG 1.0.5rc1
Tommy Pettersson <[EMAIL PROTECTED]>**20051125191739]
Patch bundle hash:
151028d0b3cb5bfd7aff19ab1ad2e2f315f49887
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
