Some build/distrib tweaks

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

diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index c88d207a9c58dd2e289635404bbc64ad3e081e16..ccb1f5bb9eaf2aca1acc655bf5f1d7c97ecc75c6 100755 (executable)
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -150,6 +150,7 @@ if [ -z "${skipcvs}" ]; then
 #     rm -rf src/motif
 #     rm -rf src/os2
     rm -rf wxPython/wxSWIG
 #     rm -rf src/motif
 #     rm -rf src/os2
     rm -rf wxPython/wxSWIG

+    rm -rf wxPython/tests

 
     popd > /dev/null
     popd > /dev/null
 
     popd > /dev/null
     popd > /dev/null

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index fd59fa9fc95fe6d1cb116a2a6944a215f8d16d19..5864b5a0fd49ccbf0bb17d77477238e376c428db 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -38,7 +38,7 @@ Release:   %{release}
 Source0:   %{tarname}-%{version}.tar.gz
 License:   wxWindows Library Licence, Version 3
 URL:       http://wxPython.org/
 Source0:   %{tarname}-%{version}.tar.gz
 License:   wxWindows Library Licence, Version 3
 URL:       http://wxPython.org/

-Packager:  Robin Dunn <robind@alldunn.com>
+Packager:  Robin Dunn <robin@alldunn.com>

 Group:     Development/Python
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Prefix:    %{pref}
 Group:     Development/Python
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Prefix:    %{pref}


@@ -153,7 +153,7 @@ cd wxPython
 
 #----------------------------------------------------------------
 %clean
 
 #----------------------------------------------------------------
 %clean

-#[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

 
 
 #----------------------------------------------------------------
 
 
 #----------------------------------------------------------------

diff --git a/wxPython/setup.py b/wxPython/setup.py
index d1f624e9a88c307328bd6ba001d1cbe962cff744..31c02aa5c096bdccd0442a6f96a0014a16555045 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -311,6 +311,9 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin":
     cflags = string.split(cflags)
     if UNDEF_NDEBUG:
         cflags.append('-UNDEBUG')
     cflags = string.split(cflags)
     if UNDEF_NDEBUG:
         cflags.append('-UNDEBUG')

+    if debug:
+        cflags.append('-g')
+        cflags.append('-O0')

 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = string.split(lflags)
 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = string.split(lflags)


@@ -338,6 +341,9 @@ elif os.name == 'posix':
     cflags = string.split(cflags)
     if UNDEF_NDEBUG:
         cflags.append('-UNDEBUG')
     cflags = string.split(cflags)
     if UNDEF_NDEBUG:
         cflags.append('-UNDEBUG')

+    if debug:
+        cflags.append('-g')
+        cflags.append('-O0')

 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = string.split(lflags)
 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = string.split(lflags)