X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85245f48ad351409d50cbecfab874827eb0f719b..3249a43c963ee1957e9c3ea91ef6de9fd88d96a9:/wxPython/distrib/mac/wxPythonOSX/build diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build index 53404d8e2b..a9531de0d8 100755 --- a/wxPython/distrib/mac/wxPythonOSX/build +++ b/wxPython/distrib/mac/wxPythonOSX/build @@ -99,6 +99,10 @@ else PYUNICODEOPT=0 fi +#if [ "$HOSTNAME" = "bigmac.alldunn.com" ]; then +# MAKEJOBS="--jobs=2" +#fi + if [ -z "$TARBALLDIR" ]; then # this is a spot on my fileserver where the tarballs go, adjust @@ -137,7 +141,6 @@ TMPDIR=$PWD/_build_dmg BUILDROOT=$TMPDIR/build INSTALLROOT=$TMPDIR/install-root -INSTALLCOMMON=$TMPDIR/install-common INSTALLAPPS=$TMPDIR/install-apps DMGDIR=$TMPDIR/dmg @@ -154,7 +157,6 @@ SRCROOT=$BUILDROOT/wxPython-src-$VERSION mkdir -p $BUILDROOT mkdir -p $INSTALLROOT -mkdir -p $INSTALLCOMMON mkdir -p $INSTALLAPPS rm -rf $DMGDIR @@ -182,15 +184,20 @@ if [ $inplace = no ]; then cd $WXDIR/bld WXBLD=$WXDIR/bld else - # If building "inplace" then our build dir will be BUILDROOT, - # adjust the variables to find things that way. - WXDIR=$WXROOT + + # If building "inplace" then our build dir will be off of the + # WXROOT like normal, adjust the variables to find things that + # way. + WXBLD=$WXROOT/build-$CHARTYPE + mkdir -p $WXBLD + cd $WXBLD + WXDIR=.. SRCROOT=$WXROOT - WXBLD=$BUILDROOT fi -echo "Using source tree: $WXDIR" +echo "Using wx root dir: $WXROOT" echo "Using build dir: $WXBLD" +echo "Using source tree: $WXDIR" #---------------------------------------------------------------------- @@ -218,19 +225,24 @@ if [ $skipbuild != yes ]; then # Make wxWidgets and some contribs - # For some reason Rez and DeRez have started locking up if run as root... + # For some reason Rez and DeRez have started locking up if run as + # root, figure out why, but in the meantime... if [ "$UID" = "0" ]; then chmod a+w lib - su robind -c "make lib/libwx_macd-2.5.3.r" + if [ "$CHARTYPE" = "ansi" ]; then + su robind -c "make lib/libwx_macd-2.5.3.r" + else + su robind -c "make lib/libwx_macud-2.5.3.r" + fi fi - make - make -C contrib/src/gizmos - make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" - make -C contrib/src/stc + make $MAKEJOBS + make $MAKEJOBS -C contrib/src/gizmos + make $MAKEJOBS -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" + make $MAKEJOBS -C contrib/src/stc # Build wxPython - cd $WXDIR/wxPython + cd $WXROOT/wxPython $PYTHON setup.py \ UNICODE=$PYUNICODEOPT \ NO_SCRIPTS=1 \ @@ -257,7 +269,7 @@ if [ $skipinstall != yes ]; then ln -s ../lib/wx/config/* wx-config # and wxPython - cd $WXDIR/wxPython + cd $WXROOT/wxPython $PYTHON setup.py \ UNICODE=$PYUNICODEOPT \ NO_SCRIPTS=1 \ @@ -281,34 +293,29 @@ if [ $skipinstall != yes ]; then SITEPACKAGES=/Library/Python/$PYVER fi - # move the common files to $INSTALLCOMMON - mkdir -p $INSTALLCOMMON$SITEPACKAGES - mv $INSTALLROOT$SITEPACKAGES/wx.pth $INSTALLCOMMON$SITEPACKAGES - mv $INSTALLROOT$SITEPACKAGES/wxversion.py $INSTALLCOMMON$SITEPACKAGES - - # install wxPython's tool scripts in COMMON too - mkdir -p $INSTALLCOMMON$BINPREFIX - cd $WXDIR/wxPython/scripts - python$PYVER CreateMacScripts.py $INSTALLCOMMON $BINPREFIX + # install wxPython's tool scripts + mkdir -p $INSTALLROOT$BINPREFIX + cd $WXROOT/wxPython/scripts + python$PYVER CreateMacScripts.py $INSTALLROOT $BINPREFIX # Remove the .pyc/.pyo files they just take up space and can be recreated # during the install. - pushd $WXDIR/wxPython + pushd $WXROOT/wxPython $PYTHON $PROGDIR/../zappycfiles.py $INSTALLROOT > /dev/null popd - # Set premissions for files in $INSTALLROOT and $INSTALLCOMMON + # Set premissions for files in $INSTALLROOT if [ "$UID" = "0" ]; then - chown -R root:admin $INSTALLROOT $INSTALLCOMMON - chmod -R g+w $INSTALLROOT $INSTALLCOMMON + chown -R root:admin $INSTALLROOT + chmod -R g+w $INSTALLROOT fi fi if [ "$KIND" = "panther" ]; then SITEPACKAGES=/Library/Python/$PYVER fi -PKGDIR=`cat $INSTALLCOMMON$SITEPACKAGES/wx.pth` +PKGDIR=`cat $INSTALLROOT$SITEPACKAGES/wx.pth` popd @@ -334,10 +341,11 @@ This Installer package will install the wxPython $CHARTYPE runtime $VERSION for * The wxPython packages and modules * The wxWidgets shared libraries and headers + * Some command line tool scripts, installed to /usr/local/bin. You must install onto your current boot disk, eventhough the installer does not enforce this, otherwise things will not work. -You can install more than one version of the wxPython runtime if you desire. You also need to install one instance of the wxPython-common package, which will determine which of the installed runtimes will be the default. +You can install more than one version of the wxPython runtime if you desire. The most recently installed version will be the default wxPython, but you can choose another by setting the PYTHONPATH or by using the wxversion module. See http://wiki.wxpython.org/index.cgi/MultiVersionInstalls for more details. Build date: `date` EOF @@ -389,35 +397,6 @@ EOF rm $RESOURCEDIR/Welcome.txt - #----------------------------------------------- - # The common files package - - # Make the welcome message - cat > $RESOURCEDIR/Welcome.txt < "$DMGROOT/README 1st.txt" <