Updated build instructions and etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/BUILD.osx.txt

@@ -1,11 +1,11 @@
 Building wxPython on Mac OS X
 -----------------------------
 
-NOTE:  OS X support is HIGHLY EXPERIMENTAL at this time.  Most things
+NOTE:  OS X support is EXPERIMENTAL at this time.  Most things are
-       are working now, but a few still don't.  I know about most of
+       working now, but a few still don't.  I know about most of them
-       them and am addressing them as I have time.  If you have any
+       and am addressing them as I have time.  If you have any ideas
-       ideas about a fix for the stuff that's still broken then
+       about a fix for the stuff that's still broken then please
-       please persue them and send the fixes to me.
+       persue them and send the fixes to me.
 
 
 These are the steps I have used for building wxPython on Mac OS X 10.1
@@ -14,13 +14,14 @@ that you know your way around a command line and that you know how to
 get things from various CVS repositories as needed.
 
 
-1. Python 2.2 is required.  There is a disk image with an installer
+1. "MachoPython" 2.2 is required.  There is a disk image with an
-   package in the wxPython Sourceforge download area, in this group:
+   installer package in the wxPython Sourceforge download area, in
+   this group:
 
    http://sourceforge.net/project/showfiles.php?group_id=10718&release_id=84730
 
    If, for some reason you need to build your own Python, get the
-   source from www.python.org and follow theinstructions in the
+   source from www.python.org and follow the instructions in the
    Mac/OSX/README file to build and install Python.app and the
    Python.framework.
 
@@ -33,8 +34,8 @@ get things from various CVS repositories as needed.
         sudo ln -s python2.2 python
 
    Also, if you create a /usr/local/bin/pythonw script like the
-   following then you can run Python GUI apps (like wxPython) directly
+   following then you can run Python GUI apps (like wxPython apps)
-   from the command line:
+   directly from the command line:
 
        #!/bin/sh
        exec /Applications/Python.app/Contents/MacOS/python $@
@@ -45,13 +46,15 @@ get things from various CVS repositories as needed.
 
    If you would like to make a MachoPython installer from what you
    built then you may want to look at the scripts I use to do it
-   located in wxPython/distrib/mac/buildPython.
+   located in wxPython/distrib/mac/buildPython in CVS.
 
    One last thing, make sure that /usr/local/bin is in your PATH
    environment variable.
 
 
-2. In a wxWindows CVS tree make a build directory.
+2. In a wxWindows CVS tree make a build directory.  (You can also use
+   a CVS snapshot located in http://wxwindows.org/snapshots/ or the
+   released wxPythonSrc-*.tr.gz archive.)
 
 	cd ~/proj/wxWindows	# or wherever you put it
 	mkdir build

wxPython/BUILD.unix.txt

@@ -249,7 +249,9 @@ C. Change to the root wxPython directory and look at the setup.py
 		       and shadow python files.
 
 	   IN_CVS_TREE If you are using the CVS version of the
-		       wxWindows and wxPython sources then you will
+		       wxWindows and wxPython sources, or a combined
+		       source archive from the CVS snapshots or the
+		       distributed wxPythonSrc-*.tar.gz then you will
 		       need to set this flag to non-zero.  This is
 		       needed because some source files from the
 		       wxWindows tree are copied to be under the
@@ -257,9 +259,6 @@ C. Change to the root wxPython directory and look at the setup.py
 		       With this flag set then setup.py will
 		       automatically keep these copied sources up to
 		       date if the original version is ever updated.
-		       If you are using the tar.gz version of the
-		       Python sources then these copied sources are
-		       already present in your source tree.
 
 
 D. To build and install wxPython you simply need to execute the

wxPython/BUILD.win32.txt

@@ -247,7 +247,9 @@ B. Change to the root wxPython directory and look at the setup.py
                        and shadow python files.
 
 	   IN_CVS_TREE If you are using the CVS version of the
-                       wxWindows and wxPython sources then you will
+		       wxWindows and wxPython sources, or a combined
+		       source archive from the CVS snapshots or the
+		       distributed wxPythonSrc-*.tar.gz then you will
 		       need to set this flag to non-zero.  This is
 		       needed because some source files from the
 		       wxWindows tree are copied to be under the
@@ -255,9 +257,6 @@ B. Change to the root wxPython directory and look at the setup.py
 		       With this flag set then setup.py will
 		       automatically keep these copied sources up to
 		       date if the original version is ever updated.
-                       If you are using the tar.gz version of the
-                       Python sources then these copied sources are
-                       already present in your source tree.
 
 
 C. To build and install wxPython you simply need to execute the

wxPython/distrib/README.1st.txt

@@ -0,0 +1,83 @@
+README for wxPythonSrc-*.tar.gz
+-------------------------------
+
+Prior to version 2.3.3 of wxPython I had always made my Linux/Unix
+binaries based on the released binary of wxGTK and wxGTK-gl.  This
+imposed a few restrictions and so starting with 2.3.3 I have decided
+to do a combined binary that inlcudes wxGTK as well as wxPython.  This
+allows me a bit more flexibility and is consistent with how the
+Windows and Mac OS X binaries are built.
+
+If you are reading this file then you are probably interested in
+building your own copy of wxPython from the sources contained in this
+file.  If you wish to use the released wxGTK binary as has been done
+in the past then you can still follow the old build directions in
+wxPython/BUILD.unix.txt.  If you are building for Windows or Mac OS X
+then you should look at BUILD.win32.txt or BUILD.osx.txt respectivly.
+In all these cases you should use the IN_CVS_TREE=1 flag since this
+archive is really just a modified CVS snapshot.
+
+If, on the other hand, you would like to build Linux/Unix binaries
+with a private copy of wxGTK like what I am now distributing then
+you'll want to follow the instructions in this file.
+
+Clear as mud?  Good.  Let's get started.
+
+
+1. We'll be making a private copy of wxGTK so it doesn't conflict with
+   one used by wxGTK C++ apps that expect to have the default binary
+   installed from RPM or whatever.  I put it in /usr/lib/wxPython, but
+   you can use whatever you like.  I'll just set a variable to our wx
+   prefix to reference later:
+
+	export WXPREF=/usr/lib/wxPython
+
+
+2. Make a build directory and configure wxGTK.
+
+	cd wxPythonGTK-2.3.3   # or whatever the top-level dir is
+	mkdir build
+	cd build
+	../configure --with-gtk \
+		     --prefix=$WXPREF \
+		     --enable-rpath=$WXPREF/lib \
+		     --with-opengl \
+		     --enable-optimise \
+		     --enable-debug_flag \
+		     -with-libjpeg=builtin \
+		     --with-libpng=builtin \
+		     --with-libtiff=builtin \
+		     --with-zlib=builtin
+
+   You may want to use --enable-debug instead of --enable-optimise if
+   you need to run though a debugger and want full debugging symbols.
+
+
+3. Build and install wxGTK.  (You may need to be root for the last
+   step, depending on where your WXPREF is.)
+
+	make
+	cd ../locale
+	make allmo
+	cd ../build
+	make install
+
+4. Build and install wxPython.  If you want to use a different version
+   of Python than is found by default on the PATH then specify the
+   whole pathname in these steps.  The version of Python that runs
+   setup.py is the version wxPython will be built and installed for.
+   (You will need to be root for the install step unless your Python
+   is not in a system location.)
+
+	cd ../wxPython
+	python setup.py \
+	       IN_CVS_TREE=1 WX_CONFIG=$WXPREF/bin/wx-config \
+	       build install
+
+5. That's all!
+
+--
+Robin Dunn
+Software Craftsman
+http://wxPython.org  Java give you jitters?  Relax with wxPython!
+

wxPython/distrib/makerpm

@@ -172,6 +172,7 @@ cp ${distdir}/wxPython${port}.spec ${builddir}/${tarver}/wxPython${port}.spec
 
 if [ -z "${skiptar}" ]; then
     echo "*** Creating tarball..."
+    cp distrib/README.1st.txt ${builddir}/${tarver}
     pushd ${builddir} > /dev/null
     tar cvf ${distdir}/${tarver}.tar ${tarver} > /dev/null
     echo "*** Compressing..."