Commit 3c7b5e3e authored by unknown's avatar unknown
Browse files

Netware changes for build with yaSSL 

- Make mwenv automatically adapt the setting to current build dir.
- Fix include paths that mwccnlm does not understand
- Link libmysl with yassl  


netware/BUILD/mwccnlm:
  Update mwccnlm to convert -I../.. to -I../../
netware/BUILD/mwenv:
  Automatically detect current build dir and based on that calculate current build dir in winw format.
  Allow caller to define MYDEV to override the defatul "F:/mydev"
  Set all paths from these three variables
netware/Makefile.am:
  Link libmysql with yassl_libs
parent 24cdd480

netware/BUILD/mwccnlm

+6 −3
Original line number Diff line number Diff line
@@ -3,9 +3,12 @@ 
# stop on errors

set -e



# mwccnlm is having a hard time understanding "-I./../include"

# convert it to "-I../include"

args=" "`echo $* | sed -e 's/-I.\/../-I../g'`

# mwccnlm is having a hard time understanding:

#  * "-I./../include", convert it to "-I../include"

#  * "-I.../..", convert it to "-I../../"

args=" "`echo $* | sed \

-e 's/-I.\/../-I../g' \

-e 's/\(-I[.\/]*.\) /\1\/ /g'`



# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

netware/BUILD/mwenv

+28 −8
Original line number Diff line number Diff line 
#! /bin/sh



# F:/mydev, /home/kp/mydev, and 4.0.21 must be correct before compiling

# This values are normally changed by the nwbootstrap script

if test ! -r ./sql/mysqld.cc

then

  echo "you must start from the top source directory"

  exit 1

fi



# The base path(in wineformat) where compilers, includes and

# libraries are installed

if test -z $MYDEV

then

  # the default is "F:/mydev"

  export MYDEV="F:/mydev"

fi

echo "MYDEV: $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"

# Get current dir

BUILD_DIR=`pwd`

echo "BUILD_DIR: $BUILD_DIR"



# Get current dir in wine format

base=`echo $MYDEV  |sed 's/\/.*//'`

base_unix_part=`winepath -- -u $base`

WINE_BUILD_DIR=`echo "$BUILD_DIR" | sed 's_'$base_unix_part'/__'`

WINE_BUILD_DIR="$base$WINE_BUILD_DIR"

echo "WINE_BUILD_DIR: $WINE_BUILD_DIR"



export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$WINE_BUILD_DIR/include;$MYDEV"

export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/openssl;$WINE_BUILD_DIR/netware/BUILD"

export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp"



export WINEPATH="$MYDEV/mw/bin"



# the default added path is "$HOME/mydev/mysql-x.x-x/netware/BUILD"

export PATH="$PATH:BUILD_DIR/mysql-VERSION/netware/BUILD"

# the default added path is "$BUILD_DIR/netware/BUILD"

export PATH="$PATH:$BUILD_DIR/netware/BUILD"



export AR='mwldnlm'

export AR_FLAGS='-type library -o'

netware/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ mysqld_safe_SOURCES= mysqld_safe.c my_manage.c 
mysql_install_db_SOURCES=	mysql_install_db.c my_manage.c

mysql_test_run_SOURCES=		mysql_test_run.c my_manage.c

libmysql_SOURCES=		libmysqlmain.c

libmysql_LDADD =		../libmysql/.libs/libmysqlclient.a @openssl_libs@

libmysql_LDADD =		../libmysql/.libs/libmysqlclient.a \

				@openssl_libs@ @yassl_libs@



netware_build_files =           client/mysql.def client/mysqladmin.def \

                                client/mysqlbinlog.def client/mysqlcheck.def \