'[1219035] cleanup: miscellaneous' and minor source cleaning.

[wxWidgets.git] / wxPython / docs / BUILD.txt

diff --git a/wxPython/docs/BUILD.txt b/wxPython/docs/BUILD.txt
index 7fe299fef0dae6774e11fc33cde373c23dcc6b04..a65dfc43ca4cfe9e23e70d9531bf034ca90355a9 100644 (file)
--- a/wxPython/docs/BUILD.txt
+++ b/wxPython/docs/BUILD.txt
@@ -1,11 +1,11 @@
-Building wxPython 2.5 for Development and Testing
+Building wxPython 2.6 for Development and Testing

 =================================================
 
 This file describes how I build wxWidgets and wxPython while doing
 development and testing, and is meant to help other people that want
 to do the same thing.  I'll assume that you are using either a CVS
 snapshot from http://wxWidgets.org/snapshots/, a checkout from CVS, or
 =================================================
 
 This file describes how I build wxWidgets and wxPython while doing
 development and testing, and is meant to help other people that want
 to do the same thing.  I'll assume that you are using either a CVS
 snapshot from http://wxWidgets.org/snapshots/, a checkout from CVS, or

-one of the released wxPython-src-2.5.* tarballs.  I'll also assume that
+one of the released wxPython-src-2.6.* tarballs.  I'll also assume that

 you know your way around your system, the compiler, etc. and most
 importantly, that you know what you are doing!  ;-)
 
 you know your way around your system, the compiler, etc. and most
 importantly, that you know what you are doing!  ;-)
 


@@ -74,8 +74,9 @@ place, then do the same for wxPython.
          cd $WXDIR
          mkdir bld
          cd bld
          cd $WXDIR
          mkdir bld
          cd bld

-         ../configure --prefix=/opt/wx/2.5 \
+         ../configure --prefix=/opt/wx/2.6 \

                       --with-gtk \
                       --with-gtk \

+                     --with-gnomeprint \

                       --with-opengl \
                       --enable-debug \
                       --enable-geometry \
                       --with-opengl \
                       --enable-debug \
                       --enable-geometry \


@@ -85,7 +86,7 @@ place, then do the same for wxPython.
                       
 
    On OS X of course you'll want to use --with-mac instead of
                       
 
    On OS X of course you'll want to use --with-mac instead of

-   --with-gtk.  
+   --with-gtk and --with-gnomeprint.  

 
    **NOTE**: Due to a recent change there is currently a dependency
    problem in the multilib builds of wxWidgets on OSX, so I have
 
    **NOTE**: Due to a recent change there is currently a dependency
    problem in the multilib builds of wxWidgets on OSX, so I have


@@ -97,7 +98,7 @@ place, then do the same for wxPython.
 
                      --enable-monolithic \
 
 
                      --enable-monolithic \
 

-   By default GTK 2.x will be used for the build.  If you woudl rather
+   By default GTK 2.x will be used for the build.  If you would rather

    use GTK 1.2.x for some reason then you can force configure to use
    it by changing the --with-gtk flag to specify it like this::
 
    use GTK 1.2.x for some reason then you can force configure to use
    it by changing the --with-gtk flag to specify it like this::
 


@@ -112,14 +113,14 @@ place, then do the same for wxPython.
                          
                       --enable-unicode \
 
                          
                       --enable-unicode \
 

-   Notice that I used a prefix of /opt/wx/2.5.  You can use whatever
+   Notice that I used a prefix of /opt/wx/2.6.  You can use whatever

    path you want, such as a path in your HOME dir or even one of the
    standard prefix paths such as /usr or /usr/local if you like, but
    using /opt this way lets me easily have multiple versions and ports
    of wxWidgets "installed" and makes it easy to switch between them,
    without impacting any versions of wxWidgets that may have been
    installed via an RPM or whatever.  For the rest of the steps below
    path you want, such as a path in your HOME dir or even one of the
    standard prefix paths such as /usr or /usr/local if you like, but
    using /opt this way lets me easily have multiple versions and ports
    of wxWidgets "installed" and makes it easy to switch between them,
    without impacting any versions of wxWidgets that may have been
    installed via an RPM or whatever.  For the rest of the steps below

-   be sure to also substitute "/opt/wx/2.5" with whatever prefix you
+   be sure to also substitute "/opt/wx/2.6" with whatever prefix you

    choose for your build.
 
    If you want to use the image and zlib libraries included with
    choose for your build.
 
    If you want to use the image and zlib libraries included with


@@ -152,9 +153,9 @@ place, then do the same for wxPython.
          .make install
 
    When it's done you should have an installed set of files under
          .make install
 
    When it's done you should have an installed set of files under

-   /opt/wx/2.5 containing just wxWidgets.  Now to use this version of
-   wxWidgets you just need to add /opt/wx/2.5/bin to the PATH and set
-   LD_LIBRARY_PATH (or DYLD_LIBRARY_PATH on OS X) to /opt/wx/2.5/lib.
+   /opt/wx/2.6 containing just wxWidgets.  Now to use this version of
+   wxWidgets you just need to add /opt/wx/2.6/bin to the PATH and set
+   LD_LIBRARY_PATH (or DYLD_LIBRARY_PATH on OS X) to /opt/wx/2.6/lib.

 
 
 3. I also have a script to help me build wxPython and it is checked in
 
 
 3. I also have a script to help me build wxPython and it is checked in


@@ -187,7 +188,7 @@ place, then do the same for wxPython.
    other version of it found first, then you can add this to the
    command line to ensure your new one is used instead::
 
    other version of it found first, then you can add this to the
    command line to ensure your new one is used instead::
 

-         WX_CONFIG=/opt/wx/2.5/bin/wx-config
+         WX_CONFIG=/opt/wx/2.6/bin/wx-config

 
    By default setup.py will assume that you built wxWidgets to use
    GTK2.  If you built wxWidgets to use GTK 1.2.x then you should add
 
    By default setup.py will assume that you built wxWidgets to use
    GTK2.  If you built wxWidgets to use GTK 1.2.x then you should add


@@ -222,7 +223,7 @@ place, then do the same for wxPython.
    PYTHONPATH to the wxPython dir located in the source tree.  For
    example::
 
    PYTHONPATH to the wxPython dir located in the source tree.  For
    example::
 

-        export LD_LIBRARY_PATH=/opt/wx/2.5/lib
+        export LD_LIBRARY_PATH=/opt/wx/2.6/lib

         export PYTHONPATH=$WXDIR/wxPython
         cd $WXDIR/wxPython/demo
         python2.3 demo.py
         export PYTHONPATH=$WXDIR/wxPython
         cd $WXDIR/wxPython/demo
         python2.3 demo.py


@@ -239,7 +240,7 @@ place, then do the same for wxPython.
    SOLARIS NOTE: If you get unresolved symbol errors when importing
    wxPython and you are running on Solaris and building with gcc, then
    you may be able to work around the problem by uncommenting a bit of
    SOLARIS NOTE: If you get unresolved symbol errors when importing
    wxPython and you are running on Solaris and building with gcc, then
    you may be able to work around the problem by uncommenting a bit of

-   code in setup.py and building again.  Look for 'SunOS' in setup.py
+   code in config.py and building again.  Look for 'SunOS' in config.py

    and uncomment the block containing it.  The problem is that Sun's ld
    does not automatically add libgcc to the link step.
 
    and uncomment the block containing it.  The problem is that Sun's ld
    does not automatically add libgcc to the link step.