mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge neptunus.(none):/home/msvensson/mysql/netware/my51-netware

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@neptunus.(none) 2006-09-26 16:32:34 +02:00
commit cc4d1a4d4d
3 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
netware/BUILD/mwccnlm
View file

@ -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

36
netware/BUILD/mwenv
View file

@ -1,19 +1,39 @@
#! /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 default is "F:/mydev"
export MYDEV=WINE_BUILD_DIR
# 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.2.3;$MYDEV/mysql-VERSION/include;$MYDEV"
export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$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.2.3;$WINE_BUILD_DIR/include;$MYDEV"
export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$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'

3
netware/Makefile.am
View file

@ -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 \