Author: forenr
Date: Wed May 4 15:40:17 2011
New Revision: 38581
URL: http://www.lyx.org/trac/changeset/38581
Log:
See r37176. Let's keep this a Windows only "feature".
Something went wrong with a script while previewing a document and now
I have to wait for 30 minutes for quitting LyX without killing it.
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/support/Systemcall.cpp
lyx-devel/branches/BRANCH_2_0_X/src/support/os.h
lyx-devel/branches/BRANCH_2_0_X/src/support/os_cygwin.cpp
lyx-devel/branches/BRANCH_2_0_X/src/support/os_unix.cpp
lyx-devel/branches/BRANCH_2_0_X/src/support/os_win32.cpp
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/support/Systemcall.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/support/Systemcall.cpp Wed May 4
15:07:32 2011 (r38580)
+++ lyx-devel/branches/BRANCH_2_0_X/src/support/Systemcall.cpp Wed May 4
15:40:17 2011 (r38581)
@@ -225,8 +225,8 @@
return 0;
}
- int timeout_min = 30;
- if (!d.waitWhile(SystemcallPrivate::Running, process_events,
timeout_min * 60 * 1000)) {
+ if (!d.waitWhile(SystemcallPrivate::Running, process_events,
+ os::timeout_min() * 60 * 1000)) {
LYXERR0("Systemcall: '" << cmd << "' did not finish!");
LYXERR0("error " << d.errorMessage());
LYXERR0("status " << d.exitStatusMessage());
Modified: lyx-devel/branches/BRANCH_2_0_X/src/support/os.h
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/support/os.h Wed May 4 15:07:32
2011 (r38580)
+++ lyx-devel/branches/BRANCH_2_0_X/src/support/os.h Wed May 4 15:40:17
2011 (r38581)
@@ -55,6 +55,9 @@
///
shell_type shell();
+/// Returns no. of minutes allowed for a command to complete.
+int timeout_min();
+
/// Name of the python interpreter
std::string const python();
Modified: lyx-devel/branches/BRANCH_2_0_X/src/support/os_cygwin.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/support/os_cygwin.cpp Wed May 4
15:07:32 2011 (r38580)
+++ lyx-devel/branches/BRANCH_2_0_X/src/support/os_cygwin.cpp Wed May 4
15:40:17 2011 (r38581)
@@ -381,6 +381,12 @@
}
+int timeout_min()
+{
+ return 3;
+}
+
+
char path_separator()
{
return ':';
Modified: lyx-devel/branches/BRANCH_2_0_X/src/support/os_unix.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/support/os_unix.cpp Wed May 4
15:07:32 2011 (r38580)
+++ lyx-devel/branches/BRANCH_2_0_X/src/support/os_unix.cpp Wed May 4
15:40:17 2011 (r38581)
@@ -212,6 +212,12 @@
}
+int timeout_min()
+{
+ return 3;
+}
+
+
char path_separator()
{
return ':';
Modified: lyx-devel/branches/BRANCH_2_0_X/src/support/os_win32.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/support/os_win32.cpp Wed May 4
15:07:32 2011 (r38580)
+++ lyx-devel/branches/BRANCH_2_0_X/src/support/os_win32.cpp Wed May 4
15:40:17 2011 (r38581)
@@ -423,6 +423,12 @@
}
+int timeout_min()
+{
+ return 30;
+}
+
+
char path_separator()
{
return ';';
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Wed May 4 15:07:32 2011
(r38580)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Wed May 4 15:40:17 2011
(r38581)
@@ -24,6 +24,9 @@
* DOCUMENT INPUT/OUTPUT
+- Allow for a maximum of 3 minutes for the completion of a spawned command
+ except on Windows, were 30 minutes are allowed. This is bacause the Windows
+ installer may trigger MiKTeX updates that suffer from network latencies.
* USER INTERFACE
