From d03bfb7355d11e271664d4dea51449f8f5059780 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 12 Nov 2013 14:54:02 -0400 Subject: build assistant and watcher on windows (doesn't work yet) --- Assistant.hs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Assistant.hs') diff --git a/Assistant.hs b/Assistant.hs index 781089e06..3c434438d 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -69,6 +69,7 @@ startDaemon assistant foreground startdelay listenhost startbrowser = do pidfile <- fromRepo gitAnnexPidFile logfile <- fromRepo gitAnnexLogFile logfd <- liftIO $ openLog logfile +#ifndef mingw32_HOST_OS if foreground then do origout <- liftIO $ catchMaybeIO $ @@ -86,6 +87,13 @@ startDaemon assistant foreground startdelay listenhost startbrowser = do Just a -> Just $ a origout origerr else start (Utility.Daemon.daemonize logfd (Just pidfile) False) Nothing +#else + -- Windows is always foreground, and has no log file. + start id $ + case startbrowser of + Nothing -> Nothing + Just a -> Just $ a Nothing Nothing +#endif where desc | assistant = "assistant" @@ -99,7 +107,6 @@ startDaemon assistant foreground startdelay listenhost startbrowser = do flip runAssistant (go webappwaiter) =<< newAssistantData st dstatus - #ifdef WITH_WEBAPP go webappwaiter = do d <- getAssistant id -- cgit v1.2.3