bug 944; VCS+insetinclude fix; ispell compile fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@6536 a592a061-630c-0410-9148-cb99ea01b6c8

src/ChangeLog

@@ -1,3 +1,7 @@
+2003-03-19  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* ispell.C: add an include for <sys/time.h>
+
 2003-03-17  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* version.C.in: update for 1.3.1

src/frontends/xforms/ChangeLog

@@ -1,3 +1,9 @@
+2003-03-13  Angus Leeming  <leeming@lyx.org>
+
+	* forms/fdfix.sh: 
+	* forms/fdfixh.sed: fix #944 by making the temporary filenames unique
+	and so enable reentrant builds on SMP machines.
+
 2003-02-17  John Levon  <levon@movementarian.org>
 
 	* FormSpellchecker.h:

src/frontends/xforms/forms/fdfix.sh

@@ -15,13 +15,17 @@
 
 INTRO_MESSAGE ()
 {
+test $# -eq 1 || {
+	echo "Expected a file name!"
+	exit 1
+}
+
 # Note that we can't create a variable containing this and then
 # echo it across because some machines require -e to recognize \n et al.
 # Other machines, of course output -e, it not being an option they
 # recognise ;-)
 
-# Set ${OUTPUT_FILE} to ${HOUT} or ${COUT} as appropriate
-cat - > ${OUTPUT_FILE} <<EOF
+cat - > $1 <<EOF
 // File generated by fdesign from ${FDFILE}
 // and modified by fdfix.sh for use by LyX.
 
@@ -69,23 +73,30 @@ HOUT=${BASENAME}.hpp
 # put the sorted, unique list in file ${EXTERN_FUNCS}
 # The contents of this file are used by ${FDFIXH} to replace the mess
 # output by fdesign
-EXTERN_FUNCS=extern.tmp
+# Note that we use unique file names for temp files to enable re-entrant
+# builds with SMP machines
+EXTERN_FUNCS=extern.$$
 sed -n 's/extern void \(.*\)/void \1/p' ${HIN} > ${EXTERN_FUNCS}
 
 if [ -s ${EXTERN_FUNCS} ]; then
-	sort -u ${EXTERN_FUNCS} > tmp
+	TMP=tmp.$$
+	sort -u ${EXTERN_FUNCS} > ${TMP}
 	echo "extern \"C\" {" > ${EXTERN_FUNCS}
-	cat tmp >> ${EXTERN_FUNCS}
+	cat ${TMP} >> ${EXTERN_FUNCS}
 	echo "}" >> ${EXTERN_FUNCS}
-	rm -f tmp
+	rm -f ${TMP}
 fi
 
-FDFIXH=${DIRNAME}/fdfixh.sed
+# First ensure that the sed script knows where to find ${EXTERN_FUNCS}
+FDFIXH=fdfixh.$$
+sed "s/EXTERN_FUNCS/${EXTERN_FUNCS}/" ${DIRNAME}/fdfixh.sed > ${FDFIXH}
 
-OUTPUT_FILE=${HOUT}; INTRO_MESSAGE
+INTRO_MESSAGE ${HOUT}
 
 sed -f ${FDFIXH} < ${HIN} >> ${HOUT}
-rm -f ${EXTERN_FUNCS}
+
+# Don't forget to clean up the temporary files.
+rm -f ${EXTERN_FUNCS} ${FDFIXH}
 
 # Patch the .h file if a patch exists
 if [ -f "${HPATCH}" ] ; then
@@ -122,8 +133,9 @@ FINAL_COUT=${BASENAME}.C
 
 # Pass 1. The bulk of the clean-up
 FDFIXC=${DIRNAME}/fdfixc.sed
-TMP=tmp
-OUTPUT_FILE=${TMP}; INTRO_MESSAGE
+
+TMP=tmp.$$
+INTRO_MESSAGE ${TMP}
 
 echo "#include <config.h>" >> ${TMP}
 echo "#include \"forms_gettext.h\"" >> ${TMP}

src/frontends/xforms/forms/fdfixh.sed

@@ -29,14 +29,15 @@ s/[ 	]*$//
 
 
 # Immediately after line "#define FD_xxx_h_" that starts off the header file,
-# #include "fdesign_base.h" and append the contents of file "extern.tmp".
+# #include "fdesign_base.h" and append the contents of file EXTERN_FUNCS.
 # This latter is a sorted, unique list of any function declarations.
+# The actual name of the file is inserted by the parent shell script.
 /#define FD/{
 a\
 \
 #include "fdesign_base.h"\
 
-r extern.tmp
+r EXTERN_FUNCS
 }
 
 

src/insets/ChangeLog

@@ -1,3 +1,8 @@
+2003-01-27  Allan Rae  <rae@lyx.org>
+
+	* insetinclude.C (loadIfNeeded): included files might be under
+	VCS control so we need loadLyXFile() not readFile() for that.
+
 2003-02-25  John Levon  <levon@movementarian.org>
 
 	* insetgraphicsParams.h:
@@ -13,7 +18,8 @@
 	* insetert.C:
 	* insetgraphics.C:
 	* insettabular.C:
-	* insettext.C: Use error messages with identical spelling and punctuation
+	* insettext.C: Use error messages with identical spelling and
+	punctuation
 
 2003-01-12  Michael Schmitt <michael.schmitt@teststep.org>
 
@@ -26,8 +32,8 @@
 
 2003-01-06  Michael Schmitt <Michael.Schmitt@teststep.org>
 
-	* insettext.C: fix inconsistent usage of spaces, colons, capitalization,
-	and the like.
+	* insettext.C: fix inconsistent usage of spaces, colons,
+	capitalization, and the like.
 
 2002-12-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 

src/insets/insetinclude.C

@@ -274,7 +274,7 @@ bool InsetInclude::loadIfNeeded() const
 	if (!finfo.isOK())
 		return false;
 
-	return bufferlist.readFile(getFileName(), !finfo.writable()) != 0;
+ 	return bufferlist.loadLyXFile(getFileName(), false) != 0;
 }
 
 

src/ispell.C

@@ -26,6 +26,7 @@
 #include "support/lstrings.h"
 
 #include <sys/select.h>
+#include <sys/time.h>
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strcpy;

status.13x

@@ -38,3 +38,7 @@ What's new
 
 ** Bug fixes
 
+- fix loading of included files that are under revision control
+
+- fix building of xforms dialogs' source on SMP machines [Bug #944,
+  xforms only]