Fix bug 3220

* src/insets/ExternalSupport.C
	(updateExternal): Avoid computing crc of a directory as this leads
	to a crash on Cygwin.

	* lib/configure.py:
	Use a python script to get the current date in order to avoid
	a stalling condition with the date command on Win32.

	* lib/scripts/date.py:
	New python script.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17168 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2007-02-13 19:09:54 +00:00
parent a4f3aa748e
commit 1b21743511
3 changed files with 39 additions and 2 deletions

View File

@ -451,7 +451,7 @@ def checkConverterEntries():
# #
# Entried that do not need checkProg # Entried that do not need checkProg
addToRC(r'''\converter lyxpreview ppm "python -tt $$s/scripts/lyxpreview2bitmap.py" "" addToRC(r'''\converter lyxpreview ppm "python -tt $$s/scripts/lyxpreview2bitmap.py" ""
\converter date dateout "date +%d-%m-%Y > $$o" "" \converter date dateout "python -tt $$s/scripts/date.py %d-%m-%Y > $$o" ""
\converter docbook docbook-xml "cp $$i $$o" "xml" \converter docbook docbook-xml "cp $$i $$o" "xml"
\converter fen asciichess "python -tt $$s/scripts/fen2ascii.py $$i $$o" "" \converter fen asciichess "python -tt $$s/scripts/fen2ascii.py $$i $$o" ""
\converter fig pdftex "python -tt $$s/scripts/fig2pdftex.py $$i $$o" "" \converter fig pdftex "python -tt $$s/scripts/fig2pdftex.py $$i $$o" ""

33
lib/scripts/date.py Executable file
View File

@ -0,0 +1,33 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# file date.py
# This file is part of LyX, the document processor.
# Licence details can be found in the file COPYING.
# \author Enrico Forestieri
# Full author contact details are available in file CREDITS.
# Print the system date and time in the given format. See the python
# documentation for available formats (mostly the same as the POSIX std).
# This file is provided because the date command on Windows is not
# POSIX compliant.
import sys
from time import strftime
def main(argv):
if len(argv) > 2:
sys.stderr.write('Usage: python date.py [<format>]\n')
sys.exit(1)
if len(argv) == 2:
format = argv[1]
else:
format = "%d-%m-%Y"
print strftime(format)
if __name__ == "__main__":
main(sys.argv)

View File

@ -31,10 +31,14 @@
#include "support/os.h" #include "support/os.h"
#include "support/package.h" #include "support/package.h"
#include <boost/filesystem/operations.hpp>
using std::endl; using std::endl;
using std::string; using std::string;
using std::vector; using std::vector;
using boost::filesystem::is_directory;
namespace lyx { namespace lyx {
@ -247,7 +251,7 @@ void updateExternal(InsetExternalParams const & params,
FileName const temp_file( FileName const temp_file(
support::makeAbsPath(params.filename.mangledFilename(), support::makeAbsPath(params.filename.mangledFilename(),
m_buffer->temppath())); m_buffer->temppath()));
if (!params.filename.empty()) { if (!params.filename.empty() && !is_directory(params.filename.toFilesystemEncoding())) {
unsigned long const from_checksum = support::sum(params.filename); unsigned long const from_checksum = support::sum(params.filename);
unsigned long const temp_checksum = support::sum(temp_file); unsigned long const temp_checksum = support::sum(temp_file);