disable debugreport option

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

diff --git a/wxPython/distrib/all/do-build-windows b/wxPython/distrib/all/do-build-windows
index 1b4547fb1cd3292c82af72769abdcee996b6b552..7e3a6ec2cd0f7b3aa39016c07dbb6665556998af 100755 (executable)
--- a/wxPython/distrib/all/do-build-windows
+++ b/wxPython/distrib/all/do-build-windows
@@ -89,6 +89,7 @@ s/wxUSE_POSTSCRIPT *0/wxUSE_POSTSCRIPT 1/g
 s/wxUSE_AFM_FOR_POSTSCRIPT *1/wxUSE_AFM_FOR_POSTSCRIPT 0/g
 s/wxUSE_DISPLAY *0/wxUSE_DISPLAY 1/g
 s/wxUSE_DIB_FOR_BITMAP *0/wxUSE_DIB_FOR_BITMAP 1/g
 s/wxUSE_AFM_FOR_POSTSCRIPT *1/wxUSE_AFM_FOR_POSTSCRIPT 0/g
 s/wxUSE_DISPLAY *0/wxUSE_DISPLAY 1/g
 s/wxUSE_DIB_FOR_BITMAP *0/wxUSE_DIB_FOR_BITMAP 1/g

+s/wxUSE_DEBUGREPORT *1/wxUSE_DEBUGREPORRT 0/g

 EOF
 cat $WXDIR/include/wx/msw/setup0.h | sed -f .my.sedexpr > $WXDIR/include/wx/msw/setup.h
 rm .my.sedexpr
 EOF
 cat $WXDIR/include/wx/msw/setup0.h | sed -f .my.sedexpr > $WXDIR/include/wx/msw/setup.h
 rm .my.sedexpr

diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index ceaee33a99e5b9551750bf2292efbca5d2773cea..fbe9a17c1e03df5aa1b2d84d48fa6ef0c416b0c7 100755 (executable)
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -218,6 +218,7 @@ if [ $skipconfig != yes ]; then
        --enable-debug_flag \
        --enable-precomp=no \
        --enable-optimise \
        --enable-debug_flag \
        --enable-precomp=no \
        --enable-optimise \

+       --disable-debugreport \

        $UNICODEOPT $OTHER_CFG_OPTS
 
 fi
        $UNICODEOPT $OTHER_CFG_OPTS
 
 fi

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 895803273a3d31350b8ae5e17653dbdcba4e6f4c..4ba8616a74bb22b57c3beea4ad916e023142bfdc 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -201,6 +201,7 @@ cd bld
 %if %{debug_flag}
        --enable-debug_flag \
 %endif
 %if %{debug_flag}
        --enable-debug_flag \
 %endif

+       --disable-debugreport \

 %if %{builtin_libs}
        --with-libjpeg=builtin \
        --with-libpng=builtin \
 %if %{builtin_libs}
        --with-libjpeg=builtin \
        --with-libpng=builtin \

diff --git a/wxPython/docs/BUILD.txt b/wxPython/docs/BUILD.txt
index 5b33e6f3ee98785d8bb539ddb2e0d125b7a751cd..71dc543275665f95766b789a6bd46341933eb7ac 100644 (file)
--- a/wxPython/docs/BUILD.txt
+++ b/wxPython/docs/BUILD.txt
@@ -71,7 +71,7 @@ place, then do the same for wxPython.
    rerun the script without having to remember the options I used
    before::
 
    rerun the script without having to remember the options I used
    before::
 

-        cd $WXDIR
+         cd $WXDIR

          mkdir bld
          cd bld
          ../configure --prefix=/opt/wx/2.5 \
          mkdir bld
          cd bld
          ../configure --prefix=/opt/wx/2.5 \


@@ -81,6 +81,7 @@ place, then do the same for wxPython.
                       --enable-geometry \
                       --enable-sound --with-sdl \
                       --enable-display \
                       --enable-geometry \
                       --enable-sound --with-sdl \
                       --enable-display \

+                      --disable-debugreport \

                       
 
    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


@@ -94,13 +95,13 @@ place, then do the same for wxPython.
    suits you on Linux and etc. but use monolithic on OSX.  To switch
    to the monolithic build of wxWidgets just add this configure flag::
 
    suits you on Linux and etc. but use monolithic on OSX.  To switch
    to the monolithic build of wxWidgets just add this configure flag::
 

-                    --enable-monolithic \
+                     --enable-monolithic \

 
    By default GTK2 will be selected if its development pacakge is
    installed on your build system.  To force the use of GTK 1.2.x
    instead add this flag::
 
 
    By default GTK2 will be selected if its development pacakge is
    installed on your build system.  To force the use of GTK 1.2.x
    instead add this flag::
 

-                     --disable-gtk2 \
+                      --disable-gtk2 \

 
    To make the wxWidgets build be unicode enabled (strongly
    recommended if you are building with GTK2) then add the following.
 
    To make the wxWidgets build be unicode enabled (strongly
    recommended if you are building with GTK2) then add the following.


@@ -191,7 +192,7 @@ place, then do the same for wxPython.
    GTK2.  If you built wxWidgets to use GTK 1.2.x then you should add
    this flag to the command-line::
 
    GTK2.  If you built wxWidgets to use GTK 1.2.x then you should add
    this flag to the command-line::
 

-        WXPORT=gtk 
+         WXPORT=gtk 

 
    If you would like to do a Unicode enabled build (all strings sent
    to or retruned from wx functions are Unicode objects) and your
 
    If you would like to do a Unicode enabled build (all strings sent
    to or retruned from wx functions are Unicode objects) and your


@@ -291,10 +292,10 @@ differently.
 
 The \*.btm files are for 4NT and the others are for bash.  They are::
 
 
 The \*.btm files are for 4NT and the others are for bash.  They are::
 

-   .make/.make.btm       Builds the main lib and the needed contribs
-   .mymake/.mymake.btm   Builds just one lib, use by .make
-   .makesetup.mk         A makefile that will copy and edit setup.h
-                         as needed for the different types of builds
+   .make/.make.btm        Builds the main lib and the needed contribs
+   .mymake/.mymake.btm    Builds just one lib, use by .make
+   .makesetup.mk          A makefile that will copy and edit setup.h
+                          as needed for the different types of builds

 
 Okay.  Here's what you've been waiting for, the instructions!  Adapt
 accordingly if you are using the bash shell.
 
 Okay.  Here's what you've been waiting for, the instructions!  Adapt
 accordingly if you are using the bash shell.


@@ -320,6 +321,7 @@ accordingly if you are using the bash shell.
          wxUSE_POSTSCRIPT               1
          wxUSE_AFM_FOR_POSTSCRIPT       0
          wxUSE_DISPLAY                  1
          wxUSE_POSTSCRIPT               1
          wxUSE_AFM_FOR_POSTSCRIPT       0
          wxUSE_DISPLAY                  1

+         wxUSE_DEBUGREPORT              0

 
    If you are using my build scripts then a few more settings will be
    changed and then a copy of setup.h is placed in a subdir of
 
    If you are using my build scripts then a few more settings will be
    changed and then a copy of setup.h is placed in a subdir of


@@ -327,7 +329,7 @@ accordingly if you are using the bash shell.
    UNICODE build, then also change these::
 
          wxUSE_UNICODE                  1
    UNICODE build, then also change these::
 
          wxUSE_UNICODE                  1

-        wxUSE_UNICODE_MSLU             1
+         wxUSE_UNICODE_MSLU             1

 
    If you are doing a "hybrid" build (which is the same as the
    binaries that I release) then also change these::
 
    If you are doing a "hybrid" build (which is the same as the
    binaries that I release) then also change these::


@@ -343,7 +345,7 @@ accordingly if you are using the bash shell.
 
 5. Change to the %WXDIR%\\build\\msw directory 
 
 
 5. Change to the %WXDIR%\\build\\msw directory 
 

-        cd %WXDIR%\\build\\msw
+         cd %WXDIR%\\build\\msw

 
 
 6. If using my scripts then use the .make.btm command to build
 
 
 6. If using my scripts then use the .make.btm command to build


@@ -371,7 +373,7 @@ accordingly if you are using the bash shell.
    executing nmake with a bunch of extra command line parameters.
    The base set are::
 
    executing nmake with a bunch of extra command line parameters.
    The base set are::
 

-       -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=1 USE_OPENGL=1
+        -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=1 USE_OPENGL=1

 
    If doing a debug build then add::
 
 
    If doing a debug build then add::
 


@@ -390,8 +392,8 @@ accordingly if you are using the bash shell.
    same command from the following directories in order to build the
    contrib libraries::
 
    same command from the following directories in order to build the
    contrib libraries::
 

-       %WXDIR%\contrib\build\gizmos
-       %WXDIR%\contrib\build\stc
+        %WXDIR%\contrib\build\gizmos
+        %WXDIR%\contrib\build\stc

 
 
 7.  When that is all done it will have built the main wxWidgets DLLs
 
 
 7.  When that is all done it will have built the main wxWidgets DLLs


@@ -442,7 +444,7 @@ accordingly if you are using the bash shell.
    PYTHONPATH to the wxPython dir in the CVS tree.  For example::
 
         set PYTHONPATH=%WXDIR%\wxPython
    PYTHONPATH to the wxPython dir in the CVS tree.  For example::
 
         set PYTHONPATH=%WXDIR%\wxPython

-       cd %WXDIR\wxPython\demo
+        cd %WXDIR\wxPython\demo

         python demo.py
 
 
         python demo.py