[cvs pull ijones@syntaxpolice.org**20050222015737 krasimir: {un}register.bat ross: small doc fixes, and {un}register.bat docs added verbosity to defaultUserHooks ] { hunk ./Distribution/Simple/Register.hs 57 +#if __GLASGOW_HASKELL__ +#if __GLASGOW_HASKELL__ < 603 +#include "config.h" +#else +#include "ghcconfig.h" +#endif +#endif + hunk ./Distribution/Simple/Register.hs 98 +#ifdef mingw32_TARGET_OS +regScriptLocation = "register.bat" +#else hunk ./Distribution/Simple/Register.hs 102 +#endif hunk ./Distribution/Simple/Register.hs 105 +#ifdef mingw32_TARGET_OS +unregScriptLocation = "unregister.bat" +#else hunk ./Distribution/Simple/Register.hs 109 +#endif hunk ./Distribution/Simple/Register.hs 154 - | ghc_63_plus = ["update", installedPkgConfigFile] + | ghc_63_plus = "update": +#ifndef mingw32_TARGET_OS + if genScript + then [] + else +#endif + [installedPkgConfigFile] hunk ./Distribution/Simple/Register.hs 162 +#ifndef mingw32_TARGET_OS hunk ./Distribution/Simple/Register.hs 165 - else ["--input-file="++installedPkgConfigFile] + else +#endif + ["--input-file="++installedPkgConfigFile] hunk ./Distribution/Simple/Register.hs 297 +#ifdef mingw32_TARGET_OS + writeFile scriptName ("@" ++ path ++ concatMap (' ':) args) +#else hunk ./Distribution/Simple/Register.hs 303 - putStrLn (path ++ concatMap (' ':) args) hunk ./Distribution/Simple/Register.hs 305 +#endif hunk ./Distribution/Simple/Register.hs 315 +#ifdef mingw32_TARGET_OS + writeFile scriptName ("@" ++ path ++ concatMap (' ':) args) +#else hunk ./Distribution/Simple/Register.hs 320 - ++ "' |" + ++ "' | " hunk ./Distribution/Simple/Register.hs 325 +#endif hunk ./Distribution/Simple.hs 424 - preBuild = readHook, - preClean = readHook, - preCopy = readHook, - preInst = readHook, - preSDist = readHook, - preReg = readHook, - preUnreg = readHook + preBuild = readHook id, + preClean = readHook id, + preCopy = readHook snd, + preInst = readHook snd, + preSDist = readHook id, + preReg = readHook thd3, + preUnreg = readHook thd3 hunk ./Distribution/Simple.hs 438 - rawSystem "sh" + rawSystemVerbose (configVerbose flags) "sh" hunk ./Distribution/Simple.hs 445 - readHook :: Args -> a -> IO HookedBuildInfo - readHook a _ = do + readHook :: (a -> Int) -> Args -> a -> IO HookedBuildInfo + readHook verbose a flags = do hunk ./Distribution/Simple.hs 451 - Just infoFile -> readHookedBuildInfo infoFile + Just infoFile -> do + when (verbose flags > 0) $ + putStrLn $ "Reading parameters from " ++ infoFile + readHookedBuildInfo infoFile + + thd3 (_,_,z) = z hunk ./TODO 4 +* Install libraries in $libdir/ghc-$ghc_version/ rather than $libdir. + hunk ./doc/Cabal.xml 12 - Common Architecture for Building Applications and Tools + Common Architecture for Building Applications and Libraries hunk ./doc/Cabal.xml 197 - The package description file should have a name - ending in .cabal, and contain several - stanzas separated by blank lines. + + The package description file should have a name ending in + .cabal. There must be exactly + one such file in the directory, and the first part of the name is + immaterial, but it is conventional to use the package name. + + This file should contain several + stanzas separated by blank lines. hunk ./doc/Cabal.xml 238 - characters, or a quoted string in Haskell 98 lexical - syntax. + characters, or a quoted string in Haskell 98 lexical syntax. + Unless otherwise stated, relative filenames and directories + are interpreted from the package root directory. hunk ./doc/Cabal.xml 554 - The name of root directory of the module - hierarchy, relative to the package root + The name of root directory of the module hierarchy hunk ./doc/Cabal.xml 632 - A list of header files, typically + A list of header files from standard include directories + or those listed in include-dirs, typically hunk ./doc/Cabal.xml 758 - If the file + If the package root directory contains a file called hunk ./doc/Cabal.xml 760 - exists after the configuration step, subsequent steps will read - it to obtain additional settings for build information fields + after the configuration step, subsequent steps will read it + to obtain additional settings for build information fields hunk ./doc/Cabal.xml 979 - in the uninstall procedure of the package. There is not yet a - similar procedure for creating Windows installer packages. + in the uninstall procedure of the package. Similar steps may + be used for creating binary backages for Windows. hunk ./doc/Cabal.xml 1226 - register.sh containing commands to - perform the register step. This file might be included - in a binary bundle, to be run after the bundle is unpacked - on the target system. + containing commands to perform the registration. On Unix, + this file is called register.sh, on + Windows, register.bat. This script + might be included in a binary bundle, to be run after the + bundle is unpacked on the target system. hunk ./doc/Cabal.xml 1263 - unregister.sh containing commands to - perform the unregister step. This file might be included - in a binary bundle, to be run on the target system. + containing commands to perform the deregistration. On Unix, + this file is called unregister.sh, on + Windows, unregister.bat. This script + might be included in a binary bundle, to be run on the + target system. hunk ./doc/Cabal.xml 1301 + + + + The scheme described in + will not work on Windows without MSYS or Cygwin. }