Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Factoring out redundant steps in the build process to their own function.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2006-07-05 04:09:40 +00:00
parent adf154089e
commit d328538750
2 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
distrib/scripts/mac/dobuilds
View File

@@ -4,41 +4,31 @@ HOMEDIR="$PWD"
BUILDDIR_ROOT="$PWD/builds" BUILDDIR_ROOT="$PWD/builds"
BUILDDIR_CARBON="$BUILDDIR_ROOT/carbon"
BUILDDIR_COCOA="$BUILDDIR_ROOT/cocoa"
mkdir -p $BUILDDIR_CARBON
mkdir -p $BUILDDIR_COCOA
cd $BUILDDIR_CARBON
BUILDDIR=$BUILDDIR_CARBON
export WXROOT="$HOMEDIR/../../.." export WXROOT="$HOMEDIR/../../.."
export INSTALLDIR="$BUILDDIR/install-ansi"
$HOMEDIR/macbuild
export INSTALLDIR="$BUILDDIR/install-unicode" do_builds {
$HOMEDIR/macbuild unicode PORT=$1
BUILDDIR=$BUILDDIR_ROOT/$PORT
mkdir -p $BUILDDIR
pushd $BUILDDIR
export INSTALLDIR="$BUILDDIR/install-static-ansi" # TODO: add the lipo universal builds to this
$HOMEDIR/macbuild static export WXROOT="$HOMEDIR/../../.."
export INSTALLDIR="$BUILDDIR/install-ansi"
$HOMEDIR/macbuild $PORT
export INSTALLDIR="$BUILDDIR/install-static-unicode" export INSTALLDIR="$BUILDDIR/install-unicode"
$HOMEDIR/macbuild static unicode $HOMEDIR/macbuild $PORT unicode
cd $BUILDDIR_COCOA export INSTALLDIR="$BUILDDIR/install-static-ansi"
BUILDDIR=$BUILDDIR_COCOA $HOMEDIR/macbuild $PORT static
export INSTALLDIR="$BUILDDIR/install-ansi" export INSTALLDIR="$BUILDDIR/install-static-unicode"
$HOMEDIR/macbuild cocoa $HOMEDIR/macbuild $PORT static unicode
export INSTALLDIR="$BUILDDIR/install-unicode" popd
$HOMEDIR/macbuild cocoa unicode }
export INSTALLDIR="$BUILDDIR/install-static-ansi" do_builds "carbon"
$HOMEDIR/macbuild cocoa static
export INSTALLDIR="$BUILDDIR/install-static-unicode" do_builds "cocoa"
$HOMEDIR/macbuild cocoa static unicode
cd $HOMEDIR

10
distrib/scripts/mac/mac_options.inc
View File

@@ -4,7 +4,7 @@ WXPYTHON=0
UNICODE=0 UNICODE=0
DEBUG=0 DEBUG=0
CARBON=1 CARBON=1
COCOA=0 PORT="mac"
STATIC=0 STATIC=0
# Process command line options. # Process command line options.
@@ -15,8 +15,8 @@ for i in "$@"; do
debug) DEBUG=1 ;; debug) DEBUG=1 ;;
wxpython) WXPYTHON=1 ;; wxpython) WXPYTHON=1 ;;
universal) UNIVERSAL=1 ;; universal) UNIVERSAL=1 ;;
carbon) CARBON=1 ;; carbon) PORT="mac" ;;
cocoa) COCOA=1 ;; cocoa) PORT="cocoa" ;;
static) STATIC=1 ;; static) STATIC=1 ;;
*) *)
usage usage
@@ -25,6 +25,4 @@ for i in "$@"; do
esac esac
done done
if [ "$COCOA" = "1" ]; then OTHER_OPTS="--with-$PORT "
OTHER_OPTS="--with-cocoa "
fi