Menu
▾
▴
gtk2hs-commit — Mailing list for Darcs commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(68) |
Aug
(4) |
Sep
|
Oct
(23) |
Nov
(95) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
(51) |
May
(81) |
Jun
(2) |
Jul
(86) |
Aug
(143) |
Sep
(3) |
Oct
(31) |
Nov
(63) |
Dec
(90) |
| 2005 |
Jan
(277) |
Feb
(157) |
Mar
(99) |
Apr
(195) |
May
(151) |
Jun
(148) |
Jul
(98) |
Aug
(123) |
Sep
(20) |
Oct
(174) |
Nov
(155) |
Dec
(26) |
| 2006 |
Jan
(51) |
Feb
(19) |
Mar
(16) |
Apr
(12) |
May
(5) |
Jun
|
Jul
(11) |
Aug
(7) |
Sep
(10) |
Oct
(31) |
Nov
(174) |
Dec
(56) |
| 2007 |
Jan
(45) |
Feb
(52) |
Mar
(10) |
Apr
(5) |
May
(47) |
Jun
(16) |
Jul
(80) |
Aug
(29) |
Sep
(14) |
Oct
(59) |
Nov
(46) |
Dec
(16) |
| 2008 |
Jan
(10) |
Feb
(1) |
Mar
|
Apr
|
May
(49) |
Jun
(26) |
Jul
(8) |
Aug
(4) |
Sep
(25) |
Oct
(53) |
Nov
(9) |
Dec
(1) |
| 2009 |
Jan
(66) |
Feb
(11) |
Mar
(1) |
Apr
(14) |
May
(8) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(9) |
Oct
(23) |
Nov
(35) |
Dec
|
| 2010 |
Jan
(7) |
Feb
(2) |
Mar
(39) |
Apr
(19) |
May
(161) |
Jun
(19) |
Jul
(32) |
Aug
(65) |
Sep
(113) |
Oct
(120) |
Nov
(2) |
Dec
|
| 2012 |
Jan
|
Feb
(5) |
Mar
(4) |
Apr
(7) |
May
(9) |
Jun
(14) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(12) |
Dec
(2) |
| 2013 |
Jan
(1) |
Feb
(17) |
Mar
(4) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Andy S. <And...@co...> - 2010-09-27 04:13:58
|
diffing dir...
Fri Sep 24 09:22:24 EDT 2010 Andy Stewart <laz...@gm...>
* Use withUTFString with appInfoGetExecutable
Ignore-this: d3de91ed0cd76e955173390d50be0f11
hunk ./gio/System/GIO/File/AppInfo.chs 185
- >>= peekCString
+ >>= peekUTFString
|
|
From: Andy S. <And...@co...> - 2010-09-27 04:13:56
|
diffing dir...
Fri Sep 24 09:17:44 EDT 2010 Andy Stewart <laz...@gm...>
* etag value should use withUTFString
Ignore-this: 69f71fae3b9e2813ac2fc1a0079d2de6
{
hunk ./gio/System/GIO/File/File.chs 621
- maybeWith withCString etag $ \cEtag ->
+ maybeWith withUTFString etag $ \cEtag ->
hunk ./gio/System/GIO/File/File.chs 711
- withCString etag $ \cEtag -> do
+ withUTFString etag $ \cEtag -> do
}
|
|
From: Andy S. <And...@co...> - 2010-09-27 04:13:52
|
diffing dir...
Fri Sep 24 09:15:58 EDT 2010 Andy Stewart <laz...@gm...>
* Update 'AppInfo.appInfoGetCommandline' with ByteString.
Ignore-this: 75c03a755d7e26ef085e5a7797273846
{
hunk ./gio/System/GIO/File/AppInfo.chs 102
+import Data.ByteString (ByteString)
+import Data.ByteString.Unsafe (unsafePackCStringFinalizer)
hunk ./gio/System/GIO/File/AppInfo.chs 190
- -> Maybe String -- ^ returns a string containing the appinfo's commandline, or 'Nothing' if this information is not available
+ -> Maybe ByteString -- ^ returns a string containing the appinfo's commandline, or 'Nothing' if this information is not available
hunk ./gio/System/GIO/File/AppInfo.chs 192
- unsafePerformIO $ [_$_]
- {#call g_app_info_get_commandline#} (toAppInfo appinfo)
- >>= maybePeek peekCString
+ unsafePerformIO $ do
+ sPtr <- {#call g_app_info_get_commandline#} (toAppInfo appinfo)
+ if sPtr == nullPtr
+ then return Nothing
+ else do
+ sLen <- lengthArray0 0 sPtr
+ liftM Just $ unsafePackCStringFinalizer (castPtr sPtr) (fromIntegral sLen)
+ ({#call unsafe g_free#} (castPtr sPtr))
}
|
|
From: Andy S. <And...@co...> - 2010-09-27 04:13:50
|
diffing dir...
Fri Sep 24 09:10:14 EDT 2010 Andy Stewart <laz...@gm...>
* Use ByteString replace String in 'ThemedIcon.themedIconNew' to support raw filepath
Ignore-this: fcbad71f924a5d72bc5b9645191d9844
{
hunk ./gio/System/GIO/Icons/ThemedIcon.chs 48
+import Data.ByteString (ByteString)
+import Data.ByteString.Unsafe (unsafeUseAsCString, unsafePackCStringFinalizer)
hunk ./gio/System/GIO/Icons/ThemedIcon.chs 63
-themedIconNew :: String -- ^ @iconname@ a string containing an icon name. [_$_]
+themedIconNew :: ByteString -- ^ @iconname@ a string containing an icon name. [_$_]
hunk ./gio/System/GIO/Icons/ThemedIcon.chs 66
- withCString iconName $ \ iconNamePtr -> [_$_]
+ unsafeUseAsCString iconName $ \ iconNamePtr -> [_$_]
}
|
|
From: Andy S. <And...@co...> - 2010-09-27 04:13:47
|
diffing dir...
Fri Sep 24 09:07:43 EDT 2010 Andy Stewart <laz...@gm...>
* Update module 'Icons.Icon' : Use ByteString replace String to support raw filepath
Ignore-this: 85b8b7d7d6da1927f0d644cc19d40546
{
hunk ./gio/System/GIO/Icons/Icon.chs 62
+import Data.ByteString (ByteString)
+import Data.ByteString.Unsafe (unsafeUseAsCString, unsafePackCStringFinalizer)
hunk ./gio/System/GIO/Icons/Icon.chs 95
- -> IO String
-iconToString icon =
- {#call g_icon_to_string#} (toIcon icon) [_$_]
- >>= readUTFString
+ -> IO ByteString
+iconToString icon = do
+ sPtr <- {#call g_icon_to_string#} (toIcon icon) [_$_]
+ sLen <- lengthArray0 0 sPtr
+ unsafePackCStringFinalizer (castPtr sPtr) (fromIntegral sLen)
+ ({#call unsafe g_free#} (castPtr sPtr))
hunk ./gio/System/GIO/Icons/Icon.chs 107
-iconNewForString :: String -> IO Icon
+iconNewForString :: ByteString -> IO Icon
hunk ./gio/System/GIO/Icons/Icon.chs 110
- withCString str $ \ strPtr -> [_$_]
+ unsafeUseAsCString str $ \ strPtr -> [_$_]
}
|
|
From: Andy S. <And...@co...> - 2010-09-27 04:13:46
|
diffing dir...
Fri Sep 24 09:02:31 EDT 2010 Andy Stewart <laz...@gm...>
* Update module 'File.FileInfo' : use ByteString replace String to support raw filepath
Ignore-this: ed46cab7a8280b255975f6b07357e9b9
{
hunk ./gio/System/GIO/File/FileInfo.chs 134
+import Data.ByteString (ByteString)
+import Data.ByteString.Unsafe (unsafeUseAsCString, unsafePackCStringFinalizer)
hunk ./gio/System/GIO/File/FileInfo.chs 257
- -> IO String -- ^ returns the contents of the attribute value as a ByteString
+ -> IO ByteString -- ^ returns the contents of the attribute value as a ByteString
hunk ./gio/System/GIO/File/FileInfo.chs 259
- withUTFString attribute $ \ attributePtr -> [_$_]
- {#call g_file_info_get_attribute_byte_string#} (toFileInfo info) attributePtr
- >>= readCString
+ withUTFString attribute $ \ attributePtr -> do
+ sPtr <- {#call g_file_info_get_attribute_byte_string#} (toFileInfo info) attributePtr
+ sLen <- lengthArray0 0 sPtr
+ unsafePackCStringFinalizer (castPtr sPtr) (fromIntegral sLen)
+ ({#call unsafe g_free#} (castPtr sPtr))
hunk ./gio/System/GIO/File/FileInfo.chs 363
- -> String -- ^ @attrValue@ a string. [_$_]
+ -> ByteString -- ^ @attrValue@ a string. [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 367
- withUTFString attrValue $ \ attrValuePtr -> [_$_]
+ unsafeUseAsCString attrValue $ \ attrValuePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 463
- -> Maybe String -- ^ returns a string containing the file name. [_$_]
+ -> Maybe ByteString -- ^ returns a string containing the file name. [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 465
- unsafePerformIO $ [_$_]
- {#call g_file_info_get_name#} (toFileInfo info)
- >>= maybePeek readCString
+ unsafePerformIO $ do
+ sPtr <- {#call g_file_info_get_name#} (toFileInfo info)
+ if sPtr == nullPtr
+ then return Nothing
+ else do
+ sLen <- lengthArray0 0 sPtr
+ liftM Just $ unsafePackCStringFinalizer (castPtr sPtr) (fromIntegral sLen)
+ ({#call unsafe g_free#} (castPtr sPtr))
hunk ./gio/System/GIO/File/FileInfo.chs 570
-fileInfoSetName :: FileInfoClass info => info -> String -> IO ()
+fileInfoSetName :: FileInfoClass info => info -> ByteString -> IO ()
hunk ./gio/System/GIO/File/FileInfo.chs 572
- withCString name $ \ namePtr -> [_$_]
+ unsafeUseAsCString name $ \ namePtr -> [_$_]
}
|
|
From: Andy S. <And...@co...> - 2010-09-27 04:13:43
|
diffing dir...
Fri Sep 24 08:55:22 EDT 2010 Andy Stewart <laz...@gm...>
* Update module 'File.File' : use ByteString replace String to support raw filepath.
Ignore-this: babdfd33ed88eb19ba3d9277b9d6863
{
hunk ./gio/System/GIO/File/File.chs 234
+import Data.ByteString (ByteString)
+import Data.ByteString.Unsafe (unsafeUseAsCString, unsafePackCStringFinalizer)
hunk ./gio/System/GIO/File/File.chs 270
-fileFromPath :: FilePath -> File
+fileFromPath :: ByteString -> File
hunk ./gio/System/GIO/File/File.chs 273
- withCString path $ \cPath -> {# call file_new_for_path #} cPath
+ unsafeUseAsCString path $ \cPath -> {# call file_new_for_path #} cPath
hunk ./gio/System/GIO/File/File.chs 286
-fileFromCommandlineArg :: String -> File
+fileFromCommandlineArg :: ByteString -> File
hunk ./gio/System/GIO/File/File.chs 289
- withCString arg $ \cArg -> {# call file_new_for_commandline_arg #} cArg [_$_]
+ unsafeUseAsCString arg $ \cArg -> {# call file_new_for_commandline_arg #} cArg [_$_]
hunk ./gio/System/GIO/File/File.chs 294
-fileFromParseName :: String -> File
+fileFromParseName :: ByteString -> File
hunk ./gio/System/GIO/File/File.chs 297
- withCString parseName $ \cParseName -> {# call file_parse_name #} cParseName [_$_]
+ unsafeUseAsCString parseName $ \cParseName -> {# call file_parse_name #} cParseName [_$_]
hunk ./gio/System/GIO/File/File.chs 322
-fileBasename :: FileClass file => file -> String
+fileBasename :: FileClass file => file -> ByteString
hunk ./gio/System/GIO/File/File.chs 324
- unsafePerformIO $ {# call file_get_basename #} (toFile file) >>= readCString
+ unsafePerformIO $ do
+ sPtr <- {# call file_get_basename #} [_$_]
+ (toFile file)
+ sLen <- lengthArray0 0 sPtr
+ unsafePackCStringFinalizer (castPtr sPtr) (fromIntegral sLen)
+ ({#call unsafe g_free#} (castPtr sPtr))
hunk ./gio/System/GIO/File/File.chs 334
-filePath :: FileClass file => file -> FilePath
+filePath :: FileClass file => file -> ByteString
hunk ./gio/System/GIO/File/File.chs 336
- unsafePerformIO $ {# call file_get_path #} (toFile file) >>= readUTFString
+ unsafePerformIO $ do
+ sPtr <- {# call file_get_path #} [_$_]
+ (toFile file)
+ sLen <- lengthArray0 0 sPtr
+ unsafePackCStringFinalizer (castPtr sPtr) (fromIntegral sLen)
+ ({#call unsafe g_free#} (castPtr sPtr))
hunk ./gio/System/GIO/File/File.chs 392
-fileGetChild :: FileClass file => file -> String -> File
+fileGetChild :: FileClass file => file -> ByteString -> File
hunk ./gio/System/GIO/File/File.chs 395
- withCString name $ \cName ->
+ unsafeUseAsCString name $ \cName ->
hunk ./gio/System/GIO/File/File.chs 425
-fileGetRelativePath :: (FileClass file1, FileClass file2) => file1 -> file2 -> Maybe FilePath
+fileGetRelativePath :: (FileClass file1, FileClass file2) => file1 -> file2 -> Maybe ByteString
hunk ./gio/System/GIO/File/File.chs 427
- unsafePerformIO $
- {# call file_get_relative_path #} (toFile file1) (toFile file2) >>=
- maybePeek readUTFString
+ unsafePerformIO $ do
+ sPtr <- {# call file_get_relative_path #} (toFile file1) (toFile file2)
+ if sPtr == nullPtr
+ then return Nothing
+ else do
+ sLen <- lengthArray0 0 sPtr
+ liftM Just $ unsafePackCStringFinalizer (castPtr sPtr) (fromIntegral sLen)
+ ({#call unsafe g_free#} (castPtr sPtr))
hunk ./gio/System/GIO/File/File.chs 439
-fileResolveRelativePath :: FileClass file => file -> FilePath -> Maybe File
+fileResolveRelativePath :: FileClass file => file -> ByteString -> Maybe File
hunk ./gio/System/GIO/File/File.chs 442
- withCString relativePath $ \cRelativePath ->
+ unsafeUseAsCString relativePath $ \cRelativePath ->
hunk ./gio/System/GIO/File/File.chs 1347
- -> String
+ -> ByteString
hunk ./gio/System/GIO/File/File.chs 1351
- withCString symlinkValue $ \cSymlinkValue -> do
+ unsafeUseAsCString symlinkValue $ \cSymlinkValue -> do
}
|
|
From: Andy S. <And...@co...> - 2010-09-27 04:13:41
|
diffing dir...
Fri Sep 24 08:33:05 EDT 2010 Andy Stewart <laz...@gm...>
* Adjust non-filepath argument with 'UTFString' function
Ignore-this: 81c711c2d6e04747211409378b8c2f6f
{
hunk ./gio/System/GIO/File/AppInfo.chs 120
- withCString commandline $ \ commandlinePtr -> [_$_]
- maybeWith withCString applicationName $ \ applicationNamePtr -> [_$_]
+ withUTFString commandline $ \ commandlinePtr -> [_$_]
+ maybeWith withUTFString applicationName $ \ applicationNamePtr -> [_$_]
hunk ./gio/System/GIO/File/File.chs 744
- withCString attributes $ \cAttributes ->
+ withUTFString attributes $ \cAttributes ->
hunk ./gio/System/GIO/File/File.chs 768
- withCString attributes $ \cAttributes -> do
+ withUTFString attributes $ \cAttributes -> do
hunk ./gio/System/GIO/File/File.chs 861
- withCString attributes $ \cAttributes ->
+ withUTFString attributes $ \cAttributes ->
hunk ./gio/System/GIO/File/File.chs 883
- withCString attributes $ \cAttributes -> do
+ withUTFString attributes $ \cAttributes -> do
hunk ./gio/System/GIO/File/File.chs 1015
- withCString attributes $ \cAttributes -> do
+ withUTFString attributes $ \cAttributes -> do
hunk ./gio/System/GIO/File/File.chs 1469
- withCString attribute $ \ attributePtr -> [_$_]
- withCString value $ \ valuePtr -> do
+ withUTFString attribute $ \ attributePtr -> [_$_]
+ withUTFString value $ \ valuePtr -> do
hunk ./gio/System/GIO/File/File.chs 1494
- withCString attribute $ \ attributePtr -> [_$_]
- withCString value $ \ valuePtr -> do
+ withUTFString attribute $ \ attributePtr -> [_$_]
+ withUTFString value $ \ valuePtr -> do
hunk ./gio/System/GIO/File/File.chs 1519
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/File.chs 1543
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/File.chs 1567
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/File.chs 1591
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 173
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 183
- withCString namespace $ \ namespacePtr -> [_$_]
+ withUTFString namespace $ \ namespacePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 192
- withCString nameSpace $ \ nameSpacePtr -> [_$_]
+ withUTFString nameSpace $ \ nameSpacePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 202
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 210
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 219
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 229
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 237
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 247
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 257
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 267
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 276
- withCString attribute $ \ attributePtr -> do
+ withUTFString attribute $ \ attributePtr -> do
hunk ./gio/System/GIO/File/FileInfo.chs 285
- withCString attribute $ \ attributePtr -> do
+ withUTFString attribute $ \ attributePtr -> do
hunk ./gio/System/GIO/File/FileInfo.chs 294
- withCString attribute $ \ attributePtr -> do
+ withUTFString attribute $ \ attributePtr -> do
hunk ./gio/System/GIO/File/FileInfo.chs 303
- withCString attribute $ \ attributePtr -> do
+ withUTFString attribute $ \ attributePtr -> do
hunk ./gio/System/GIO/File/FileInfo.chs 311
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 327
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 340
- withCString attribute $ \ attributePtr -> [_$_]
- withCString attrValue $ \ attrValuePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
+ withUTFString attrValue $ \ attrValuePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 351
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 362
- withCString attribute $ \ attributePtr -> [_$_]
- withCString attrValue $ \ attrValuePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
+ withUTFString attrValue $ \ attrValuePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 372
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 381
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 390
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 399
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 408
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 417
- withCString attribute $ \ attributePtr -> [_$_]
+ withUTFString attribute $ \ attributePtr -> [_$_]
hunk ./gio/System/GIO/File/FileInfo.chs 494
- >>= maybePeek peekCString
+ >>= maybePeek peekUTFString
hunk ./gio/System/GIO/Icons/ThemedIcon.chs 84
- withCString iconname $ \ iconnamePtr -> [_$_]
+ withUTFString iconname $ \ iconnamePtr -> [_$_]
hunk ./gio/System/GIO/Icons/ThemedIcon.chs 93
- withCString iconname $ \ iconnamePtr -> [_$_]
+ withUTFString iconname $ \ iconnamePtr -> [_$_]
hunk ./gio/System/GIO/Volumes/Drive.chs 366
- withCString kind $ \ kindPtr -> [_$_]
+ withUTFString kind $ \ kindPtr -> [_$_]
hunk ./gio/System/GIO/Volumes/Volume.chs 268
- withCString kind $ \ kindPtr -> [_$_]
+ withUTFString kind $ \ kindPtr -> [_$_]
hunk ./gio/System/GIO/Volumes/VolumeMonitor.chs 120
- withCString uuid $ \ uuidPtr -> [_$_]
+ withUTFString uuid $ \ uuidPtr -> [_$_]
hunk ./gio/System/GIO/Volumes/VolumeMonitor.chs 129
- withCString uuid $ \ uuidPtr -> [_$_]
+ withUTFString uuid $ \ uuidPtr -> [_$_]
}
|
|
From: Andy S. <And...@co...> - 2010-09-25 09:21:20
|
diffing dir...
Sat Sep 25 05:17:48 EDT 2010 Andy Stewart <laz...@gm...>
* Add version macro in FileAttribute.hsc and add missing attributes.
Ignore-this: 1b0c83cbeca3b958ae8b15c379c2b48
{
hunk ./gio/System/GIO/File/FileAttribute.hsc 2
+{-# LANGUAGE ScopedTypeVariables #-}
+-- -*-haskell-*-
+
+#include <gio/gio.h>
+ [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 77
+#if GLIB_CHECK_VERSION(2,20,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 79
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 96
+#if GLIB_CHECK_VERSION(2,22,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 98
+ fileAttributeMountableCanStart, [_$_]
+ fileAttributeMountableCanDegraded,
+ fileAttributeMountableCanStop, [_$_]
+ fileAttributeMountableStartStopType,
+ fileAttributeMountableCanPoll,
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 130
+#if GLIB_CHECK_VERSION(2,20,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 132
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 142
+#if GLIB_CHECK_VERSION(2,22,0)
+ fileAttributeTrashOrigPath,
+ fileAttributeTrashDeletionDate,
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 148
-#include <gio/gio.h>
hunk ./gio/System/GIO/File/FileAttribute.hsc 164
+#if GLIB_CHECK_VERSION(2,22,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 166
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 178
+#if GLIB_CHECK_VERSION(2,22,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 180
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 191
+#if GLIB_CHECK_VERSION(2,22,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 193
+#endif
hunk ./gio/System/GIO/File/FileAttribute.hsc 229
+#if GLIB_CHECK_VERSION(2,20,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 231
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 248
+#if GLIB_CHECK_VERSION(2,22,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 250
+ fileAttributeMountableCanStart,
+ fileAttributeMountableCanDegraded,
+ fileAttributeMountableCanStop,
+ fileAttributeMountableStartStopType,
+ fileAttributeMountableCanPoll,
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 282
+#if GLIB_CHECK_VERSION(2,20,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 284
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 293
- fileAttributeStandardDescription
+ fileAttributeStandardDescription,
+#if GLIB_CHECK_VERSION(2,22,0)
+ fileAttributeTrashOrigPath,
+ fileAttributeTrashDeletionDate
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 312
+#if GLIB_CHECK_VERSION(2,20,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 314
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 331
+#if GLIB_CHECK_VERSION(2,22,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 333
+fileAttributeMountableCanStart = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START}
+fileAttributeMountableCanDegraded = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START_DEGRADED}
+fileAttributeMountableCanStop = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_CAN_STOP}
+fileAttributeMountableStartStopType = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_START_STOP_TYPE}
+fileAttributeMountableCanPoll = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL}
+fileAttributeMountableIsMediaCheckAutomatic = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC}
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 366
+#if GLIB_CHECK_VERSION(2,20,0)
hunk ./gio/System/GIO/File/FileAttribute.hsc 368
+#endif [_$_]
hunk ./gio/System/GIO/File/FileAttribute.hsc 378
+#if GLIB_CHECK_VERSION(2,22,0)
+fileAttributeTrashOrigPath = #{const_str G_FILE_ATTRIBUTE_TRASH_ORIG_PATH}
+fileAttributeTrashDeletionDate = #{const_str G_FILE_ATTRIBUTE_TRASH_DELETION_DATE}
+#endif [_$_]
}
|
|
From: Andy S. <And...@co...> - 2010-09-24 23:36:31
|
diffing dir...
Fri Sep 24 19:32:22 EDT 2010 Andy Stewart <laz...@gm...>
* Fix compile problem
Ignore-this: 96b82190aae5832f73b31a9ff537ad08
{
hunk ./gio/System/GIO/Enums.chs 51
+#if GLIB_CHECK_VERSION(2,22,0)
hunk ./gio/System/GIO/Enums.chs 54
+#endif
hunk ./gio/System/GIO/Enums.chs 56
+#if GLIB_CHECK_VERSION(2,18,0)
hunk ./gio/System/GIO/Enums.chs 58
+#endif
hunk ./gio/System/GIO/Enums.chs 129
+#if GLIB_CHECK_VERSION(2,22,0)
hunk ./gio/System/GIO/Enums.chs 136
+#endif
hunk ./gio/System/GIO/Enums.chs 138
+#if GLIB_CHECK_VERSION(2,18,0)
hunk ./gio/System/GIO/Enums.chs 141
+#endif
}
|
|
From: Andy S. <And...@co...> - 2010-09-24 16:47:01
|
diffing dir...
Fri Sep 24 12:44:40 EDT 2010 Andy Stewart <laz...@gm...>
* Fix compile problem.
Ignore-this: a03359ad7e1ed25023b6a84eb2b6e806
{
hunk ./gio/System/GIO/Volumes/Mount.chs 61
+#if GLIB_CHECK_VERSION(2,24,0)
hunk ./gio/System/GIO/Volumes/Mount.chs 63
+#endif
hunk ./gio/System/GIO/Volumes/Mount.chs 160
+#if GLIB_CHECK_VERSION(2,24,0)
hunk ./gio/System/GIO/Volumes/Mount.chs 169
+#endif
hunk ./gio/hierarchy.list 268
- GEmblem as Emblem, g_emblem_get_type if gio
- GEmblemedIcon as EmblemedIcon, g_emblemed_icon_get_type if gio
+ GEmblem as Emblem, g_emblem_get_type if gio-2.18
+ GEmblemedIcon as EmblemedIcon, g_emblemed_icon_get_type if gio-2.18
}
|
|
From: Axel S. <si...@co...> - 2010-09-24 15:44:11
|
diffing dir...
Fri Sep 24 11:42:43 EDT 2010 Axe...@in...
* Fix reading of NULL-terminated string arrays.
Ignore-this: 3c679be03317e82d1215d6ba9b3300cc
{
hunk ./glib/System/Glib/UTFString.hs 148
--- Like peekUTFStringArray0 but then free the string array using g_strfreev
+-- Like 'peekUTFStringArray0' but then free the string array including all strings.
+--
+-- To be used when functions indicate that their return value should be freed
+-- with \"g_strfreev\".
+--
hunk ./glib/System/Glib/UTFString.hs 154
-readUTFStringArray0 cStrArr = do
+readUTFStringArray0 cStrArr | cStrArr == nullPtr = return []
+ | otherwise = do
hunk ./glib/System/Glib/UTFString.hs 157
+ strings <- mapM peekUTFString cStrs
hunk ./glib/System/Glib/UTFString.hs 159
- mapM peekUTFString cStrs
+ return strings
}
|
|
From: Andy S. <And...@co...> - 2010-09-24 00:17:09
|
diffing dir...
Thu Sep 23 20:15:52 EDT 2010 Andy Stewart <laz...@gm...>
* Update Gtk2HsSetup.hs in pango
Ignore-this: 14c223f6d20d183b11459b492a09a658
{
hunk ./pango/Gtk2HsSetup.hs 35
-module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where
+module Gtk2HsSetup ( [_$_]
+ gtk2hsUserHooks, [_$_]
+ getPkgConfigPackages, [_$_]
+ checkGtk2hsBuildtools
+ ) where
hunk ./pango/Gtk2HsSetup.hs 72
- rawSystemProgramConf, rawSystemProgramStdoutConf,
+ rawSystemProgramConf, rawSystemProgramStdoutConf, programName,
hunk ./pango/Gtk2HsSetup.hs 90
-import System.Directory ( doesFileExist )
+import System.Exit (exitFailure)
+import System.Directory ( doesFileExist, getDirectoryContents, doesDirectoryExist )
hunk ./pango/Gtk2HsSetup.hs 94
-import Control.Monad (when, unless, filterM)
+import Control.Monad (when, unless, filterM, liftM, forM, forM_)
hunk ./pango/Gtk2HsSetup.hs 102
-import System.Directory (getDirectoryContents, doesDirectoryExist)
hunk ./pango/Gtk2HsSetup.hs 110
- confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ (fmap adjustLocalBuildInfo (confHook simpleUserHooks pd cf)),
hunk ./pango/Gtk2HsSetup.hs 115
- (buildHook simpleUserHooks) pd lbi uh bf,
- copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
+ buildHook simpleUserHooks pd lbi uh bf,
+ copyHook = \pd lbi uh flags -> copyHook simpleUserHooks pd lbi uh flags >>
hunk ./pango/Gtk2HsSetup.hs 305
- ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
+ ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"]
hunk ./pango/Gtk2HsSetup.hs 315
- mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
- (map toFilePath
+ mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi] . toFilePath)
hunk ./pango/Gtk2HsSetup.hs 321
- )
+ [_$_]
hunk ./pango/Gtk2HsSetup.hs 337
-typeGenProgram = (simpleProgram "gtk2hsTypeGen")
+typeGenProgram = simpleProgram "gtk2hsTypeGen"
hunk ./pango/Gtk2HsSetup.hs 340
-signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
+signalGenProgram = simpleProgram "gtk2hsHookGenerator"
hunk ./pango/Gtk2HsSetup.hs 343
-c2hsLocal = (simpleProgram "gtk2hsC2hs")
+c2hsLocal = simpleProgram "gtk2hsC2hs"
hunk ./pango/Gtk2HsSetup.hs 376
- (flip mapM_) (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
+ forM_ (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
hunk ./pango/Gtk2HsSetup.hs 397
- Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Nothing -> die "parsing output of pkg-config --modversion failed"
hunk ./pango/Gtk2HsSetup.hs 462
- let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
+ let findImports acc (('{':'#':xs):xxs) = case (dropWhile (' ' ==) xs) of
hunk ./pango/Gtk2HsSetup.hs 464
- case simpleParse (takeWhile ((/=) '#') ys) of
+ case simpleParse (takeWhile ('#' /=) ys) of
hunk ./pango/Gtk2HsSetup.hs 490
+
+-- Check user whether install gtk2hs-buildtools correctly.
+checkGtk2hsBuildtools :: [String] -> IO ()
+checkGtk2hsBuildtools programs = do
+ programInfos <- mapM (\ name -> do
+ location <- programFindLocation (simpleProgram name) normal
+ return (name, location)
+ ) programs
+ let printError name = do
+ putStrLn $ "Cannot find " ++ name ++ "\n" [_$_]
+ ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
+ exitFailure
+ forM_ programInfos $ \ (name, location) ->
+ when (isNothing location) (printError name) [_$_]
hunk ./pango/Setup.hs 6
-import Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages )
+import Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages, checkGtk2hsBuildtools )
hunk ./pango/Setup.hs 16
-main = defaultMainWithHooks gtk2hsUserHooks {
+main = do
+ checkGtk2hsBuildtools ["gtk2hsC2hs", "gtk2hsTypeGen"]
+ defaultMainWithHooks gtk2hsUserHooks {
}
|
|
From: Andy S. <And...@co...> - 2010-09-24 00:17:06
|
diffing dir...
Thu Sep 23 20:15:19 EDT 2010 Andy Stewart <laz...@gm...>
* Make checkGtk2hsBuildtools support different check sequence.
Ignore-this: 90282d8bc1b1c4c4d156f1b22376ce01
{
hunk ./gtk/Gtk2HsSetup.hs 492
-checkGtk2hsBuildtools :: IO ()
-checkGtk2hsBuildtools = do
- c2hsPath <- (programFindLocation c2hsLocal) normal [_$_]
- typePath <- (programFindLocation typeGenProgram) normal [_$_]
- signalPath <- (programFindLocation signalGenProgram) normal [_$_]
+checkGtk2hsBuildtools :: [String] -> IO ()
+checkGtk2hsBuildtools programs = do
+ programInfos <- mapM (\ name -> do
+ location <- programFindLocation (simpleProgram name) normal
+ return (name, location)
+ ) programs
hunk ./gtk/Gtk2HsSetup.hs 502
- if isNothing c2hsPath
- then printError (programName c2hsLocal)
- else if isNothing typePath
- then printError (programName typeGenProgram)
- else when (isNothing signalPath) $
- printError (programName signalGenProgram)
+ forM_ programInfos $ \ (name, location) ->
+ when (isNothing location) (printError name) [_$_]
hunk ./gtk/Setup.hs 8
- checkGtk2hsBuildtools
+ checkGtk2hsBuildtools ["gtk2hsC2hs", "gtk2hsTypeGen", "gtk2hsHookGenerator"]
}
|
|
From: Andy S. <And...@co...> - 2010-09-24 00:17:04
|
diffing dir...
Thu Sep 23 20:13:36 EDT 2010 Andy Stewart <laz...@gm...>
* Update Gtk2HsSetup.hs in glib
Ignore-this: 9b00f600d3a92e27e8fadc93a0b5a972
{
hunk ./glib/Gtk2HsSetup.hs 35
-module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where
+module Gtk2HsSetup ( [_$_]
+ gtk2hsUserHooks, [_$_]
+ getPkgConfigPackages, [_$_]
+ checkGtk2hsBuildtools
+ ) where
hunk ./glib/Gtk2HsSetup.hs 72
- rawSystemProgramConf, rawSystemProgramStdoutConf,
+ rawSystemProgramConf, rawSystemProgramStdoutConf, programName,
hunk ./glib/Gtk2HsSetup.hs 90
-import System.Directory ( doesFileExist )
+import System.Exit (exitFailure)
+import System.Directory ( doesFileExist, getDirectoryContents, doesDirectoryExist )
hunk ./glib/Gtk2HsSetup.hs 94
-import Control.Monad (when, unless, filterM)
+import Control.Monad (when, unless, filterM, liftM, forM, forM_)
hunk ./glib/Gtk2HsSetup.hs 102
-import System.Directory (getDirectoryContents, doesDirectoryExist)
hunk ./glib/Gtk2HsSetup.hs 110
- confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ (fmap adjustLocalBuildInfo (confHook simpleUserHooks pd cf)),
hunk ./glib/Gtk2HsSetup.hs 115
- (buildHook simpleUserHooks) pd lbi uh bf,
- copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
+ buildHook simpleUserHooks pd lbi uh bf,
+ copyHook = \pd lbi uh flags -> copyHook simpleUserHooks pd lbi uh flags >>
hunk ./glib/Gtk2HsSetup.hs 305
- ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
+ ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"]
hunk ./glib/Gtk2HsSetup.hs 315
- mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
- (map toFilePath
+ mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi] . toFilePath)
hunk ./glib/Gtk2HsSetup.hs 321
- )
+ [_$_]
hunk ./glib/Gtk2HsSetup.hs 337
-typeGenProgram = (simpleProgram "gtk2hsTypeGen")
+typeGenProgram = simpleProgram "gtk2hsTypeGen"
hunk ./glib/Gtk2HsSetup.hs 340
-signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
+signalGenProgram = simpleProgram "gtk2hsHookGenerator"
hunk ./glib/Gtk2HsSetup.hs 343
-c2hsLocal = (simpleProgram "gtk2hsC2hs")
+c2hsLocal = simpleProgram "gtk2hsC2hs"
hunk ./glib/Gtk2HsSetup.hs 376
- (flip mapM_) (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
+ forM_ (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
hunk ./glib/Gtk2HsSetup.hs 397
- Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Nothing -> die "parsing output of pkg-config --modversion failed"
hunk ./glib/Gtk2HsSetup.hs 462
- let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
+ let findImports acc (('{':'#':xs):xxs) = case (dropWhile (' ' ==) xs) of
hunk ./glib/Gtk2HsSetup.hs 464
- case simpleParse (takeWhile ((/=) '#') ys) of
+ case simpleParse (takeWhile ('#' /=) ys) of
hunk ./glib/Gtk2HsSetup.hs 490
+
+-- Check user whether install gtk2hs-buildtools correctly.
+checkGtk2hsBuildtools :: [String] -> IO ()
+checkGtk2hsBuildtools programs = do
+ programInfos <- mapM (\ name -> do
+ location <- programFindLocation (simpleProgram name) normal
+ return (name, location)
+ ) programs
+ let printError name = do
+ putStrLn $ "Cannot find " ++ name ++ "\n" [_$_]
+ ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
+ exitFailure
+ forM_ programInfos $ \ (name, location) ->
+ when (isNothing location) (printError name) [_$_]
hunk ./glib/Setup.hs 4
-import Gtk2HsSetup ( gtk2hsUserHooks )
+import Gtk2HsSetup ( gtk2hsUserHooks, checkGtk2hsBuildtools )
hunk ./glib/Setup.hs 7
-main = defaultMainWithHooks gtk2hsUserHooks
+main = do
+ checkGtk2hsBuildtools ["gtk2hsC2hs"]
+ defaultMainWithHooks gtk2hsUserHooks
}
|
|
From: Andy S. <And...@co...> - 2010-09-24 00:17:02
|
diffing dir...
Thu Sep 23 20:12:08 EDT 2010 Andy Stewart <laz...@gm...>
* Update Gtk2HsSetup.hs in gio
Ignore-this: ad2063d23ef87f723a1ecc8634edf364
{
hunk ./gio/Gtk2HsSetup.hs 35
-module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where
+module Gtk2HsSetup ( [_$_]
+ gtk2hsUserHooks, [_$_]
+ getPkgConfigPackages, [_$_]
+ checkGtk2hsBuildtools
+ ) where
hunk ./gio/Gtk2HsSetup.hs 72
- rawSystemProgramConf, rawSystemProgramStdoutConf,
+ rawSystemProgramConf, rawSystemProgramStdoutConf, programName,
hunk ./gio/Gtk2HsSetup.hs 90
-import System.Directory ( doesFileExist )
+import System.Exit (exitFailure)
+import System.Directory ( doesFileExist, getDirectoryContents, doesDirectoryExist )
hunk ./gio/Gtk2HsSetup.hs 94
-import Control.Monad (when, unless, filterM)
+import Control.Monad (when, unless, filterM, liftM, forM, forM_)
hunk ./gio/Gtk2HsSetup.hs 102
-import System.Directory (getDirectoryContents, doesDirectoryExist)
hunk ./gio/Gtk2HsSetup.hs 110
- confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ (fmap adjustLocalBuildInfo (confHook simpleUserHooks pd cf)),
hunk ./gio/Gtk2HsSetup.hs 115
- (buildHook simpleUserHooks) pd lbi uh bf,
- copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
+ buildHook simpleUserHooks pd lbi uh bf,
+ copyHook = \pd lbi uh flags -> copyHook simpleUserHooks pd lbi uh flags >>
hunk ./gio/Gtk2HsSetup.hs 305
- ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
+ ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"]
hunk ./gio/Gtk2HsSetup.hs 315
- mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
- (map toFilePath
+ mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi] . toFilePath)
hunk ./gio/Gtk2HsSetup.hs 321
- )
+ [_$_]
hunk ./gio/Gtk2HsSetup.hs 337
-typeGenProgram = (simpleProgram "gtk2hsTypeGen")
+typeGenProgram = simpleProgram "gtk2hsTypeGen"
hunk ./gio/Gtk2HsSetup.hs 340
-signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
+signalGenProgram = simpleProgram "gtk2hsHookGenerator"
hunk ./gio/Gtk2HsSetup.hs 343
-c2hsLocal = (simpleProgram "gtk2hsC2hs")
+c2hsLocal = simpleProgram "gtk2hsC2hs"
hunk ./gio/Gtk2HsSetup.hs 376
- (flip mapM_) (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
+ forM_ (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
hunk ./gio/Gtk2HsSetup.hs 397
- Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Nothing -> die "parsing output of pkg-config --modversion failed"
hunk ./gio/Gtk2HsSetup.hs 462
- let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
+ let findImports acc (('{':'#':xs):xxs) = case (dropWhile (' ' ==) xs) of
hunk ./gio/Gtk2HsSetup.hs 464
- case simpleParse (takeWhile ((/=) '#') ys) of
+ case simpleParse (takeWhile ('#' /=) ys) of
hunk ./gio/Gtk2HsSetup.hs 490
+
+-- Check user whether install gtk2hs-buildtools correctly.
+checkGtk2hsBuildtools :: [String] -> IO ()
+checkGtk2hsBuildtools programs = do
+ programInfos <- mapM (\ name -> do
+ location <- programFindLocation (simpleProgram name) normal
+ return (name, location)
+ ) programs
+ let printError name = do
+ putStrLn $ "Cannot find " ++ name ++ "\n" [_$_]
+ ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
+ exitFailure
+ forM_ programInfos $ \ (name, location) ->
+ when (isNothing location) (printError name) [_$_]
hunk ./gio/Setup.hs 4
-import Gtk2HsSetup ( gtk2hsUserHooks )
+import Gtk2HsSetup ( gtk2hsUserHooks, checkGtk2hsBuildtools )
hunk ./gio/Setup.hs 7
-main = defaultMainWithHooks gtk2hsUserHooks
+main = do
+ checkGtk2hsBuildtools ["gtk2hsC2hs", "gtk2hsTypeGen", "gtk2hsHookGenerator"]
+ defaultMainWithHooks gtk2hsUserHooks
+ [_$_]
}
|
|
From: Andy S. <And...@co...> - 2010-09-24 00:17:00
|
diffing dir...
Thu Sep 23 20:10:56 EDT 2010 Andy Stewart <laz...@gm...>
* Update Gtk2HsSetup.hs in cairo
Ignore-this: deec4b151a66eb2c6499302f89dd3f02
{
hunk ./cairo/Gtk2HsSetup.hs 35
-module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where
+module Gtk2HsSetup ( [_$_]
+ gtk2hsUserHooks, [_$_]
+ getPkgConfigPackages, [_$_]
+ checkGtk2hsBuildtools
+ ) where
hunk ./cairo/Gtk2HsSetup.hs 72
- rawSystemProgramConf, rawSystemProgramStdoutConf,
+ rawSystemProgramConf, rawSystemProgramStdoutConf, programName,
hunk ./cairo/Gtk2HsSetup.hs 90
-import System.Directory ( doesFileExist )
+import System.Exit (exitFailure)
+import System.Directory ( doesFileExist, getDirectoryContents, doesDirectoryExist )
hunk ./cairo/Gtk2HsSetup.hs 94
-import Control.Monad (when, unless, filterM)
+import Control.Monad (when, unless, filterM, liftM, forM, forM_)
hunk ./cairo/Gtk2HsSetup.hs 102
-import System.Directory (getDirectoryContents, doesDirectoryExist)
hunk ./cairo/Gtk2HsSetup.hs 110
- confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ (fmap adjustLocalBuildInfo (confHook simpleUserHooks pd cf)),
hunk ./cairo/Gtk2HsSetup.hs 115
- (buildHook simpleUserHooks) pd lbi uh bf,
- copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
+ buildHook simpleUserHooks pd lbi uh bf,
+ copyHook = \pd lbi uh flags -> copyHook simpleUserHooks pd lbi uh flags >>
hunk ./cairo/Gtk2HsSetup.hs 305
- ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
+ ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"]
hunk ./cairo/Gtk2HsSetup.hs 315
- mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
- (map toFilePath
+ mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi] . toFilePath)
hunk ./cairo/Gtk2HsSetup.hs 321
- )
+ [_$_]
hunk ./cairo/Gtk2HsSetup.hs 337
-typeGenProgram = (simpleProgram "gtk2hsTypeGen")
+typeGenProgram = simpleProgram "gtk2hsTypeGen"
hunk ./cairo/Gtk2HsSetup.hs 340
-signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
+signalGenProgram = simpleProgram "gtk2hsHookGenerator"
hunk ./cairo/Gtk2HsSetup.hs 343
-c2hsLocal = (simpleProgram "gtk2hsC2hs")
+c2hsLocal = simpleProgram "gtk2hsC2hs"
hunk ./cairo/Gtk2HsSetup.hs 376
- (flip mapM_) (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
+ forM_ (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
hunk ./cairo/Gtk2HsSetup.hs 397
- Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Nothing -> die "parsing output of pkg-config --modversion failed"
hunk ./cairo/Gtk2HsSetup.hs 462
- let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
+ let findImports acc (('{':'#':xs):xxs) = case (dropWhile (' ' ==) xs) of
hunk ./cairo/Gtk2HsSetup.hs 464
- case simpleParse (takeWhile ((/=) '#') ys) of
+ case simpleParse (takeWhile ('#' /=) ys) of
hunk ./cairo/Gtk2HsSetup.hs 490
+
+-- Check user whether install gtk2hs-buildtools correctly.
+checkGtk2hsBuildtools :: [String] -> IO ()
+checkGtk2hsBuildtools programs = do
+ programInfos <- mapM (\ name -> do
+ location <- programFindLocation (simpleProgram name) normal
+ return (name, location)
+ ) programs
+ let printError name = do
+ putStrLn $ "Cannot find " ++ name ++ "\n" [_$_]
+ ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
+ exitFailure
+ forM_ programInfos $ \ (name, location) ->
+ when (isNothing location) (printError name) [_$_]
hunk ./cairo/Setup.hs 4
-import Gtk2HsSetup ( gtk2hsUserHooks )
+import Gtk2HsSetup ( gtk2hsUserHooks, checkGtk2hsBuildtools )
hunk ./cairo/Setup.hs 7
-main = defaultMainWithHooks gtk2hsUserHooks
+main = do
+ checkGtk2hsBuildtools ["gtk2hsC2hs"]
+ defaultMainWithHooks gtk2hsUserHooks
+ [_$_]
}
|
|
From: Andy S. <And...@co...> - 2010-09-23 12:48:18
|
diffing dir...
Thu Sep 23 08:45:04 EDT 2010 Andy Stewart <laz...@gm...>
* Axel, your perfect Cabal soluction. :)
Ignore-this: 2e7eb16019a28e4d5a2c7e62062e2bfe
{
hunk ./gtk/Gtk2HsSetup.hs 494
- allExecuteFiles <- getAllExecuteFiles
- let c2hsName = [_$_]
-#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
- programName c2hsLocal ++ ".exe"
-#else
- programName c2hsLocal
-#endif
- typeProgramName = [_$_]
-#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
- programName typeGenProgram ++ ".exe"
-#else
- programName typeGenProgram
-#endif
- signalProgramName = [_$_]
-#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
- programName signalGenProgram ++ ".exe"
-#else
- programName signalGenProgram
-#endif
- printError name = do
+ c2hsPath <- (programFindLocation c2hsLocal) normal [_$_]
+ typePath <- (programFindLocation typeGenProgram) normal [_$_]
+ signalPath <- (programFindLocation signalGenProgram) normal [_$_]
+ let printError name = do
hunk ./gtk/Gtk2HsSetup.hs 499
- ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
+ ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
hunk ./gtk/Gtk2HsSetup.hs 501
- if c2hsName `notElem` allExecuteFiles
- then printError c2hsName
- else if typeProgramName `notElem` allExecuteFiles
- then printError typeProgramName
- else when (signalProgramName `notElem` allExecuteFiles) $
- printError signalProgramName
-
--- Get all execute files.
-getAllExecuteFiles :: IO [String]
-getAllExecuteFiles = do
- paths <- getSearchPath >>= filterM doesDirectoryExist
- liftM concat $ forM paths getDirectoryContents
+ if isNothing c2hsPath
+ then printError (programName c2hsLocal)
+ else if isNothing typePath
+ then printError (programName typeGenProgram)
+ else when (isNothing signalPath) $
+ printError (programName signalGenProgram)
}
|
|
From: Andy S. <And...@co...> - 2010-09-23 11:27:03
|
diffing dir...
Thu Sep 23 07:26:51 EDT 2010 Andy Stewart <laz...@gm...>
* Fix docs.
Ignore-this: 3e014b961ee633d031a7c728044bfa59
hunk ./gtk/Gtk2HsSetup.hs 514
- putStrLn $ "Cannot found " ++ name ++ "\n" [_$_]
+ putStrLn $ "Cannot find " ++ name ++ "\n" [_$_]
|
|
From: Andy S. <And...@co...> - 2010-09-23 09:43:40
|
diffing dir...
Thu Sep 23 05:42:03 EDT 2010 Andy Stewart <laz...@gm...>
* Support Windows (siracusa, please pull this patch and test again, thanks!)
Ignore-this: e81c1b74612cbb81695af5f56a4939a3
{
hunk ./gtk/Gtk2HsSetup.hs 495
- let c2hsName = programName c2hsLocal
- typeProgramName = programName typeGenProgram
- signalProgramName = programName signalGenProgram
+ let c2hsName = [_$_]
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+ programName c2hsLocal ++ ".exe"
+#else
+ programName c2hsLocal
+#endif
+ typeProgramName = [_$_]
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+ programName typeGenProgram ++ ".exe"
+#else
+ programName typeGenProgram
+#endif
+ signalProgramName = [_$_]
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+ programName signalGenProgram ++ ".exe"
+#else
+ programName signalGenProgram
+#endif
hunk ./gtk/Gtk2HsSetup.hs 514
- putStrLn $ "Can't found " ++ name ++ "\n" [_$_]
+ putStrLn $ "Cannot found " ++ name ++ "\n" [_$_]
}
|
|
From: Andy S. <And...@co...> - 2010-09-23 08:49:09
|
diffing dir...
Thu Sep 23 04:46:10 EDT 2010 Andy Stewart <laz...@gm...>
* Improve Gtk2hsHsSetup
Ignore-this: d26a56b752b4a0556bc05327efdb6b1e
{
hunk ./gtk/Gtk2HsSetup.hs 90
+import System.Exit (exitFailure)
hunk ./gtk/Gtk2HsSetup.hs 498
- printError name = [_$_]
- error $ "Can't found " ++ name ++ "\n" [_$_]
- ++ "Please install package `gtk2hs-buildtools` first, and make sure " ++ name ++ " in your PATH."
+ printError name = do
+ putStrLn $ "Can't found " ++ name ++ "\n" [_$_]
+ ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
+ exitFailure
hunk ./gtk/Gtk2HsSetup.hs 512
- paths <- getSearchPath >>= (filterM doesDirectoryExist)
+ paths <- getSearchPath >>= filterM doesDirectoryExist
}
|
|
From: Andy S. <And...@co...> - 2010-09-23 08:49:06
|
diffing dir...
Thu Sep 23 03:49:55 EDT 2010 Jens Petersen <pet...@ha...>
* filter getSearchPath for existing dirs in getAllExecuteFiles
Ignore-this: 797be0bea1b13a0f47eef8d45c2b85d7
{
hunk ./gtk/Gtk2HsSetup.hs 90
-import System.Directory ( doesFileExist, getDirectoryContents, getDirectoryContents, doesDirectoryExist )
+import System.Directory ( doesFileExist, getDirectoryContents, doesDirectoryExist )
hunk ./gtk/Gtk2HsSetup.hs 510
- paths <- getSearchPath
+ paths <- getSearchPath >>= (filterM doesDirectoryExist)
}
|
|
From: Andy S. <And...@co...> - 2010-09-23 08:49:04
|
diffing dir...
Thu Sep 23 03:30:37 EDT 2010 Jens Petersen <pet...@ha...>
* fix gtk build (import forM_ and indent when statement)
Ignore-this: f2fd9e0c9f9c7194a2a3ec0cc5ce86e3
{
hunk ./gtk/Gtk2HsSetup.hs 93
-import Control.Monad (when, unless, filterM, liftM, forM)
+import Control.Monad (when, unless, filterM, liftM, forM, forM_)
hunk ./gtk/Gtk2HsSetup.hs 504
- else when (signalProgramName `notElem` allExecuteFiles)
- printError signalProgramName
+ else when (signalProgramName `notElem` allExecuteFiles) $
+ printError signalProgramName
}
|
|
From: Andy S. <And...@co...> - 2010-09-23 05:57:43
|
diffing dir...
Thu Sep 23 01:54:37 EDT 2010 Andy Stewart <laz...@gm...>
* Improve Gtk2HsSetup.hs with hlint suggestions
Ignore-this: 10799b5c604c095f55c57fcf857661a7
{
hunk ./gtk/Gtk2HsSetup.hs 109
- confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ (fmap adjustLocalBuildInfo (confHook simpleUserHooks pd cf)),
hunk ./gtk/Gtk2HsSetup.hs 114
- (buildHook simpleUserHooks) pd lbi uh bf,
- copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
+ buildHook simpleUserHooks pd lbi uh bf,
+ copyHook = \pd lbi uh flags -> copyHook simpleUserHooks pd lbi uh flags >>
hunk ./gtk/Gtk2HsSetup.hs 304
- ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
+ ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"]
hunk ./gtk/Gtk2HsSetup.hs 314
- mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
- (map toFilePath
+ mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi] . toFilePath)
hunk ./gtk/Gtk2HsSetup.hs 320
- )
+ [_$_]
hunk ./gtk/Gtk2HsSetup.hs 336
-typeGenProgram = (simpleProgram "gtk2hsTypeGen")
+typeGenProgram = simpleProgram "gtk2hsTypeGen"
hunk ./gtk/Gtk2HsSetup.hs 339
-signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
+signalGenProgram = simpleProgram "gtk2hsHookGenerator"
hunk ./gtk/Gtk2HsSetup.hs 342
-c2hsLocal = (simpleProgram "gtk2hsC2hs")
+c2hsLocal = simpleProgram "gtk2hsC2hs"
hunk ./gtk/Gtk2HsSetup.hs 375
- (flip mapM_) (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
+ forM_ (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
hunk ./gtk/Gtk2HsSetup.hs 396
- Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Nothing -> die "parsing output of pkg-config --modversion failed"
hunk ./gtk/Gtk2HsSetup.hs 461
- let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
+ let findImports acc (('{':'#':xs):xxs) = case (dropWhile (' ' ==) xs) of
hunk ./gtk/Gtk2HsSetup.hs 463
- case simpleParse (takeWhile ((/=) '#') ys) of
+ case simpleParse (takeWhile ('#' /=) ys) of
hunk ./gtk/Gtk2HsSetup.hs 497
- printError name = do
+ printError name = [_$_]
hunk ./gtk/Gtk2HsSetup.hs 500
- if not (c2hsName `elem` allExecuteFiles)
+ if c2hsName `notElem` allExecuteFiles
hunk ./gtk/Gtk2HsSetup.hs 502
- else if not (typeProgramName `elem` allExecuteFiles)
+ else if typeProgramName `notElem` allExecuteFiles
hunk ./gtk/Gtk2HsSetup.hs 504
- else if not (signalProgramName `elem` allExecuteFiles)
- then printError signalProgramName
- else return ()
+ else when (signalProgramName `notElem` allExecuteFiles)
+ printError signalProgramName
}
|
|
From: Andy S. <And...@co...> - 2010-09-23 05:57:42
|
diffing dir...
Thu Sep 23 01:20:53 EDT 2010 Andy Stewart <laz...@gm...>
* Print better error when gtk2hs-buildtools not install correctly.
Ignore-this: b293e97486cd9f0bc51caf5946bb7056
{
hunk ./gtk/Gtk2HsSetup.hs 35
-module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where
+module Gtk2HsSetup ( [_$_]
+ gtk2hsUserHooks, [_$_]
+ getPkgConfigPackages, [_$_]
+ checkGtk2hsBuildtools
+ ) where
hunk ./gtk/Gtk2HsSetup.hs 72
- rawSystemProgramConf, rawSystemProgramStdoutConf,
+ rawSystemProgramConf, rawSystemProgramStdoutConf, programName,
hunk ./gtk/Gtk2HsSetup.hs 90
-import System.Directory ( doesFileExist )
+import System.Directory ( doesFileExist, getDirectoryContents, getDirectoryContents, doesDirectoryExist )
hunk ./gtk/Gtk2HsSetup.hs 93
-import Control.Monad (when, unless, filterM)
+import Control.Monad (when, unless, filterM, liftM, forM)
hunk ./gtk/Gtk2HsSetup.hs 101
-import System.Directory (getDirectoryContents, doesDirectoryExist)
hunk ./gtk/Gtk2HsSetup.hs 490
+
+-- Check user whether install gtk2hs-buildtools correctly.
+checkGtk2hsBuildtools :: IO ()
+checkGtk2hsBuildtools = do
+ allExecuteFiles <- getAllExecuteFiles
+ let c2hsName = programName c2hsLocal
+ typeProgramName = programName typeGenProgram
+ signalProgramName = programName signalGenProgram
+ printError name = do
+ error $ "Can't found " ++ name ++ "\n" [_$_]
+ ++ "Please install package `gtk2hs-buildtools` first, and make sure " ++ name ++ " in your PATH."
+ if not (c2hsName `elem` allExecuteFiles)
+ then printError c2hsName
+ else if not (typeProgramName `elem` allExecuteFiles)
+ then printError typeProgramName
+ else if not (signalProgramName `elem` allExecuteFiles)
+ then printError signalProgramName
+ else return ()
+
+-- Get all execute files.
+getAllExecuteFiles :: IO [String]
+getAllExecuteFiles = do
+ paths <- getSearchPath
+ liftM concat $ forM paths getDirectoryContents
hunk ./gtk/Setup.hs 4
-import Gtk2HsSetup ( gtk2hsUserHooks )
+import Gtk2HsSetup ( gtk2hsUserHooks, checkGtk2hsBuildtools )
hunk ./gtk/Setup.hs 7
-main = defaultMainWithHooks gtk2hsUserHooks
+main = do
+ checkGtk2hsBuildtools
+ defaultMainWithHooks gtk2hsUserHooks
+ [_$_]
}
|
2 messages has been excluded from this view by a project administrator.
