[commit: packages/process] new-flags-no-f3df9d6: Revert f3df9d6 (0ad09da)
git at git.haskell.org
git at git.haskell.org
Mon Nov 2 06:23:53 UTC 2015
Repository : ssh://git@git.haskell.org/process
On branch : new-flags-no-f3df9d6
Link : http://ghc.haskell.org/trac/ghc/changeset/0ad09da8e194369e4704b46a1865bbbb2cba2cfb/process
>---------------------------------------------------------------
commit 0ad09da8e194369e4704b46a1865bbbb2cba2cfb
Author: Michael Snoyman <michael at snoyman.com>
Date: Mon Aug 24 20:07:25 2015 +0300
Revert f3df9d6
>---------------------------------------------------------------
0ad09da8e194369e4704b46a1865bbbb2cba2cfb
System/Process.hsc | 2 --
System/Process/Internals.hs | 9 ---------
cbits/runProcess.c | 3 ---
changelog.md | 1 -
include/processFlags.h | 1 -
test/main.hs | 1 -
6 files changed, 17 deletions(-)
diff --git a/System/Process.hsc b/System/Process.hsc
index 144daf8..1d1bcd9 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -125,7 +125,6 @@ proc cmd args = CreateProcess { cmdspec = RawCommand cmd args,
create_group = False,
delegate_ctlc = False,
detach_console = False,
- create_new_console = False,
new_session = False }
-- | Construct a 'CreateProcess' record for passing to 'createProcess',
@@ -141,7 +140,6 @@ shell str = CreateProcess { cmdspec = ShellCommand str,
create_group = False,
delegate_ctlc = False,
detach_console = False,
- create_new_console = False,
new_session = False }
{- |
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index cfe34ef..aeb8425 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -185,11 +185,6 @@ data CreateProcess = CreateProcess{
detach_console :: Bool, -- ^ Use the windows DETACHED_PROCESS flag when creating the process; does nothing on other platforms.
--
-- /Since: 1.3.0.0/
- create_new_console :: Bool, -- ^ Use the windows CREATE_NEW_CONSOLE flag when creating the process; does nothing on other platforms.
- --
- -- Default: @False@
- --
- -- /Since: 1.3.0.0/
new_session :: Bool -- ^ Use posix setsid to start the new process in a new session; does nothing on other platforms.
--
-- /Since: 1.3.0.0/
@@ -272,7 +267,6 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
create_group = mb_create_group,
delegate_ctlc = mb_delegate_ctlc,
detach_console = mb_detach_console,
- create_new_console = mb_create_new_console,
new_session = mb_new_session }
= do
let (cmd,args) = commandToProcess cmdsp
@@ -305,7 +299,6 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
.|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
.|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0)
- .|.(if mb_create_new_console then RUN_PROCESS_NEW_CONSOLE else 0)
.|.(if mb_new_session then RUN_PROCESS_NEW_SESSION else 0))
pFailedDoing
@@ -439,7 +432,6 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
create_group = mb_create_group,
delegate_ctlc = _ignored,
detach_console = mb_detach_console,
- create_new_console = mb_create_new_console,
new_session = mb_new_session }
= do
(cmd, cmdline) <- commandToProcess cmdsp
@@ -473,7 +465,6 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
.|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
.|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0)
- .|.(if mb_create_new_console then RUN_PROCESS_NEW_CONSOLE else 0)
.|.(if mb_new_session then RUN_PROCESS_NEW_SESSION else 0))
hndStdInput <- mbPipe mb_stdin pfdStdInput WriteMode
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index 8019605..61fdd58 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -571,9 +571,6 @@ runInteractiveProcess (wchar_t *cmd, wchar_t *workingDirectory,
if ((flags & RUN_PROCESS_DETACHED) != 0) {
dwFlags |= DETACHED_PROCESS;
}
- if ((flags & RUN_PROCESS_NEW_CONSOLE) != 0) {
- dwFlags |= CREATE_NEW_CONSOLE;
- }
if (!CreateProcess(NULL, cmd, NULL, NULL, inherit, dwFlags, environment, workingDirectory, &sInfo, &pInfo))
{
diff --git a/changelog.md b/changelog.md
index d19ee0b..4b7c32f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,7 +4,6 @@
* Add StdStream(NoStream) to have standard handles closed. [#13](https://github.com/haskell/process/pull/13)
* Support for Windows `DETACHED_PROCESS` and `setsid` [#32](https://github.com/haskell/process/issues/32)
-* Support for Windows `CREATE_NEW_CONSOLE` [#38](https://github.com/haskell/process/issues/38)
## 1.2.3.0 *March 2015*
diff --git a/include/processFlags.h b/include/processFlags.h
index b0cd1ec..9de6a10 100644
--- a/include/processFlags.h
+++ b/include/processFlags.h
@@ -8,4 +8,3 @@
#define RUN_PROCESS_IN_NEW_GROUP 0x2
#define RUN_PROCESS_DETACHED 0x4
#define RUN_PROCESS_NEW_SESSION 0x8
-#define RUN_PROCESS_NEW_CONSOLE 0x16
diff --git a/test/main.hs b/test/main.hs
index 40558b2..f89a3ec 100644
--- a/test/main.hs
+++ b/test/main.hs
@@ -24,7 +24,6 @@ main = do
else error $ "echo returned: " ++ show ec
test "detach_console" $ \cp -> cp { detach_console = True }
- test "create_new_console" $ \cp -> cp { create_new_console = True }
test "new_session" $ \cp -> cp { new_session = True }
putStrLn "Tests passed successfully"
More information about the ghc-commits
mailing list