Use relative paths for inplace builds, it helps ccache
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -99,6 +99,9 @@ else
|
|||||||
PYUNICODEOPT=0
|
PYUNICODEOPT=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$HOSTNAME" = "bigmac.alldunn.com" ]; then
|
||||||
|
MAKEJOBS="--jobs=2"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -z "$TARBALLDIR" ]; then
|
if [ -z "$TARBALLDIR" ]; then
|
||||||
# this is a spot on my fileserver where the tarballs go, adjust
|
# this is a spot on my fileserver where the tarballs go, adjust
|
||||||
@@ -180,15 +183,20 @@ if [ $inplace = no ]; then
|
|||||||
cd $WXDIR/bld
|
cd $WXDIR/bld
|
||||||
WXBLD=$WXDIR/bld
|
WXBLD=$WXDIR/bld
|
||||||
else
|
else
|
||||||
# If building "inplace" then our build dir will be BUILDROOT,
|
|
||||||
# adjust the variables to find things that way.
|
# If building "inplace" then our build dir will be off of the
|
||||||
WXDIR=$WXROOT
|
# WXROOT like normal, adjust the variables to find things that
|
||||||
|
# way.
|
||||||
|
WXBLD=$WXROOT/build-$CHARTYPE
|
||||||
|
mkdir -p $WXBLD
|
||||||
|
cd $WXBLD
|
||||||
|
WXDIR=..
|
||||||
SRCROOT=$WXROOT
|
SRCROOT=$WXROOT
|
||||||
WXBLD=$BUILDROOT
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Using source tree: $WXDIR"
|
echo "Using wx root dir: $WXROOT"
|
||||||
echo "Using build dir: $WXBLD"
|
echo "Using build dir: $WXBLD"
|
||||||
|
echo "Using source tree: $WXDIR"
|
||||||
|
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -227,13 +235,13 @@ if [ $skipbuild != yes ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
make
|
make $MAKEJOBS
|
||||||
make -C contrib/src/gizmos
|
make $MAKEJOBS -C contrib/src/gizmos
|
||||||
make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
|
make $MAKEJOBS -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
|
||||||
make -C contrib/src/stc
|
make $MAKEJOBS -C contrib/src/stc
|
||||||
|
|
||||||
# Build wxPython
|
# Build wxPython
|
||||||
cd $WXDIR/wxPython
|
cd $WXROOT/wxPython
|
||||||
$PYTHON setup.py \
|
$PYTHON setup.py \
|
||||||
UNICODE=$PYUNICODEOPT \
|
UNICODE=$PYUNICODEOPT \
|
||||||
NO_SCRIPTS=1 \
|
NO_SCRIPTS=1 \
|
||||||
@@ -260,7 +268,7 @@ if [ $skipinstall != yes ]; then
|
|||||||
ln -s ../lib/wx/config/* wx-config
|
ln -s ../lib/wx/config/* wx-config
|
||||||
|
|
||||||
# and wxPython
|
# and wxPython
|
||||||
cd $WXDIR/wxPython
|
cd $WXROOT/wxPython
|
||||||
$PYTHON setup.py \
|
$PYTHON setup.py \
|
||||||
UNICODE=$PYUNICODEOPT \
|
UNICODE=$PYUNICODEOPT \
|
||||||
NO_SCRIPTS=1 \
|
NO_SCRIPTS=1 \
|
||||||
@@ -286,13 +294,13 @@ if [ $skipinstall != yes ]; then
|
|||||||
|
|
||||||
# install wxPython's tool scripts
|
# install wxPython's tool scripts
|
||||||
mkdir -p $INSTALLROOT$BINPREFIX
|
mkdir -p $INSTALLROOT$BINPREFIX
|
||||||
cd $WXDIR/wxPython/scripts
|
cd $WXROOT/wxPython/scripts
|
||||||
python$PYVER CreateMacScripts.py $INSTALLROOT $BINPREFIX
|
python$PYVER CreateMacScripts.py $INSTALLROOT $BINPREFIX
|
||||||
|
|
||||||
|
|
||||||
# Remove the .pyc/.pyo files they just take up space and can be recreated
|
# Remove the .pyc/.pyo files they just take up space and can be recreated
|
||||||
# during the install.
|
# during the install.
|
||||||
pushd $WXDIR/wxPython
|
pushd $WXROOT/wxPython
|
||||||
$PYTHON $PROGDIR/../zappycfiles.py $INSTALLROOT > /dev/null
|
$PYTHON $PROGDIR/../zappycfiles.py $INSTALLROOT > /dev/null
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@@ -419,6 +427,9 @@ This disk image contains the following items:
|
|||||||
it from a Terminal command line, or you can open it with
|
it from a Terminal command line, or you can open it with
|
||||||
PythonLauncher and let it create a Terminal to run it in.
|
PythonLauncher and let it create a Terminal to run it in.
|
||||||
|
|
||||||
|
NOTE: If you have versions prior to 2.5.3.1 installed, please
|
||||||
|
do run this uninstall tool to remove the older version.
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user