bk commit into 5.0 tree (jani:1.1927)

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1927 05/06/06 17:59:00 jani@stripped +3 -0
  Some fixes for Netware builds.
  

  netware/BUILD/mwenv
    1.10 05/06/06 17:58:55 jani@stripped +1 -1
    A fix for Netware builds, environment variables setup script.

  netware/BUILD/compile-netware-END
    1.6 05/06/06 17:58:55 jani@stripped +5 -0
    A fix for Netware builds.

  netware/BUILD/compile-linux-tools
    1.8 05/06/06 17:58:55 jani@stripped +6 -0
    A patch for Netware builds. This fixes problem with missing mysql_version.h during
Linux
    tools building.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.7/netware/BUILD/compile-linux-tools	2005-01-01 21:53:37 +02:00
+++ 1.8/netware/BUILD/compile-linux-tools	2005-06-06 17:58:55 +03:00
@@ -30,6 +30,10 @@
 
 # build	tools only
 make clean all-local
+
+# Create mysql_version.h which was deleted my previous step
+./config.status include/mysql_version.h
+                                                                                         
                                   
 (cd dbug; make libdbug.a)
 (cd strings; make libmystrings.a)
 (cd mysys; make libmysys.a)
@@ -56,3 +60,5 @@
 cp sql/gen_lex_hash sql/gen_lex_hash.linux
 cp strings/conf_to_src strings/conf_to_src.linux
 
+# Delete mysql_version.h
+rm -f include/mysql_version.h

--- 1.5/netware/BUILD/compile-netware-END	2004-04-07 16:12:39 +03:00
+++ 1.6/netware/BUILD/compile-netware-END	2005-06-06 17:58:55 +03:00
@@ -22,6 +22,11 @@
 # run auto tools
 . $path/compile-AUTOTOOLS
 
+# For NetWare there is no comp_err but comp_err.linux
+sed -e "s/comp_err/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$
+sed -e "s/replace comp_err.linux/replace comp_err/g" extra/Makefile.am.$$ >
extra/Makefile.am
+rm extra/Makefile.am.$$
+
 # configure
 ./configure $base_configs $extra_configs
 

--- 1.9/netware/BUILD/mwenv	2005-03-10 02:53:11 +02:00
+++ 1.10/netware/BUILD/mwenv	2005-06-06 17:58:55 +03:00
@@ -6,7 +6,7 @@
 # the default is "F:/mydev"
 export MYDEV="F:/mydev"
 
-export
MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV"
+export
MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/include;$MYDEV"
 export
MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/openssl;$MYDEV/mysql-VERSION/netware/BUILD"
 export
MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp"