database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Revise Windows build script, correct comment re NetWare in libmysql.c

Browse Source 
Build-tools/Do-win-build:
  Copy logfile for pickup by Do-compile-win
libmysql/libmysql.c:
  Comment was previously inaccurate
This commit is contained in:
unknown
2004-01-21 16:06:26 -01:00
parent db77cba566
commit a5b9966c0d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Build-tools/Do-win-build
View File

@ -22,6 +22,7 @@ if (!$opt_builddir) {
$opt_tarball =~ /(mysql[^\/]*)-win-src\.tar/; $opt_tarball =~ /(mysql[^\/]*)-win-src\.tar/;
$mysqlver=$1; $mysqlver=$1;
$basedir = "$opt_builddir/$mysqlver"; $basedir = "$opt_builddir/$mysqlver";
$scriptdir = `pwd`;
# Make sure build dir exists # Make sure build dir exists
mkdir($opt_builddir); mkdir($opt_builddir);
@ -47,6 +48,8 @@ chdir($mysqlver);
system("\"$MSDEV\" mysql.dsw /MAKE \"ALL\" /OUT $mysqlver-build.log"); system("\"$MSDEV\" mysql.dsw /MAKE \"ALL\" /OUT $mysqlver-build.log");
system("cp $mysqlver-build.log $scriptdir");
# #
# Print a help text message # Print a help text message
# #
@ -55,10 +58,10 @@ sub print_help
print <<EOF; print <<EOF;
Usage: Do-compile-win [options] source-tarball Usage: Do-compile-win [options] source-tarball
Unpacks a Windows source distribution on the local machine and Unpacks a Windows source distribution on the local machine and
compiles it using VC++ 6.0. compiles it using VC++ 6.0.
This script is intended for Cygwin Perl. You must have a working This script is intended for Cygwin Perl. You must have a working
MSDEV.EXE in your path for compilation. MSDEV.EXE in your path for compilation.
@ -68,8 +71,8 @@ Options:
Print this text. Print this text.
--builddir=<dir> --builddir=<dir>
Set the Cygwin path to build under; the tarball will actually Set the Cygwin path to build under; the tarball will actually
be moved to <builddir>/mysql-<version>/tarball and extracted under be moved to <builddir>/mysql-<version>/tarball and extracted under
<builddir>/mysql-<version>/build. <builddir>/mysql-<version>/build.
Default: /cygdrive/c/mysql-win-build Default: /cygdrive/c/mysql-win-build

2
libmysql/libmysql.c
View File

@ -585,7 +585,7 @@ char* getlogin(void);
#if defined(__NETWARE__) #if defined(__NETWARE__)
/* default to "root" on NetWare */ /* Default to value of USER on NetWare, if unset use "UNKNOWN_USER" */
static void read_user_name(char *name) static void read_user_name(char *name)
{ {
char *str=getenv("USER"); char *str=getenv("USER");