Ruurd has changed the invocation of system() under DOS to:
system("start /min <command>");
from
system("start /min/n <command>");
Ruurd, what's the reason for this? Is it just a typo in the original
code?
Angus
Index: src/support/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v
retrieving revision 1.149.2.11
diff -u -p -r1.149.2.11 ChangeLog
--- src/support/ChangeLog 14 Dec 2004 10:40:09 -0000 1.149.2.11
+++ src/support/ChangeLog 14 Dec 2004 12:10:13 -0000
@@ -1,5 +1,12 @@
2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+ * os.C: Add _WIN32 to the #define.
+
+ * systemcall.C (startscript): remove trailing '/n' from request to
+ start the command in a minimized window under DOS.
+
+2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+
* Makefile.am (INCLUDES): Remove trailing slash from -Ifoo/
to overcome bug in the MinGW port of g++ 3.4.2.
Index: src/support/os.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/os.C,v
retrieving revision 1.3.2.1
diff -u -p -r1.3.2.1 os.C
--- src/support/os.C 7 Dec 2004 10:50:09 -0000 1.3.2.1
+++ src/support/os.C 14 Dec 2004 12:10:13 -0000
@@ -2,7 +2,7 @@
#ifdef __EMX__
#include "os_os2.C"
-#elif defined(__CYGWIN__) || defined(__CYGWIN32__)
+#elif defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(_WIN32)
#include "os_win32.C"
#else
#include "os_unix.C"
Index: src/support/systemcall.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/systemcall.C,v
retrieving revision 1.4.2.1
diff -u -p -r1.4.2.1 systemcall.C
--- src/support/systemcall.C 7 Dec 2004 10:50:09 -0000 1.4.2.1
+++ src/support/systemcall.C 14 Dec 2004 12:10:13 -0000
@@ -28,10 +28,13 @@ int Systemcall::startscript(Starttype ho
string command = what;
if (how == DontWait) {
- if (os::shell() == os::UNIX) {
+ switch (os::shell()) {
+ case os::UNIX:
command += " &";
- } else {
- command = "start /min/n " + command;
+ break;
+ case os::CMD_EXE:
+ command = "start /min " + command;
+ break;
}
}
? src/support/lyxlib-orig.C
? src/support/lyxlib.C
Index: src/support/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v
retrieving revision 1.280
diff -u -p -r1.280 ChangeLog
--- src/support/ChangeLog 14 Dec 2004 10:41:08 -0000 1.280
+++ src/support/ChangeLog 14 Dec 2004 12:10:45 -0000
@@ -1,5 +1,12 @@
2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+ * os.C: Add _WIN32 to the #define.
+
+ * systemcall.C (startscript): remove trailing '/n' from request to
+ start the command in a minimized window under DOS.
+
+2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+
* Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/
to overcome bug in the MinGW port of g++ 3.4.2.
Index: src/support/os.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/os.C,v
retrieving revision 1.6
diff -u -p -r1.6 os.C
--- src/support/os.C 23 Aug 2003 00:16:57 -0000 1.6
+++ src/support/os.C 14 Dec 2004 12:10:45 -0000
@@ -12,7 +12,7 @@
#ifdef __EMX__
#include "os_os2.C"
-#elif defined(__CYGWIN__) || defined(__CYGWIN32__)
+#elif defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(_WIN32)
#include "os_win32.C"
#else
#include "os_unix.C"
Index: src/support/systemcall.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/systemcall.C,v
retrieving revision 1.9
diff -u -p -r1.9 systemcall.C
--- src/support/systemcall.C 7 Nov 2004 13:22:51 -0000 1.9
+++ src/support/systemcall.C 14 Dec 2004 12:10:45 -0000
@@ -33,10 +33,13 @@ int Systemcall::startscript(Starttype ho
string command = what;
if (how == DontWait) {
- if (os::shell() == os::UNIX) {
+ switch (os::shell()) {
+ case os::UNIX:
command += " &";
- } else {
- command = "start /min/n " + command;
+ break;
+ case os::CMD_EXE:
+ command = "start /min " + command;
+ break;
}
}
