Merge with 4.0.18

6 files changed, 28 insertions, 11 deletions

diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools
index 3590a900338..886f866d674 100755
--- a/netware/BUILD/compile-linux-tools
+++ b/netware/BUILD/compile-linux-tools
@@ -1,4 +1,4 @@
-#! /bin/sh                   
+#! /bin/sh
 
 # debug
 #set -x
@@ -46,6 +46,9 @@ make clean config.h
 (cd sql; make gen_lex_hash)
 (cd strings; make conf_to_src)
 
+# so the file will be linked
+(cd sql; make sql_yacc.cc)
+
 # copying required linux tools
 cp extra/comp_err extra/comp_err.linux
 cp libmysql/conf_to_src libmysql/conf_to_src.linux
diff --git a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END
index e0097484500..2bd59f97114 100755
--- a/netware/BUILD/compile-netware-END
+++ b/netware/BUILD/compile-netware-END
@@ -1,4 +1,4 @@
-#! /bin/sh                   
+#! /bin/sh
 
 # debug
 #set -x
@@ -29,7 +29,7 @@ rm -rf Makefile.in.bk
 make clean bin-dist
 
 # mark the build
-for file in *.tar.gz
+for file in *.tar.gz *.zip
 do
 	if (expr "$file" : "mysql-[1-9].*" > /dev/null)
 	then
diff --git a/netware/BUILD/compile-netware-all b/netware/BUILD/compile-netware-all
index 35d275f3b42..6baff699e94 100755
--- a/netware/BUILD/compile-netware-all
+++ b/netware/BUILD/compile-netware-all
@@ -8,6 +8,7 @@ set -e
 
 path=`dirname $0`
 
+$path/compile-netware-src
 $path/compile-netware-standard
 $path/compile-netware-debug
 #$path/compile-netware-max
diff --git a/netware/BUILD/compile-netware-standard b/netware/BUILD/compile-netware-standard
index 12cae1f024e..45f5021862c 100755
--- a/netware/BUILD/compile-netware-standard
+++ b/netware/BUILD/compile-netware-standard
@@ -13,7 +13,7 @@ path=`dirname $0`
 suffix="standard"
 
 extra_configs=" \
-	--with-innodb
+	--with-innodb \
 	"
 
 . $path/compile-netware-END
diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index 27f7056d251..e4e6d509100 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -6,9 +6,9 @@
 # the default is "F:/mydev"
 export MYDEV="WINE_BUILD_DIR"
 
-export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/zlib-1.1.4"
-export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/zlib-1.1.4"
-export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a"
+export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV;$MYDEV/zlib-1.1.4""
+export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/netware/BUILD"
+export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;knetware.imp"
 
 export WINEPATH="$MYDEV/mw/bin"
 
@@ -19,11 +19,11 @@ export AR='mwldnlm'
 export AR_FLAGS='-type library -o'
 export AS='mwasmnlm'
 export CC='mwccnlm -gccincludes'
-export CFLAGS='-dialect c -proc 686 -relax_pointers'
+export CFLAGS='-align 8 -proc 686 -relax_pointers -dialect c'
 export CXX='mwccnlm -gccincludes'
-export CXXFLAGS='-dialect c++ -proc 686 -bool on -wchar_t on -relax_pointers -D_WCHAR_T'
+export CXXFLAGS='-align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
 export LD='mwldnlm'
-export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -flags pseudopreemption'
+export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
 export RANLIB=:
 export STRIP=:
 
diff --git a/netware/BUILD/nwbootstrap b/netware/BUILD/nwbootstrap
index 5d068e4e4de..f54775bf054 100755
--- a/netware/BUILD/nwbootstrap
+++ b/netware/BUILD/nwbootstrap
@@ -11,7 +11,7 @@ path=`dirname $0`
 # repository direcotry
 repo_dir=`pwd`
 
-# build direcotry
+# build directory
 build_dir="$HOME/mydev"
 wine_build_dir="F:/mydev"
 
@@ -147,10 +147,12 @@ then
 fi
 
 # make files writeable
+echo "making files writable..."
 cd $target_dir
 chmod -R u+rw,g+rw .
 
 # edit the mvenv file
+echo "updating the mwenv environment file..."
 mwenv="./netware/BUILD/mwenv"
 mv -f $mwenv $mwenv.org
 sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
@@ -158,6 +160,17 @@ sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
   -e "s;VERSION;$version;g" $mwenv.org > $mwenv
 chmod +rwx $mwenv
 
+# edit the def file versions
+echo "updating *.def file versions..."
+nlm_version=`echo "$version" | sed -e "s;\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*;\1, \2, \3;"`
+
+for file in ./netware/*.def
+do
+  mv -f $file $file.org
+  sed -e "s;VERSION.*;VERSION $nlm_version;g" $file.org > $file
+  rm $file.org
+done
+
 # build linux tools
 echo "compiling linux tools..."
 ./netware/BUILD/compile-linux-tools