MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:pkarthick Date:April 4 2006 6:46am
Subject:bk commit into 5.1 tree (pkarthick:1.2234)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of prem. When prem 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.2234 06/04/04 12:16:45 pkarthick@stripped[prem] +4 -0
  gcc-1.patch

  netware/BUILD/nwgccenv
    1.1 06/03/28 17:12:11 pkarthick@stripped[prem] +35 -0
    Import patch gcc-1.patch

  netware/BUILD/nwgccenv
    1.0 06/03/28 17:12:11 pkarthick@stripped[prem] +0 -0
    BitKeeper file /home/prem/bk/mysql-5.1.9_GCC/netware/BUILD/nwgccenv

  netware/BUILD/nwbootstrap
    1.13 06/03/28 17:12:11 pkarthick@stripped[prem] +95 -70
    Import patch gcc-1.patch

  netware/BUILD/compile-netware-END
    1.10 06/03/28 17:12:11 pkarthick@stripped[prem] +8 -2
    Import patch gcc-1.patch

  netware/BUILD/compile-AUTOTOOLS
    1.7 06/03/28 17:12:11 pkarthick@stripped[prem] +1 -1
    Import patch gcc-1.patch

# 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:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/mysql-5.1.9_GCC

--- 1.6/netware/BUILD/compile-AUTOTOOLS	2006-02-13 01:03:07 +05:30
+++ 1.7/netware/BUILD/compile-AUTOTOOLS	2006-03-28 17:12:11 +05:30
@@ -12,7 +12,7 @@
 	rm -rf config.cache autom4te.cache
 	aclocal
 	autoheader
-	libtoolize --force
+	libtoolize --automake --force
 	aclocal
 	automake --add-missing --force-missing
 	autoconf)

--- 1.9/netware/BUILD/compile-netware-END	2006-02-13 01:03:08 +05:30
+++ 1.10/netware/BUILD/compile-netware-END	2006-03-28 17:12:11 +05:30
@@ -15,8 +15,14 @@
 rm -f */.deps/*.P
 rm -rf Makefile.in.bk
 
-# Metrowerks enviornment
-. $path/mwenv
+# Setup environment
+if test $with_mwccnlm; then
+  # Metrowerks enviornment
+ . $path/mwenv
+else
+  # NetWare GCC environment
+  . $path/nwgccenv
+fi
 
 # run auto tools
 . $path/compile-AUTOTOOLS

--- 1.12/netware/BUILD/nwbootstrap	2006-02-13 01:03:10 +05:30
+++ 1.13/netware/BUILD/nwbootstrap	2006-03-28 17:12:11 +05:30
@@ -61,7 +61,9 @@
 --wine-build-dir=<dir>      Use the WINE directory <dir>, which should
                             correspond to the --build-dir directory
                             (default is "$wine_build_dir")
-
+--with-mwccnlm              Build with MetroWerks CodeWarrior, default is
+                            building with gcc.
+                             
 examples:
 
   nwbootstrap
@@ -84,85 +86,108 @@
     --build=*) build=`echo "$arg" | sed -e "s;--build=;;"` ;;
     --suffix=*) suffix=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
     --doc-dir=*) doc_dir=`echo "$arg" | sed -e "s;--doc-dir=;;"` ;;
+    --with-mwccnlm) with_mwccnlm=1 ;;
     *) show_usage ;;
   esac
 done
 
 echo "starting build..."
 
-# check for bk and repo_dir
-bk help > /dev/null
-repo_dir=`bk root $repo_dir`
-cd $repo_dir
-doc_dir="$repo_dir/../mysqldoc"
-
-# build temporary directory
-temp_dir="$build_dir/mysql-$$.tmp"
-
-# export the bk tree
-command="bk export";
-if test $revision; then command="$command -r$revision"; fi
-command="$command $temp_dir"
-echo "exporting $repo_dir..."
-$command
-
-# determine version
-version=`grep -e "AM_INIT_AUTOMAKE(mysql, .*)" < $temp_dir/configure.in | sed -e "s/AM_INIT_AUTOMAKE(mysql, \(.*\))/\1/"`
-echo "version: $version"
-
-# build target directory
-target_dir="$build_dir/mysql-$version"
-
-# add suffix
-if test $suffix
-then
-  target_dir="$target_dir-$suffix"
-fi
-
-# delete any old target
-if test -d $target_dir.old; then rm -rf $target_dir.old; fi
-
-# rename old target
-if test -d $target_dir; then mv -f $target_dir $target_dir.old; fi
-
-# rename directory to use version
-mv $temp_dir $target_dir
-
-# create ChangeLog
-if test $revision
-then
-	rev=`bk changes -r..$revision -t -d':REV:' -n | head -2 | tail -1`
+if test -d BitKeeper; then
+  # check for bk and repo_dir
+  bk help > /dev/null
+  repo_dir=`bk root $repo_dir`
+  cd $repo_dir
+  doc_dir="$repo_dir/../mysqldoc"
+
+  # build temporary directory
+  temp_dir="$build_dir/mysql-$$.tmp"
+
+  # export the bk tree
+  command="bk export";
+  if test $revision; then
+    command="$command -r$revision"
+  fi
+  command="$command $temp_dir"
+  echo "exporting $repo_dir..."
+  $command
+
+  # determine version
+  version=`grep -e "AM_INIT_AUTOMAKE(mysql, .*)" < $temp_dir/configure.in \
+           | sed -e "s/AM_INIT_AUTOMAKE(mysql, \(.*\))/\1/"`
+  echo "version: $version"
+
+  # build target directory
+  target_dir="$build_dir/mysql-$version"
+
+  # add suffix
+  if test $suffix; then
+    target_dir="$target_dir-$suffix"
+  fi
+
+  # delete any old target
+  if test -d $target_dir.old; then
+    rm -rf $target_dir.old
+  fi
+
+  # rename old target
+  if test -d $target_dir; then
+    mv -f $target_dir $target_dir.old
+  fi
+  # rename directory to use version
+  mv $temp_dir $target_dir
+
+  # create ChangeLog
+  if test $revision; then
+    rev=`bk changes -r..$revision -t -d':REV:' -n | head -2 | tail -1`
+  else
+    rev=`bk changes -t -d':REV:' -n | head -1`
+  fi
+  echo "creating ChangeLog..."
+  bk changes -v -r$rev..$revision > $target_dir/ChangeLog
+
+  # add the latest manual
+  if test -d $doc_dir; then
+    echo "adding the latest manual..."
+    install -m 644 $doc_dir/Docs/{manual,reservedwords}.texi $target_dir/Docs/
+  else
+    echo "Not adding the latest manual."
+  fi
+
+  # make files writeable
+  echo "making files writable..."
+  cd $target_dir
+  chmod -R u+rw,g+rw .
 else
-	rev=`bk changes -t -d':REV:' -n | head -1`
+  # determine version
+  version=`grep -e "AM_INIT_AUTOMAKE(mysql, .*)" < $temp_dir/configure.in \
+           | sed -e "s/AM_INIT_AUTOMAKE(mysql, \(.*\))/\1/"`
+
+  # make files writeable
+  echo "making files writable..."
+  chmod -R u+rw,g+rw .
 fi
 
-echo "creating ChangeLog..."
-bk changes -v -r$rev..$revision > $target_dir/ChangeLog
-
-# add the latest manual
-if test -d $doc_dir
-then
-	echo "adding the latest manual..."
-	install -m 644 $doc_dir/Docs/{manual,reservedwords}.texi $target_dir/Docs/
-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" \
-	-e "s;BUILD_DIR;$build_dir;g" \
-  -e "s;VERSION;$version;g" $mwenv.org > $mwenv
-chmod +rwx $mwenv
-
-PWD=`pwd`
-SRC_DIR=`grep "^export MYDEV=" $mwenv | cut -d'=' -f2 | \
+if test $with_mwccnlm; then
+  # 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" \
+      -e "s;BUILD_DIR;$build_dir;g" \
+      -e "s;VERSION;$version;g" $mwenv.org > $mwenv
+  chmod +rwx $mwenv
+  PWD=`pwd`
+  SRC_DIR=`grep "^export MYDEV=" $mwenv | cut -d'=' -f2 | \
            sed -e 's;";;g' -e "s;^;echo ;g" -e "s;$;/\`basename $PWD\`;g" | /bin/sh`
+else
+  # Using GCC
+  SRC_DIR=`pwd`
+  nwgccenv="./netware/BUILD/nwgccenv"
+  mv -f $nwgccenv $nwgccenv.org
+  sed -e "s;@SRC_DIR@;$SRC_DIR;g"  $nwgccenv.org > $nwgccenv
+  chmod +x $nwgccenv
+fi
 
 
 # edit the def file versions
--- New file ---
+++ netware/BUILD/nwgccenv	06/03/28 17:12:11
set -x

SRC_DIR=@SRC_DIR@
MYDEV_DIR=/home/prem/cross

PATH=$PATH:$SRC_DIR/netware/BUILD
EXEEXT=".nlm"

if test $NW_CFLAGS; then
  INCLUDES="-I$SRC_DIR/include"
  CFLAGS="$NW_CFLAGS $INCLUDES"
else
  INCLUDES="-I$MYDEV_DIR/libc/include -I$MYDEV_DIR/zlib-1.2.3/include -I$MYDEV_DIR/fs64/headers -I$SRC_DIR/include"
  CFLAGS="-D__NETWARE__ -nostdinc -O3 -fpack-struct $INCLUDES"
fi

if test $NW_CXXFLAGS; then
  INCLUDES="-I$SRC_DIR/include"
  CXXFLAGS="$NW_CXXFLAGS $INCLUDES"
else
  INCLUDES="-I$MYDEV_DIR/libc/include -I$MYDEV_DIR/zlib-1.2.3/include -I$MYDEV_DIR/fs64/headers -I$SRC_DIR/include"
  CXXFLAGS="-D__NETWARE__ -D_WCHAR_T -nostdinc -O3 -felide-constructors -fno-exceptions -fno-rtti -fpack-struct $INCLUDES"
fi

# EXTRA_LDFLAGS_PROGRAM="-Xlinker --stack=65536"
# EXTRA_LDFLAGS="-Xlinker --nlm-kernelspace"
EXTRA_LDFLAGS="-Xlinker --stack=65536 -Xlinker --nlm-kernelspace -Xlinker --nlm-screenname=\"MySQL\""
LDFLAGS="-L$MYDEV_DIR/libc/imports -L$MYDEV_DIR/fs64/imports -L$SRC_DIR/netware/BUILD"


LD=$MYDEV_DIR/gcc/bin/i586-netware-nlmld
CC=$MYDEV_DIR/gcc/bin/i586-netware-gcc
CXX=$MYDEV_DIR/gcc/bin/i586-netware-g++

export LD CC CXX LDFLAGS EXTRA_LDFLAGS CXXFLAGS CFLAGS EXEEXT PATH

Thread
bk commit into 5.1 tree (pkarthick:1.2234)pkarthick4 Apr