Applied new master define for CommandBar vs. PocketPC mixed bar.

[wxWidgets.git] / wxPython / distrib / makerpm

diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index f9e76043740ae7688030964580977d2bc1c68a41..194995955dd2a27ac6843f3356d24a6408c86e23 100755 (executable)
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -2,6 +2,8 @@
 #----------------------------------------------------------------------
 # Build an RPM containing both wxGTK and wxPython
 
 #----------------------------------------------------------------------
 # Build an RPM containing both wxGTK and wxPython
 

+##set -o xtrace
+

 spectemplate=distrib/wxPythonFull.spec.in
 
 if [ ! -d wxPython -o ! -e ${spectemplate} ]; then
 spectemplate=distrib/wxPythonFull.spec.in
 
 if [ ! -d wxPython -o ! -e ${spectemplate} ]; then


@@ -13,6 +15,7 @@ fi
 #----------------------------------------------------------------------
 # Initialization
 
 #----------------------------------------------------------------------
 # Initialization
 

+version=`python -c "import setup;print setup.VERSION"`

 wxpdir=`pwd`
 wxdir=${wxpdir}/..
 distdir=${wxpdir}/dist
 wxpdir=`pwd`
 wxdir=${wxpdir}/..
 distdir=${wxpdir}/dist


@@ -29,16 +32,15 @@ rpmflag=-ba
 #----------------------------------------------------------------------
 # Check parameters
 
 #----------------------------------------------------------------------
 # Check parameters
 

-function useage {
-    echo "Usage: $0 wx_version py_version [command flags...]"
-    echo "   wx_version     String to use for version in filenames, etc."
+function usage {
+    echo "Usage: $0 py_version [command flags...]"

     echo "   py_version     String to append to $pythonbin (which python"
     echo "                  version to use.)"
     echo ""
     echo "command flags:"
     echo "   skipcopy       Don't copy the files for the tarball from the workspace"
     echo "   skiptar        Don't build the tarball"
     echo "   py_version     String to append to $pythonbin (which python"
     echo "                  version to use.)"
     echo ""
     echo "command flags:"
     echo "   skipcopy       Don't copy the files for the tarball from the workspace"
     echo "   skiptar        Don't build the tarball"

-    echo "   skiprpm        Don't build the RPM (but why?)"
+    echo "   skiprpm        Don't build the RPM"

     echo "   skipclean      Don't do the cleanup at the end"
     echo "   gtk2           Build using wxGTK2 and Unicode"
     echo "   x11            Build using wxX11"
     echo "   skipclean      Don't do the cleanup at the end"
     echo "   gtk2           Build using wxGTK2 and Unicode"
     echo "   x11            Build using wxX11"


@@ -47,14 +49,13 @@ function useage {
 #    echo "   smp            Add SMP=2 to the envivonment to speed wxGTK build"
 }
 
 #    echo "   smp            Add SMP=2 to the envivonment to speed wxGTK build"
 }
 

-if [ $# -lt 2 ]; then
-    useage
+if [ $# -lt 1 ]; then
+    usage

     exit 1
 fi
 
     exit 1
 fi
 

-version=$1
-pyver=$2
-shift;shift
+pyver=$1
+shift

 
 ver2=`echo ${version} | cut -c 1,2,3`
 tarver=${tarname}-${version}
 
 ver2=`echo ${version} | cut -c 1,2,3`
 tarver=${tarname}-${version}


@@ -86,7 +87,7 @@ for flag in $*; do
     case ${flag} in
        skipcopy)  skipcopy=1                          ;;
        skipclean) skipclean=1                         ;;
     case ${flag} in
        skipcopy)  skipcopy=1                          ;;
        skipclean) skipclean=1                         ;;

-       skiptar)   skiptar=1                           ;;
+       skiptar)   skiptar=1; skipcopy=1               ;;

        skiprpm)   skiprpm=1                           ;;
        gtk2)      unicode=1; port=GTK2; lcport=gtk2   ;;
        x11)       port=X11; lcport=x11                ;;
        skiprpm)   skiprpm=1                           ;;
        gtk2)      unicode=1; port=GTK2; lcport=gtk2   ;;
        x11)       port=X11; lcport=x11                ;;


@@ -95,7 +96,7 @@ for flag in $*; do
        srpm)      rpmflag=-bs;                        ;;
 
        *)  echo "Unknown flag \"${flag}\""
        srpm)      rpmflag=-bs;                        ;;
 
        *)  echo "Unknown flag \"${flag}\""

-           useage
+           usage

            exit 1
     esac
 done
            exit 1
     esac
 done


@@ -124,6 +125,14 @@ done
 #----------------------------------------------------------------------
 # Copy the sources from my CVS workspace
 
 #----------------------------------------------------------------------
 # Copy the sources from my CVS workspace
 

+function cleanup {
+    RMFILES=`find . -name "$1"`
+    if [ "$RMFILES" != "" ]; then
+       rm -rf $RMFILES
+    fi
+}
+
+

 if [ -z "${skipcopy}" ]; then
     echo "*** Copying CVS tree"
     pushd ${builddir} > /dev/null
 if [ -z "${skipcopy}" ]; then
     echo "*** Copying CVS tree"
     pushd ${builddir} > /dev/null


@@ -136,43 +145,47 @@ if [ -z "${skipcopy}" ]; then
     cp -pf --link ${wxdir}/* ${tarver} > /dev/null 2>&1
 
     # copy all top dirs except CVS, build, demos, utils, samples, and wxPython
     cp -pf --link ${wxdir}/* ${tarver} > /dev/null 2>&1
 
     # copy all top dirs except CVS, build, demos, utils, samples, and wxPython

-    for d in art contrib debian distrib docs include lib locale misc src; do
-       cp -Rpf --link ${wxdir}/$d ${tarver} #> /dev/null 2>&1
+    for d in art build contrib debian distrib docs include lib locale misc patches src; do
+       if [ -e ${wxdir}/$d ]; then
+           cp -Rpf --link ${wxdir}/$d ${tarver} #> /dev/null 2>&1
+       fi

     done
 
     # now do the same thing for wxPython, skipping it's build dirs and such
     done
 
     # now do the same thing for wxPython, skipping it's build dirs and such

-    mkdir ${tarver}/wxPython
-    cp -pf --link ${wxdir}/wxPython/* ${tarver}/wxPython > /dev/null 2>&1
-    for d in contrib demo distrib distutils samples scripts src wxPython; do
-       cp -Rpf --link ${wxdir}/wxPython/$d ${tarver}/wxPython #> /dev/null 2>&1
+    for dir in `grep -v '#' ${wxdir}/wxPython/distrib/DIRLIST`; do
+       mkdir ${tarver}/${dir}
+       ##echo "cp -pf --link ${wxdir}/${dir}/* ${tarver}/${dir}"
+       cp -pf --link ${wxdir}/${dir}/* ${tarver}/${dir} > /dev/null 2>&1

     done
 
     done
 

+    # using DIRLIST as above will normally skip any files starting
+    # with a dot, but there are a few .files that we do want to
+    # copy...
+    for dir in wxPython/distrib/msw; do
+       cp -pf --link ${wxdir}/${dir}/.[a-zA-Z]* ${tarver}/${dir}  > /dev/null 2>&1
+    done

 
     echo "*** Removing uneeded stuff from copy of CVS tree"
     pushd ${tarver} > /dev/null
 
     echo "*** Removing uneeded stuff from copy of CVS tree"
     pushd ${tarver} > /dev/null

-    rm `find . -name .cvsignore`
-    rm -rf `find . -name CVS`
+    cleanup .cvsignore
+    cleanup CVS
+    cleanup CVSROOT
+    rm BuildCVS.txt

     rm *.spec
     rm -rf docs/html
     rm -rf docs/latex
     rm -rf contrib/docs
     rm -rf contrib/samples
     rm locale/*.mo
     rm *.spec
     rm -rf docs/html
     rm -rf docs/latex
     rm -rf contrib/docs
     rm -rf contrib/samples
     rm locale/*.mo

-    rm `find . -name ".#*"`
-    rm `find . -name "*~"`
-    rm `find . -name "*.pyc"`
-    rm `find . -name "core"`
-    rm `find . -name "core.[0-9]*"`
-
-    rm -f wxPython/wxPython/*  > /dev/null 2>&1
-    rm wxPython/demo/.setup.sh
-    rm -rf wxPython/contrib/art2d
-    rm -rf wxPython/contrib/canvas
-    rm -rf wxPython/contrib/canvas2
-    rm -rf wxPython/contrib/gizmos/contrib
-    rm -rf wxPython/contrib/ogl/contrib
-    rm -rf wxPython/contrib/stc/contrib
-    rm -rf wxPython/contrib/xrc/contrib
+    cleanup ".#*"
+    cleanup "*~"
+    cleanup "*.orig"
+    cleanup "*.rej"
+    cleanup "*.pyc"
+    cleanup core
+    cleanup "core.[0-9]*"
+
+    rm -f wxPython/wx/*  > /dev/null 2>&1

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