Build and distrib tweaks

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

wxPython/distrib/makerpm

@@ -54,6 +54,7 @@ version=$2
 pyver=$3
 shift;shift;shift
 
+ver2=`echo ${version} | cut -c 1,2,3`
 tarver=${tarname}-${version}
 
 
@@ -74,6 +75,7 @@ function makespec {
 	| sed s:@LCPORT@:${lcport}:g \
 	| sed s:@TARNAME@:${tarname}:g \
 	| sed s:@VERSION@:${version}:g \
+	| sed s:@VER2@:${ver2}:g \
 	> ${distdir}/wxPython${port}.spec
 }
 
@@ -137,6 +139,8 @@ if [ -z "${skipcvs}" ]; then
     rm *.spec
     rm -rf demos
 #    rm -rf docs
+    rm -rf docs/html
+    rm -rf docs/latex
     rm -rf samples
     rm -rf utils
 #     rm -rf include/wx/mgl

wxPython/distrib/wxPythonFull.spec.in

@@ -6,10 +6,14 @@
 %define lcport 	@LCPORT@
 %define tarname @TARNAME@
 %define version @VERSION@
-%define ver2    2.3
+%define ver2    @VER2@
 %define release 1
 %define wxpref  %{pref}/lib/wxPython
 
+# Should --enable-debug_flag be used in release builds?
+%define debug_flag 1
+
+
 %if %{debug}
     %define name      wxPython%{port}-py%{pyver}-dbg
     %define othername wxPython%{port}-py%{pyver}
@@ -19,6 +23,13 @@
 %endif
 
 
+%if %{debug} || %{debug_flag}
+    %define wxconfigname %{wxpref}/bin/wx%{lcport}d-%{ver2}-config
+%else
+    %define wxconfigname %{wxpref}/bin/wx%{lcport}-%{ver2}-config
+%endif
+
+
 #----------------------------------------------------------------
 Summary:   Cross platform GUI toolkit for Python using wx%{port}
 Name:      %{name}
@@ -91,6 +102,9 @@ cd build
 	--enable-debug \
 %else
 	--enable-optimise \
+%if %{debug_flag}
+	--enable-debug_flag \
+%endif
 %endif
 	--with-libjpeg=builtin \
 	--with-libpng=builtin \
@@ -127,7 +141,6 @@ cd ../wxPython
 
 #----------------------------------------------------------------
 %install
-## ** [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 %find_lang wxstd
 cd wxPython
 %{python} setup.py \
@@ -166,18 +179,14 @@ cd wxPython
 %{wxpref}/lib/libwx*
 %{pref}/lib/python*
 %{wxpref}/share/
-
+%{pref}/bin/*
 
 
 %files devel
 %defattr(-,root,root)
 %{wxpref}/include/wx
 %{wxpref}/lib/wx
-%if %{debug}
+%{wxconfigname}
-    %{wxpref}/bin/wx%{lcport}d-%{ver2}-config
-%else
-    %{wxpref}/bin/wx%{lcport}-%{ver2}-config
-%endif
 %{wxpref}/bin/wx-config
 
 

wxPython/setup.py

@@ -873,14 +873,21 @@ if not GL_ONLY and BUILD_DLLWIDGET:
 # Tools and scripts
 #----------------------------------------------------------------------
 
-TOOLS = [("wxPython/tools",        glob.glob("tools/*.py")),
+## TOOLS = [("wxPython/tools",        glob.glob("tools/*.py")),
-         ("wxPython/tools/XRCed",  glob.glob("tools/XRCed/*.py") +
+##          ("wxPython/tools/XRCed",  glob.glob("tools/XRCed/*.py") +
-                                   glob.glob("tools/XRCed/*.xrc") +
+##                                    glob.glob("tools/XRCed/*.xrc") +
-                                   ["tools/XRCed/CHANGES",
+##                                    ["tools/XRCed/CHANGES",
-                                    "tools/XRCed/TODO",
+##                                     "tools/XRCed/TODO",
-                                    "tools/XRCed/README"]),
+##                                     "tools/XRCed/README"]),
-         ]
+##          ]
 
+SCRIPTS = ['scripts/img2png',
+           'scripts/img2xpm',
+           'scripts/img2py',
+           'scripts/xrced',
+           'scripts/pyshell',
+           'scripts/pycrust',
+           ],
 
 
 
@@ -915,13 +922,7 @@ if __name__ == "__main__":
 
               ##data_files = TOOLS,
 
-              scripts = ['scripts/img2png',
+              scripts = SCRIPTS,
-                         'scripts/img2xpm',
-                         'scripts/img2py',
-                         'scripts/xrced',
-                         'scripts/pyshell',
-                         'scripts/pycrust',
-                         ],
               )
 
     else: