X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec656cfe29e03ea8dc86a7580cc5c26aaa8f1ad0..f8c88923b051ea51cb08369055f195ecb7e44e35:/wxPython/distrib/mac/wxPythonOSX/build diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build index 5fde334e1d..bb766cb256 100755 --- a/wxPython/distrib/mac/wxPythonOSX/build +++ b/wxPython/distrib/mac/wxPythonOSX/build @@ -24,7 +24,7 @@ function usage { echo " skiptar Don't unpack the tarball" echo " use_cvs Use the CVS workspace instead of a tarfile" echo " skipconfig Don't run configure" - echo " skipbuild Don't build wxWindows or wxPython" + echo " skipbuild Don't build wxWidgets or wxPython" echo " skipinstall Don't do the installation step" echo " skipdmg Don't make the package or diskimage" echo " skipclean Don't do the cleanup at the end" @@ -70,8 +70,8 @@ PYPREFIX=`$PYTHON -c "import sys; print sys.exec_prefix"` PYLIB=$PYPREFIX/lib/python$PYVER SITEPACKAGES=$PYLIB/site-packages -SRCDIR=/stuff/Development/wxPython/dist/$VERSION -TARBALL=$SRCDIR/wxPythonSrc-$VERSION.tar.gz +TARBALLDIR=/stuff/Development/wxPython/dist/$VERSION +TARBALL=$TARBALLDIR/wxPythonSrc-$VERSION.tar.gz PREFIX=/usr/lib/wxPython-$VERSION BINPREFIX=/usr/bin @@ -86,7 +86,7 @@ INSTALLDEVEL=$TMPDIR/install-devel DMGDIR=$TMPDIR/dmg RESOURCEDIR=$PROGDIR/resources DESTDIR=$PWD/dist - +SRCROOT=$BUILDROOT/wxPythonSrc-$VERSION #---------------------------------------------------------------------- @@ -96,7 +96,10 @@ mkdir -p $BUILDROOT mkdir -p $INSTALLROOT #mkdir -p $INSTALLDEVEL rm -rf $DMGDIR -mkdir -p $DMGDIR/root +mkdir -p $DMGDIR/root/Apps +mkdir -p $DMGDIR/root/Docs +mkdir -p $DMGDIR/root/Samples + pushd $BUILDROOT @@ -148,32 +151,31 @@ cd $WXDIR/bld #---------------------------------------------------------------------- -# Configure wxWindows +# Configure wxWidgets if [ -z "$skipconfig" ]; then ../configure \ --prefix=$PREFIX \ --with-mac \ --disable-monolithic \ --with-opengl \ - --enable-geometry \ - --enable-optimise \ --enable-sound \ --enable-display \ + --enable-geometry \ --enable-precomp=no \ - \ - --with-libjpeg=builtin \ - --with-libpng=builtin \ - --with-libtiff=builtin \ - --with-zlib=builtin \ - \ --enable-debug_flag +## --enable-optimise \ +## --with-libjpeg=builtin \ +## --with-libpng=builtin \ +## --with-libtiff=builtin \ +## --with-zlib=builtin \ + fi -# Build wxWindows and wxPython +# Build wxWidgets and wxPython if [ -z "$skipbuild" ]; then - # Make wxWindows and some contribs + # Make wxWidgets and some contribs make make -C contrib/src/gizmos make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" @@ -205,7 +207,7 @@ fi #---------------------------------------------------------------------- if [ -z "$skipinstall" ]; then - # Install wxWindows + # Install wxWidgets cd $WXDIR/bld make prefix=$INSTALLROOT$PREFIX install make -C contrib/src/gizmos prefix=$INSTALLROOT$PREFIX install @@ -244,11 +246,11 @@ if [ -z "$skipinstall" ]; then cp $WXDIR/bld/contrib/utils/wxrc/wxrc $INSTALLROOT$BINPREFIX - # install the wxPython headers - cd $WXDIR/wxPython - cp -R include $INSTALLROOT$PREFIX - mkdir -p $INSTALLROOT$PREFIX/include/wx/wxPython/i_files - cp src/*.i $INSTALLROOT$PREFIX/include/wx/wxPython/i_files +# # install the wxPython headers +# cd $WXDIR/wxPython +# cp -R include $INSTALLROOT$PREFIX +# mkdir -p $INSTALLROOT$PREFIX/include/wx/wxPython/i_files +# cp src/*.i $INSTALLROOT$PREFIX/include/wx/wxPython/i_files # Set premissions for files in $INSTALLROOT @@ -346,27 +348,33 @@ Everything else here is optional and you can drag them out of the disk image and drop them whereever you want. You do need to install the above package before you can use any of the items below. - docs/ A few readmes, change log, etc. The full - documentation is downloadable separately. - - licence/ License docs. - - demo/ A copy of the wxPython demo source code, - just open the folder and run demo.py. - samples/ Several small sample applications that - demonstrate how to use wxPython. - - wxPython Demo An application bundle version of the demo. + Apps/wxPython Demo An application bundle version of the demo. (This has it's own copy of the sources within the bundle.) - XRCed An application for editing wxPython resource + Apps/XRCed An application for editing wxPython resource files (XRC files.) - PyCrust An application that provides an interactive + Apps/PyCrust An application that provides an interactive Python shell and also namespace inspectors. + + + Docs/wxDocsViewer An application that allows you to view the + wxWidgets documentation. + + Docs/licence License files. + + Docs/other A few readmes, change log, etc. + + + Samples/samples Several small sample applications that + demonstrate how to use wxPython. + + Samples/demo A copy of the wxPython demo source code, + just open the folder and run demo.pyw. + Happy Hacking! EOF @@ -374,21 +382,51 @@ EOF # file editing capabilities. - # license files, docs, etc. - cp -pR $WXDIR/wxPython/licence $DMGDIR/root - rm -rf $WXDIR/wxPython/docs/xml-raw - cp -pR $WXDIR/wxPython/docs $DMGDIR/root - rm -rf $DMGDIR/root/docs/bin + # wxDocs + pushd $BUILDROOT + tar xzvf $TARBALLDIR/wxPythonDocs-$VERSION.tar.gz + popd + + # Make an app to launch viewdocs.py + $PYTHONW $PROGDIR/../buildapp.py \ + --builddir=$DMGDIR/root/Docs \ + --name=wxDocsViewer \ + --mainprogram=$BUILDROOT/wxPython-$VERSION/docs/viewdocs.py \ + --iconfile=$PROGDIR/Info.icns \ + build - # Copy the demo and samples to the disk image - cp -pR $WXDIR/wxPython/demo $DMGDIR/root - cp -pR $WXDIR/wxPython/samples $DMGDIR/root - rm $DMGDIR/root/demo/b + cp $BUILDROOT/wxPython-$VERSION/docs/*.zip $DMGDIR/root/Docs/wxDocsViewer.app/Contents/Resources + cat > "$DMGDIR/root/Docs/README 1st.txt" <