More packager scripts updates. The RPMs will now install icons and

menu items, etc.

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

diff --git a/wxPython/distrib/PyAlaMode.desktop b/wxPython/distrib/PyAlaMode.desktop
new file mode 100644 (file)
index 0000000..0fa93ab
--- /dev/null
+++ b/wxPython/distrib/PyAlaMode.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=PyAlaMode
+Comment=GUI Python Shell with Filling and editor windows
+Exec=pyalamode
+Icon=PyCrust.png
+Terminal=false
+Type=Application
+Categories=Application;Development;

diff --git a/wxPython/distrib/PyCrust.desktop b/wxPython/distrib/PyCrust.desktop
new file mode 100644 (file)
index 0000000..73f7a83
--- /dev/null
+++ b/wxPython/distrib/PyCrust.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=PyCrust
+Comment=GUI Python Shell with Filling
+Exec=pycrust
+Icon=PyCrust.png
+Terminal=false
+Type=Application
+Categories=Application;Development;

diff --git a/wxPython/distrib/PyShell.desktop b/wxPython/distrib/PyShell.desktop
new file mode 100644 (file)
index 0000000..bbf4486
--- /dev/null
+++ b/wxPython/distrib/PyShell.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=PyShell
+Comment=GUI Python Shell
+Exec=pyshell
+Icon=PyCrust.png
+Terminal=false
+Type=Application
+Categories=Application;Development;

diff --git a/wxPython/distrib/XRCed.desktop b/wxPython/distrib/XRCed.desktop
new file mode 100644 (file)
index 0000000..1abc590
--- /dev/null
+++ b/wxPython/distrib/XRCed.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=XRCed
+Comment=wxPython XRC resource editor
+Exec=xrced
+Icon=XRCed.png
+Terminal=false
+Type=Application
+Categories=Application;Development;

diff --git a/wxPython/distrib/makedemo b/wxPython/distrib/makedemo
index af2983ee31b4718fdd85dd2a3054730724dca409..52bf91775bca11214f8362a735aa1af23ee48059 100755 (executable)
--- a/wxPython/distrib/makedemo
+++ b/wxPython/distrib/makedemo
@@ -1,37 +1,35 @@
 #!/bin/bash
 #----------------------------------------------------------------------
 
-if [ -z $1 ]; then
-    echo "Please specify a version number on the command line."
-    exit 1
-fi
-
 if [ ! -d wxPython ]; then
     echo "Please run this script from the root wxPython directory."
     exit 1
 fi
 
+VERSION=`python -c "import setup;print setup.VERSION"`
+
 mkdir _distrib_tgz
-mkdir _distrib_tgz/wxPython-$1
+mkdir _distrib_tgz/wxPython-$VERSION
 
-cp -R demo _distrib_tgz/wxPython-$1
-cp -R samples _distrib_tgz/wxPython-$1
+cp -R demo _distrib_tgz/wxPython-$VERSION
+cp -R samples _distrib_tgz/wxPython-$VERSION
 
 # do some cleanup
-rm -rf `find _distrib_tgz/wxPython-$1 -name CVS`
-rm -f `find  _distrib_tgz/wxPython-$1 -name "*.pyc"`
-rm -f `find  _distrib_tgz/wxPython-$1 -name .cvsignore`
-rm -f `find  _distrib_tgz/wxPython-$1 -name "core*"`
-rm -f `find  _distrib_tgz/wxPython-$1 -name wxPython`
-rm -f `find  _distrib_tgz/wxPython-$1 -name "*.o"`
-rm -f `find  _distrib_tgz/wxPython-$1 -name "*.so"`
-rm -f `find  _distrib_tgz/wxPython-$1 -name "*~"`
-rm -f `find  _distrib_tgz/wxPython-$1 -name ".#*"`
+rm -rf `find _distrib_tgz/wxPython-$VERSION -name CVS`
+rm -f `find  _distrib_tgz/wxPython-$VERSION -name "*.pyc"`
+rm -f `find  _distrib_tgz/wxPython-$VERSION -name .cvsignore`
+rm -f `find  _distrib_tgz/wxPython-$VERSION -name "core.[0-9]*"`
+rm -f `find  _distrib_tgz/wxPython-$VERSION -name "core"`
+rm -f `find  _distrib_tgz/wxPython-$VERSION -name wxPython`
+rm -f `find  _distrib_tgz/wxPython-$VERSION -name "*.o"`
+rm -f `find  _distrib_tgz/wxPython-$VERSION -name "*.so"`
+rm -f `find  _distrib_tgz/wxPython-$VERSION -name "*~"`
+rm -f `find  _distrib_tgz/wxPython-$VERSION -name ".#*"`
 
 cd _distrib_tgz
 
-tar cvf ../dist/wxPythonDemo-$1.tar wxPython-$1
-gzip -9 ../dist/wxPythonDemo-$1.tar
+tar cvf ../dist/wxPythonDemo-$VERSION.tar wxPython-$VERSION
+gzip -9 ../dist/wxPythonDemo-$VERSION.tar
 
 cd ..
 rm -r _distrib_tgz

diff --git a/wxPython/distrib/makedocs b/wxPython/distrib/makedocs
index db6d2a085e8dfa341f2733bdf53dcc36717a49b0..2677728d4a21fbf4a4e4a802f5394df0fe8ef6ed 100755 (executable)
--- a/wxPython/distrib/makedocs
+++ b/wxPython/distrib/makedocs
@@ -2,23 +2,17 @@
 
 #----------------------------------------------------------------------
 
-if [ -z $1 ]; then
-    echo "Please specify a version number on the command line."
-    exit 1
-fi
-
 if [ ! -d wxPython ]; then  # TODO: make this test more robust
     echo "Please run this script from the root wxPython directory."
     exit 1
 fi
 
 
+VERSION=`python -c "import setup;print setup.VERSION"`
 CONTRIBS="ogl gizmos"
+DEST=wxPython-$VERSION/docs
 
 # **** Make a directory to build up a distribution tree
-
-DEST=wxPython-$1/docs
-
 mkdir -p _build_docs/$DEST
 cd _build_docs
 mkdir $DEST/wx
@@ -60,9 +54,9 @@ popd
 cp ../distrib/viewdocs.py $DEST
 cp ../distrib/README.viewdocs.txt $DEST/README.txt
 
-rm -f ../dist/wxPythonDocs-$1.tar.gz
-tar cvf ../dist/wxPythonDocs-$1.tar $DEST
-gzip -9 ../dist/wxPythonDocs-$1.tar
+rm -f ../dist/wxPythonDocs-$VERSION.tar.gz
+tar cvf ../dist/wxPythonDocs-$VERSION.tar $DEST
+gzip -9 ../dist/wxPythonDocs-$VERSION.tar
 
 
 # **** Cleanup

diff --git a/wxPython/distrib/makesrpm b/wxPython/distrib/makesrpm
index 9adbefd7760a43fa2d496062f1f6c1a9b7ce3e8d..936660345724b411adc939285c328f4f9f978f5b 100755 (executable)
--- a/wxPython/distrib/makesrpm
+++ b/wxPython/distrib/makesrpm
@@ -7,23 +7,9 @@ if [ ! -d wxPython -o ! -e distrib/makerpm ]; then
 fi
 
 
-#----------------------------------------------------------------------
-# Check parameters
-
-function useage {
-    echo "Usage: $0 wx_version "
-    echo "   wx_version     String to use for version in filenames, etc."
-}
-
-if [ $# -lt 1 ]; then
-    useage
-    exit 1
-fi
-
-ver=$1
 
 
-distrib/makerpm $ver   2.2   skipclean                  srpm
-distrib/makerpm $ver   2.3   skipclean skipcopy skiptar srpm
-distrib/makerpm $ver   2.2   skipclean skipcopy skiptar srpm gtk2
-distrib/makerpm $ver   2.3   skipclean skipcopy skiptar srpm gtk2
\ No newline at end of file
+distrib/makerpm    2.2   skipclean                  srpm
+distrib/makerpm    2.3   skipclean skipcopy skiptar srpm
+distrib/makerpm    2.2   skipclean skipcopy skiptar srpm gtk2
+distrib/makerpm    2.3   skipclean skipcopy skiptar srpm gtk2
\ No newline at end of file

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 32ab340a9e7d22abc4600eb3d4f6f991876f7d45..fe282b967a69ee39bc3bde6c5da5628dc9292dd3 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -166,33 +166,9 @@ cd $WXDIR/wxPython
 
 #----------------------------------------------------------------
 %install
-##[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-WXDIR=`pwd`
-
-# # install wxWindows
-# cd bld
-# make prefix=$RPM_BUILD_ROOT%{wxpref} install
-# make -C contrib/src/gizmos prefix=$RPM_BUILD_ROOT%{wxpref} install
-# make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$RPM_BUILD_ROOT%{wxpref} install
-# make -C contrib/src/stc prefix=$RPM_BUILD_ROOT%{wxpref} install
-# make -C contrib/src/xrc prefix=$RPM_BUILD_ROOT%{wxpref} install
-
-# # install wxPython
-# cd $WXDIR/wxPython
-# %{python} setup.py \
-#      NO_SCRIPTS=1 \
-#      WXPORT=%{lcport} \
-#      UNICODE=%{unicode} \
-#      WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
-#      install \
-#      --root=$RPM_BUILD_ROOT
-
-
-
-
 
 # Other "install" tasks...
+WXDIR=`pwd`
 cd $WXDIR/wxPython
 
 # install the wxPython headers
@@ -231,91 +207,89 @@ cp $WXDIR/bld/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT%{pref}/bin
 
 
 # link specific name to generic name
-ln -s wxPython-%{version} $RPM_BUILD_ROOT%{wxprefbase}
-
-
-
-
-# Copy icons and make menu entries
-#-- This only works for Mandrake.  Is there a cross-distro way to do it?
-##mkdir -p $RPM_BUILD_ROOT%{_iconsdir}
-##mkdir -p $RPM_BUILD_ROOT%{_miconsdir}
-##mkdir -p $RPM_BUILD_ROOT%{_menudir}
-##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_32.png $RPM_BUILD_ROOT%{_iconsdir}/PyCrust.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_16.png $RPM_BUILD_ROOT%{_miconsdir}/PyCrust.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_iconsdir}/XRCed.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT%{_miconsdir}/XRCed.png
-##
-##cat > $RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
-##?package(%{name}): command="%_bindir/pyshell" needs="X11" \
-##icon="PyCrust.png" section="Applications/Development" \
-##title="PyShell" longtitle="Python Shell"
-##
-##?package(%{name}): command="%_bindir/pycrust" needs="X11" \
-##icon="PyCrust.png" section="Applications/Development" \
-##title="PyCrust" longtitle="Python Shell with Filling"
-##
-##?package(%{name}): command="%_bindir/pyalamode" needs="X11" \
-##icon="PyCrust.png" section="Applications/Development" \
-##title="PyAlaMode" longtitle="Python Shell with Filling and editor windows"
-##
-##?package(%{name}): command="%_bindir/xrced" needs="X11" \
-##icon="XRCed.png" section="Applications/Development" \
-##title="XRCed" longtitle="wxPython XRC resource editor"
-##
-##EOF
-
-
-
-# Generate the filelists.  For some reason the %defattr below is still
-# resulting in many (but not all) files not owned by root when just
-# specifying directories and wildcards to be included in each package.
-# So instead we'll build some explicit filelists here and use %attr on
-# each entry.
-cd $WXDIR
-# mkdir -p $RPM_BUILD_ROOT%{pref}/share/doc
-# GFL="%{python} wxPython/distrib/genfilelist.py"
-# $GFL    $RPM_BUILD_ROOT %{pref}                     > FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{pref}/bin                >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{pref}/lib                >> FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{pref}/lib/python%{pyver} >> FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{pref}/share              >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{wxpref}                  >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{wxprefbase}              >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{wxpref}/lib              >> FILELIST
-# $GFL    $RPM_BUILD_ROOT "%{wxpref}/lib/libwx*"     >> FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{wxpref}/share            >> FILELIST
-# ###GFL -r $RPM_BUILD_ROOT %{_iconsdir}               >> FILELIST
-# ##$GFL -r $RPM_BUILD_ROOT %{_menudir}                >> FILELIST
-
-# $GFL    $RPM_BUILD_ROOT %{wxpref}/include           > DEVELLIST
-# $GFL -r $RPM_BUILD_ROOT %{wxpref}/include/wx       >> DEVELLIST
-# $GFL -r $RPM_BUILD_ROOT %{wxpref}/lib/wx           >> DEVELLIST
-# $GFL    $RPM_BUILD_ROOT %{wxconfigname}            >> DEVELLIST
-# $GFL    $RPM_BUILD_ROOT %{wxpref}/bin/wx-config    >> DEVELLIST
+##ln -s wxPython-%{version} $RPM_BUILD_ROOT%{wxprefbase}
 
 
-#----------------------------------------------------------------
-##%post
-##%{update_menus}
-##
-##%postun
-##%{clean_menus}
+# install KDE & GNOME menus
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Development
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+for d in distrib/*.desktop; do
+       install -m 644 $d $RPM_BUILD_ROOT%{_datadir}/applnk/Development
+       install -m 644 $d $RPM_BUILD_ROOT%{_datadir}/applications
+done
+
+# install KDE icons
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32}/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -m 644 wx/py/PyCrust_16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/PyCrust.png
+install -m 644 wx/py/PyCrust_32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/PyCrust.png
+install -m 644 wx/py/PyCrust_32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/PyCrust.png
+install -m 644 wx/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/XRCed.png
+install -m 644 wx/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/XRCed.png
+install -m 644 wx/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/XRCed.png
+
+# install Mandrake menu
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/menu
+cat > $RPM_BUILD_ROOT%{_libdir}/menu/%{name} <<EOF
+?package(%{name}): \\
+       command="%{_bindir}/pyshell" \\
+       needs="X11" \\
+       icon="PyCrust.png" \\
+       section="Applications/Development/Tools" \\
+       title="PyShell" \\
+       longtitle="GUI Python Shell"
+?package(%{name}): \\
+       command="%{_bindir}/pycrust" \\
+       needs="X11" \\
+       icon="PyCrust.png" \\
+       section="Applications/Development/Tools" \\
+       title="PyCrust" \\
+       longtitle="GUI Python Shell with Filling"
+?package(%{name}): \\
+       command="%{_bindir}/pyalamode" \\
+       needs="X11" \\
+       icon="PyCrust.png" \\
+       section="Applications/Development/Tools" \\
+       title="PyAlaMode" \\
+       longtitle="GUI Python Shell with Filling and editor windows"
+?package(%{name}): \\
+       command="%{_bindir}/xrced" \\
+       needs="X11" \\
+       icon="XRCed.png" \\
+       section="Applications/Development/Tools" \\
+       title="XRCed" \\
+       longtitle="wxPython XRC resource editor"
+EOF
 
 
+#----------------------------------------------------------------
+
 %pre
 if [ -e %{wxprefbase} ]; then
+       # in case there are old dirs from an old install
        rm -r %{wxprefbase}
 fi
 
+
+%post
+if [ ! -e %{wxprefbase} ]; then
+       ln -s wxPython-%{version}  %{wxprefbase}
+fi
+# This is done on Mandrake to update its menus:
+if [ -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
+
+
 %postun
 if [ -e %{wxprefbase} ]; then
        rm %{wxprefbase}
 fi
+# This is done on Mandrake to update its menus:
+if [ "$1" = "0" -a -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
+
 
 #----------------------------------------------------------------
-#%clean
-#[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
 #----------------------------------------------------------------
@@ -328,7 +302,13 @@ fi
 %{_libdir}/python%{pyver}/site-packages/*
 %{wxpref}/lib/libwx*
 %{wxpref}/share
-%{wxprefbase}
+%{_datadir}/applnk/Development/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/pixmaps/*
+%{_libdir}/menu/*
+
+##%{wxprefbase}
 
 
 %files -n wxPython%{port}-devel