Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

1 files changed, 7 insertions, 126 deletions

diff --git a/dist/s_vxworks b/dist/s_vxworks
index a98cb85b..66a9adb4 100755
--- a/dist/s_vxworks
+++ b/dist/s_vxworks
@@ -23,7 +23,6 @@ n
 n
 i\\
 \\
-/* Tornado 2 does not provide a standard C pre-processor #define. */\\
 #ifndef __vxworks\\
 #define	__vxworks\\
 #endif
@@ -45,14 +44,15 @@ s/@u_int64_decl@/typedef unsigned long long u_int64_t;/
 /@u_long_decl@/d
 /@u_short_decl@/d
 s/@uintmax_t_decl@/typedef unsigned long uintmax_t;/
-s/@uintptr_t_decl@/typedef unsigned long uintptr_t;/
+/@uintptr_t_decl@/d
 /@FILE_t_decl@/d
 /@off_t_decl@/d
+s/@db_off_t_decl@/typedef int64_t db_off_t;/
 /@pid_t_decl@/d
 /@size_t_decl@/d
 /@ssize_t_decl@/d
 /@time_t_decl@/d
-s/@db_seq_decl@/typedef int db_seq_t;/
+s/@db_seq_decl@/typedef int64_t db_seq_t;/
 s/@db_threadid_t_decl@/typedef uintmax_t db_threadid_t;/
 s/@DB_VERSION_FAMILY@/$DB_VERSION_FAMILY/
 s/@DB_VERSION_RELEASE@/$DB_VERSION_RELEASE/
@@ -368,128 +368,6 @@ util_one()
 	echo "<END>"
 }
 
-# Build VxWorks Tornado 2.0 project files for the utilities.
-for i in $PROGRAM_LIST; do
-	case $i in
-	ex_access)
-		target=dbdemo
-		outdir=dbdemo
-		;;
-	db_*)
-		target=$i
-		outdir=util
-		;;
-	test_micro)
-		target=$i
-		outdir=test/micro
-		;;
-	*)
-		target=$i
-		outdir=$i
-		;;
-	esac
-
-	(sed -e "s/__DB_APPLICATION_NAME__/$target/g" < vx_2.0/wpj.in
-	    util_one $i) > $t
-	f=../build_vxworks/$outdir/${target}20.wpj
-	cmp $t $f > /dev/null 2>&1 ||
-	    (echo "Building $f" && rm -f $f && cp $t $f)
-
-	(sed -e "s/__DB_APPLICATION_NAME__/$target/g" < vx_2.2/wpj.in
-	    util_one $i) > $t
-	f=../build_vxworks/$outdir/${target}22.wpj
-	cmp $t $f > /dev/null 2>&1 ||
-	    (echo "Building $f" && rm -f $f && cp $t $f)
-done
-
-# Build the list of "normal build" files VxWorks knows about.
-sed -e '/^$/d' -e '/^[	 #]/d' srcfiles.in |
-    egrep -w vx |
-    sed 's/[	 ].*//' > $vxfilelist
-
-# Build the list of "small build" files VxWorks knows about.
-sed -e '/^$/d' -e '/^[	 #]/d' srcfiles.in |
-    egrep -w vxsmall |
-    sed 's/[	 ].*//' > $vxsmallfiles
-
-# Build VxWorks Tornado 2.0 project files for the library itself.
-for v in 0 2 ; do
-	#
-	# Build regular project files
-	#
-	(cat vx_2.${v}/BerkeleyDB.wpj
-	for i in `cat $vxfilelist`; do
-		o="<BEGIN> FILE_\$(PRJ_DIR)/../$i"
-		echo "${o}_dependDone"
-		echo "TRUE"
-		echo "<END>"
-		echo
-		echo "${o}_dependencies"
-		echo "\$(PRJ_DIR)/db_config.h \\"
-		echo "	\$(PRJ_DIR)/db_int.h \\"
-		echo "	\$(PRJ_DIR)/db.h"
-		echo "<END>"
-		echo
-		echo "${o}_objects"
-		echo "`basename $i .c`.o"
-		echo "<END>"
-		echo
-		echo "${o}_tool"
-		echo "C/C++ compiler"
-		echo "<END>"
-		echo
-	done
-	echo "<BEGIN> PROJECT_FILES"
-	sed -e '$!s/$/ \\/' \
-	    -e 's/^/$(PRJ_DIR)\/..\//' \
-	    -e '1!s/^/	/' < $vxfilelist
-	echo "<END>"
-	echo
-	echo "<BEGIN> userComments"
-	echo "BerkeleyDB"
-	echo "<END>") > $t
-	#
-	# Build small lib project files
-	#
-	(cat vx_2.${v}/BerkeleyDBsmall.wpj
-	for i in `cat $vxsmallfiles`; do
-		o="<BEGIN> FILE_\$(PRJ_DIR)/../$i"
-		echo "${o}_dependDone"
-		echo "TRUE"
-		echo "<END>"
-		echo
-		echo "${o}_dependencies"
-		echo "\$(PRJ_DIR)/db_config.h \\"
-		echo "	\$(PRJ_DIR)/db_int.h \\"
-		echo "	\$(PRJ_DIR)/db.h"
-		echo "<END>"
-		echo
-		echo "${o}_objects"
-		echo "`basename $i .c`.o"
-		echo "<END>"
-		echo
-		echo "${o}_tool"
-		echo "C/C++ compiler"
-		echo "<END>"
-		echo
-	done
-	echo "<BEGIN> PROJECT_FILES"
-	sed -e '$!s/$/ \\/' \
-	    -e 's/^/$(PRJ_DIR)\/..\//' \
-	    -e '1!s/^/	/' < $vxsmallfiles
-	echo "<END>"
-	echo
-	echo "<BEGIN> userComments"
-	echo "BerkeleyDB"
-	echo "<END>") > $u
-	f=../build_vxworks/BerkeleyDB2${v}.wpj
-	cmp $t $f > /dev/null 2>&1 ||
-	    (echo "Building $f" && rm -f $f && cp $t $f)
-	f=../build_vxworks/BerkeleyDB2${v}small.wpj
-	cmp $u $f > /dev/null 2>&1 ||
-	    (echo "Building $f" && rm -f $f && cp $u $f)
-done
-
 # vx6 --
 #	Generate a VxWorks 6.X Makefile.
 #
@@ -535,6 +413,9 @@ vx6()
 # Build the list of "normal build" files VxWorks 6x knows about -- it's
 # the standard Vx list plus some additions.
 sed -e '/^$/d' -e '/^[	 #]/d' srcfiles.in |
+    egrep -w vx |
+    sed 's/[	 ].*//' > $vxfilelist
+sed -e '/^$/d' -e '/^[	 #]/d' srcfiles.in |
     egrep -w vx6 |
     sed 's/[	 ].*//' >> $vxfilelist
 vx6 $vxfilelist > $t
@@ -546,7 +427,7 @@ cmp $t $f > /dev/null 2>&1 ||
 # the standard vxsmall list.
 sed -e '/^$/d' -e '/^[	 #]/d' srcfiles.in |
     egrep -w vxsmall |
-    sed 's/[	 ].*//' >> $vxfilelist
+    sed 's/[	 ].*//' >> $vxsmallfiles
 vx6 $vxsmallfiles > $t
 f=../build_vxworks/Makefile.6x.small
 cmp $t $f > /dev/null 2>&1 ||