List:Internals« Previous MessageNext Message »
From:Kent Boortz Date:May 5 2005 9:34am
Subject:bk commit into 4.1 tree (kent:1.2227)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent 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.2227 05/05/05 09:34:15 kent@stripped +3 -0
  mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper:
    Initial Metrowerks CodeWarrior compiler support
    new file

  support-files/MacOSX/mwcc-wrapper
    1.1 05/05/05 09:33:41 kent@stripped +48 -0
    Initial Metrowerks CodeWarrior compiler support

  BUILD/compile-darwin-mwcc
    1.1 05/05/05 09:33:41 kent@stripped +54 -0
    Initial Metrowerks CodeWarrior compiler support

  support-files/MacOSX/mwcc-wrapper
    1.0 05/05/05 09:33:41 kent@stripped +0 -0
    BitKeeper file /Users/kent/mysql/cw/mysql-4.1/support-files/MacOSX/mwcc-wrapper

  support-files/MacOSX/mwar-wrapper
    1.1 05/05/05 09:33:40 kent@stripped +16 -0
    Initial Metrowerks CodeWarrior compiler support

  BUILD/compile-darwin-mwcc
    1.0 05/05/05 09:33:41 kent@stripped +0 -0
    BitKeeper file /Users/kent/mysql/cw/mysql-4.1/BUILD/compile-darwin-mwcc

  support-files/MacOSX/mwar-wrapper
    1.0 05/05/05 09:33:40 kent@stripped +0 -0
    BitKeeper file /Users/kent/mysql/cw/mysql-4.1/support-files/MacOSX/mwar-wrapper

# 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:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/cw/mysql-4.1
--- New file ---
+++ BUILD/compile-darwin-mwcc	05/05/05 09:33:41
#! /bin/sh

path=`dirname $0`
. "$path/SETUP.sh"

c_warnings=""
cxx_warnings=""
fast_cflags="-O3"
base_cxxflags="-fno-handle-exceptions"

# FIXME do we need to link static, not to depend on CodeWarrior libs?

if [ x$MODE = x ] ; then
  echo "You need to give an argument, 'standard', 'max', 'debug' or 'debug-max'"
  echo "Like: MODE=standard BUILD/compile-darwin-codewarrior"
  exit 1
else
  case $MODE in
    standard|pro-gpl)
      # FIXME pro/pro-gpl different libedit/readline
      extra_flags="$ppc_cflags $fast_cflags"
      ;;
    pro)
      # FIXME pro/pro-gpl different libedit/readline
      extra_flags="$ppc_cflags $fast_cflags"
      extra_configs="--with-libedit"
      ;;
    max)
      extra_flags="$ppc_cflags $fast_cflags"
      extra_configs="$max_configs"
      ;;
    debug)
      extra_flags="$ppc_cflags $debug_cflags"
      c_warnings="$c_warnings $debug_extra_warnings"
      cxx_warnings="$cxx_warnings $debug_extra_warnings"
      extra_configs="$debug_configs"
      ;;
    debug-max)
      extra_flags="$ppc_cflags $debug_cflags $max_cflags"
      c_warnings="$c_warnings $debug_extra_warnings"
      cxx_warnings="$cxx_warnings $debug_extra_warnings"
      extra_configs="$debug_configs $max_configs"
      ;;
    *)
      echo "You need to give an argument, 'standard', 'max', 'debug' or 'debug-max'"
      echo "Like: MODE=standard BUILD/compile-darwin-codewarrior"
      exit 1
      ;;
  esac
fi

extra_configs="$extra_configs --with-darwin-mwcc"

. "$path/FINISH.sh"

--- New file ---
+++ support-files/MacOSX/mwar-wrapper	05/05/05 09:33:40
#!/bin/sh

# This script can only create a library, not take it apart
# again to AR files

case $1 in
    -d*|-m*|-t*|-p*|-r*|-x*|x)
    echo "$0: can't handle arguments $*"
    exit 1;
    ;;
    -c|c|cr|cru|cu)
    shift;
    ;;
esac

exec mwld -lib -o $*

--- New file ---
+++ support-files/MacOSX/mwcc-wrapper	05/05/05 09:33:41
#!/bin/sh

if [ -z "$CWINSTALL" ] ; then
    echo "ERROR: You need to source 'mwvars' to set CWINSTALL and other variables"
    exit 1
fi

if [ `expr "$MWMacOSXPPCLibraryFiles" : ".*BSD.*"` = 0 ] ; then
    echo "ERROR: You need to source 'mwvars' with the 'bsd' argument"
    exit 1
fi

# ==============================================================================

# Extra options that don't change

PREOPTS="-D__SCHAR_MAX__=127 -D__CHAR_BIT__=8 -ext o -gccinc"
PREOPTS="$PREOPTS -wchar_t on -bool on -relax_pointers -align power_gcc"
PREOPTS="$PREOPTS -stabs all -fno-handle-exceptions -Cpp_exceptions off"

# ==============================================================================

# We want the "PPC Specific" directory to be last, before the source
# file. It is to work around a CodeWarrior/Apple bug, that we need a
# Metrowersk header even though we have configured CodeWarrior to use
# the BSD headers. But not to conflict, the directory has to be last.

# FIXME this will probably break if one path contains space characters

PREARGS=""
for i in $* ; do
    case "$i" in
	-bind_at_load)
	# This is a flag some version of libtool adds, when the host
	# is "*darwin*". It doesn't check that it is gcc.
	# FIXME add some flag?!
	;;
	*.c|*.cc|*.cpp)
	break
	;;
	*)
	PREARGS="$PREARGS $1"
	;;
    esac
    shift
done
#echo "mwcc $PREOPTS $PREARGS -I\"$CWINSTALL/MacOS X Support/Headers/PPC Specific\" $*"
exec mwcc $PREOPTS $PREARGS -I"$CWINSTALL/MacOS X Support/Headers/PPC Specific" $*

Thread
bk commit into 4.1 tree (kent:1.2227)Kent Boortz5 May