Reworked how stock objects are initialized. They now have an

[wxWidgets.git] / wxPython / distrib / makerpm

diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index ccb1f5bb9eaf2aca1acc655bf5f1d7c97ecc75c6..6d6088d5150d5384ce6523f76c905d2a9fa9b5c2 100755 (executable)
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -13,51 +13,52 @@ fi
 #----------------------------------------------------------------------
 # Initialization
 
 #----------------------------------------------------------------------
 # Initialization
 

-distdir=`pwd`/dist
-builddir=`pwd`/_build_rpm
+wxpdir=`pwd`
+wxdir=${wxpdir}/..
+distdir=${wxpdir}/dist
+builddir=${wxpdir}/_build_rpm

 rpmtop=${builddir}/rpmtop
 rpmtop=${builddir}/rpmtop

-cvsroot=:pserver:anoncvs@cvs.wxwindows.org:/home/wxcvs
+cvsroot=:pserver:anoncvs@cvs.wxwindows.org:/pack/cvsroots/wxwindows

 pythonbin=/usr/bin/python
 port=GTK
 lcport=gtk
 pythonbin=/usr/bin/python
 port=GTK
 lcport=gtk

+unicode=0

 tarname=wxPythonSrc
 tarname=wxPythonSrc

-debug=0
-
+rpmflag=-ba

 
 #----------------------------------------------------------------------
 # Check parameters
 
 function useage {
 
 #----------------------------------------------------------------------
 # Check parameters
 
 function useage {

-    echo "Usage: $0 cvs_tag wx_version py_version [command flags...]"
-    echo "   cvs_tag        Tag to use for CVS export"
+    echo "Usage: $0 wx_version py_version [command flags...]"

     echo "   wx_version     String to use for version in filenames, etc."
     echo "   py_version     String to append to $pythonbin (which python"
     echo "                  version to use.)"
     echo ""
     echo "command flags:"
     echo "   wx_version     String to use for version in filenames, etc."
     echo "   py_version     String to append to $pythonbin (which python"
     echo "                  version to use.)"
     echo ""
     echo "command flags:"

-    echo "   skipcvs        Don't do the CVS export"
+    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 "   skipclean      Don't do the cleanup at the end"
     echo "   skiptar        Don't build the tarball"
     echo "   skiprpm        Don't build the RPM (but why?)"
     echo "   skipclean      Don't do the cleanup at the end"

+    echo "   gtk2           Build using wxGTK2 and Unicode"
+    echo "   x11            Build using wxX11"

     echo "   speconly       Do nothing but write the RPM spec file"
     echo "   speconly       Do nothing but write the RPM spec file"

-    echo "   debug          Make a __WXDEBUG__ version"
-    echo "   smp            Add SMP=2 to the envivonment to speed wxGTK build"
+    echo "   srpm           Only make the SRPM"
+#    echo "   smp            Add SMP=2 to the envivonment to speed wxGTK build"

 }
 
 }
 

-if [ $# -lt 3 ]; then
+if [ $# -lt 2 ]; then

     useage
     exit 1
 fi
 
     useage
     exit 1
 fi
 

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

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

-

 python=${pythonbin}${pyver}
 if [ ! -e ${python} ]; then
     echo "${python} not found!"
 python=${pythonbin}${pyver}
 if [ ! -e ${python} ]; then
     echo "${python} not found!"


@@ -70,12 +71,12 @@ function makespec {
     cat ${spectemplate} \
        | sed s:@PYTHON@:${python}:g \
        | sed s:@PYVER@:${pyver}:g \
     cat ${spectemplate} \
        | sed s:@PYTHON@:${python}:g \
        | sed s:@PYVER@:${pyver}:g \

-       | sed s:@DEBUG@:${debug}:g \

        | sed s:@PORT@:${port}:g \
        | sed s:@LCPORT@:${lcport}:g \
        | sed s:@TARNAME@:${tarname}:g \
        | sed s:@VERSION@:${version}:g \
        | sed s:@VER2@:${ver2}:g \
        | sed s:@PORT@:${port}:g \
        | sed s:@LCPORT@:${lcport}:g \
        | sed s:@TARNAME@:${tarname}:g \
        | sed s:@VERSION@:${version}:g \
        | sed s:@VER2@:${ver2}:g \

+       | sed s:@UNICODE@:${unicode}:g \

        > ${distdir}/wxPython${port}.spec
 }
 
        > ${distdir}/wxPython${port}.spec
 }
 


@@ -83,13 +84,15 @@ function makespec {
 
 for flag in $*; do
     case ${flag} in
 
 for flag in $*; do
     case ${flag} in

-       skipcvs)   skipcvs=1        ;;
-       skipclean) skipclean=1      ;;
-       skiptar)   skiptar=1        ;;
-       skiprpm)   skiprpm=1        ;;
-       smp)       export SMP=2     ;;
-       debug)     debug=1          ;;
-       speconly)  makespec; exit 0 ;;
+       skipcopy)  skipcopy=1                          ;;
+       skipclean) skipclean=1                         ;;
+       skiptar)   skiptar=1                           ;;
+       skiprpm)   skiprpm=1                           ;;
+       gtk2)      unicode=1; port=GTK2; lcport=gtk2   ;;
+       x11)       port=X11; lcport=x11                ;;
+       smp)       export SMP=2                        ;;
+       speconly)  makespec; exit 0                    ;;
+       srpm)      rpmflag=-bs;                        ;;

 
        *)  echo "Unknown flag \"${flag}\""
            useage
 
        *)  echo "Unknown flag \"${flag}\""
            useage


@@ -119,38 +122,59 @@ done
 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------

-# Get the sources from CVS
+# Copy the sources from my CVS workspace

 
 

-if [ -z "${skipcvs}" ]; then
-    echo "*** Exporting CVS archive..."
+if [ -z "${skipcopy}" ]; then
+    echo "*** Copying CVS tree"

     pushd ${builddir} > /dev/null
     if [ -e ${tarver} ]; then
     pushd ${builddir} > /dev/null
     if [ -e ${tarver} ]; then

-       rm -rf ${tarver}
-    fi
-    cvs -d ${cvsroot} export -r ${cvs_tag} -d ${tarver} wxWindows > /dev/null 2>&1
-    if [ "$?" != "0" ]; then
-       echo "*** CVS failure, exiting."
-       exit 1
+       rm -rf ${tarver}

     fi
     fi

+    mkdir -p ${tarver}
+
+    # copy root dir contents
+    cp -pf --link ${wxdir}/* ${tarver} > /dev/null 2>&1

 
 

-    echo "*** Removing unneeded stuff from CVS tree"
+    # copy all top dirs except CVS, build, demos, utils, samples, and wxPython
+    for d in art 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
+    mkdir ${tarver}/wxPython
+    cp -pf --link ${wxdir}/wxPython/* ${tarver}/wxPython > /dev/null 2>&1
+    for d in contrib demo distrib distutils docs licence samples scripts src wx wxPython; do
+       cp -Rpf --link ${wxdir}/wxPython/$d ${tarver}/wxPython #> /dev/null 2>&1
+    done
+
+
+    echo "*** Removing uneeded stuff from copy of CVS tree"

     pushd ${tarver} > /dev/null
     rm `find . -name .cvsignore`
     pushd ${tarver} > /dev/null
     rm `find . -name .cvsignore`

+    rm -rf `find . -name CVS`

     rm *.spec
     rm *.spec

-    rm -rf demos
-#    rm -rf docs

     rm -rf docs/html
     rm -rf docs/latex
     rm -rf docs/html
     rm -rf docs/latex

-    rm -rf samples
-    rm -rf utils
-#     rm -rf include/wx/mgl
-#     rm -rf include/wx/motif
-#     rm -rf include/wx/os2
-#     rm -rf src/mgl
-#     rm -rf src/motif
-#     rm -rf src/os2
-    rm -rf wxPython/wxSWIG
-    rm -rf wxPython/tests
+    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

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


@@ -171,9 +195,16 @@ cp ${distdir}/wxPython${port}.spec ${builddir}/${tarver}/wxPython${port}.spec
 # Build the tar file
 
 if [ -z "${skiptar}" ]; then
 # Build the tar file
 
 if [ -z "${skiptar}" ]; then

+    echo "*** Creating language catalogs..."
+    pushd ${builddir}/${tarver}/locale > /dev/null
+    make allmo
+    popd > /dev/null
+

     echo "*** Creating tarball..."
     echo "*** Creating tarball..."

+    cp distrib/README.1st.txt ${builddir}/${tarver}

     pushd ${builddir} > /dev/null
     tar cvf ${distdir}/${tarver}.tar ${tarver} > /dev/null
     pushd ${builddir} > /dev/null
     tar cvf ${distdir}/${tarver}.tar ${tarver} > /dev/null

+

     echo "*** Compressing..."
     if [ -e ${distdir}/${tarver}.tar.gz ]; then
        rm ${distdir}/${tarver}.tar.gz
     echo "*** Compressing..."
     if [ -e ${distdir}/${tarver}.tar.gz ]; then
        rm ${distdir}/${tarver}.tar.gz


@@ -189,7 +220,7 @@ fi
 if [ -z "${skiprpm}" ]; then
     echo "*** Building RPMs..."
     cp ${distdir}/${tarver}.tar.gz ${rpmtop}/SOURCES
 if [ -z "${skiprpm}" ]; then
     echo "*** Building RPMs..."
     cp ${distdir}/${tarver}.tar.gz ${rpmtop}/SOURCES

-    rpm -ba \
+    rpmbuild ${rpmflag} \

        --define "_topdir ${rpmtop}" \
        --define "_tmppath ${builddir}" \
        ${distdir}/wxPython${port}.spec
        --define "_topdir ${rpmtop}" \
        --define "_tmppath ${builddir}" \
        ${distdir}/wxPython${port}.spec