Ethereal-dev: Re: [Ethereal-dev] patch: make -j 4 in help/ fails

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Ulf Lamping <ulf.lamping@xxxxxx>
Date: Tue, 16 Dec 2003 07:21:12 +0100
Jeff Morriss wrote:


"make -j 4" (on a 4 CPU machine) fails in the "help/" directory--it complains about non-existent files.

Here's a patch which fixes it by making the names of temporary files unique to the build target (so there's no collissions if there's a parallel build going on).

Please consider for inclusion.

------------------------------------------------------------------------

Index: help/convert-include.sh
===================================================================
RCS file: /cvsroot/ethereal/help/convert-include.sh,v
retrieving revision 1.1
diff -u -r1.1 convert-include.sh
--- help/convert-include.sh	18 Nov 2003 23:11:48 -0000	1.1
+++ help/convert-include.sh	15 Dec 2003 20:16:52 -0000
@@ -14,12 +14,12 @@
LINECOUNT=400

# Create an #include'able version of this file
-rm -f $1.h MAKETMP*
-split -l $LINECOUNT $1.txt MAKETMP
+rm -f $1.h $1_tmp*
+split -l $LINECOUNT $1.txt $1_tmp
NUM=0
echo "/* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY!!! */" >>$1.h
echo "const char *$1_part[] = {" >>$1.h
-for i in MAKETMP*; do
+for i in $1_tmp*; do
   if [ $NUM -ne 0 ]; then
      echo "," >>$1.h
      echo >>$1.h
@@ -34,6 +34,6 @@
SIZE=`wc -c $1.txt | tr -d ' A-Za-z._-'`
NAME_UPPER_SIZE=`echo $1_SIZE | tr '[:lower:]' '[:upper:]'`
echo "#define $NAME_UPPER_SIZE $SIZE" >>$1.h
-rm -f MAKETMP*
+rm -f $1_tmp*

exit 0
------------------------------------------------------------------------

_______________________________________________
Ethereal-dev mailing list
Ethereal-dev@xxxxxxxxxxxx
http://www.ethereal.com/mailman/listinfo/ethereal-dev
This patch sounds reasonable. I will patch it later today, and check it in.

Regards, ULFL