]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/distrib/makerpm
fixed deadlock when calling wxPostEvent() from worker thread
[wxWidgets.git] / wxPython / distrib / makerpm
index 63e897907170fbcc35f26310223d7912dd4ed694..028cd1f65dd41cf23eaa68ad33c39d1ec4dd737f 100755 (executable)
@@ -26,27 +26,24 @@ pythonbin=/usr/bin/python
 port=GTK
 lcport=gtk
 unicode=0
-tarname=wxPythonSrc
-rpmflag=-ba
+tarname=wxPython-src
+srpmonly=0
+skipclean=0
 
 #----------------------------------------------------------------------
 # Check parameters
 
 function usage {
     echo "Usage: $0 py_version [command flags...]"
-    echo "   py_version     String to append to $pythonbin (which python"
-    echo "                  version to use.)"
+    echo "   py_version     which python 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"
     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 "   srpm           Only make the SRPM"
-#    echo "   smp            Add SMP=2 to the envivonment to speed wxGTK build"
 }
 
 if [ $# -lt 1 ]; then
@@ -68,17 +65,14 @@ fi
 
 
 function makespec {
-    echo "*** Writing ${distdir}/wxPython${port}.spec"
+    echo "*** Writing ${distdir}/wxPython.spec"
     cat ${spectemplate} \
        | sed s:@PYTHON@:${python}:g \
        | sed s:@PYVER@:${pyver}: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.spec
 }
 
 
@@ -89,11 +83,8 @@ for flag in $*; do
        skipclean) skipclean=1                         ;;
        skiptar)   skiptar=1; skipcopy=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;                        ;;
+       srpm)      srpmonly=1;                         ;;
 
        *)  echo "Unknown flag \"${flag}\""
            usage
@@ -144,20 +135,17 @@ if [ -z "${skipcopy}" ]; then
     # copy root dir contents
     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 build contrib debian distrib docs include lib locale misc patches src; do
+    # copy all top dirs except CVS, demos, samples, and wxPython
+    for d in art build contrib debian docs include lib locale patches samples src utils; do
        if [ -e ${wxdir}/$d ]; then
            cp -Rpf --link ${wxdir}/$d ${tarver} #> /dev/null 2>&1
        fi
     done
-#     # and tex2rtf too
-#     mkdir ${tarver}/utils
-#     cp -Rpf --link ${wxdir}/utils/tex2rtf ${tarver}/utils
-#     # tex2rtf needs these files
-#     mkdir ${tarver}/samples
-#     cp -Rpf --link ${wxdir}/samples/sample.* ${tarver}/samples
-
-    # now do the same thing for wxPython, skipping it's build dirs and such
+    mkdir ${tarver}/distrib
+    cp -Rpf --link ${wxdir}/distrib/scripts ${tarver}/distrib
+
+
+    # now do the same thing for wxPython, but use the DIRLIST to select dirs to copy
     for dir in `grep -v '#' ${wxdir}/wxPython/distrib/DIRLIST`; do
        mkdir ${tarver}/${dir}
        ##echo "cp -pf --link ${wxdir}/${dir}/* ${tarver}/${dir}"
@@ -177,19 +165,33 @@ if [ -z "${skipcopy}" ]; then
     cleanup CVS
     cleanup CVSROOT
     rm BuildCVS.txt
+    rm -f ChangeLog
     rm *.spec
-    rm -rf docs/html
-    rm -rf docs/latex
-    rm -rf contrib/docs
-    rm -rf contrib/samples
+    rm -rf distrib/msw/tmake
+    #rm -rf docs/html
+    #rm -rf docs/latex
+    #rm -rf contrib/docs
+    #rm -rf contrib/samples
     rm locale/*.mo
     cleanup ".#*"
+    cleanup "#*#"
     cleanup "*~"
     cleanup "*.orig"
     cleanup "*.rej"
     cleanup "*.pyc"
     cleanup core
     cleanup "core.[0-9]*"
+    rm -f wxPython/samples/embedded/embedded
+    rm -f wxPython/samples/embedded/embedded.o
+
+    # ports that are not supported yet
+    #cleanup cocoa    # wxMac needs some cocoa headers
+    cleanup mgl
+    cleanup motif
+    cleanup os2
+    cleanup x11
+    cleanup univ
+    cleanup wine
 
     rm -f wxPython/wx/*  > /dev/null 2>&1
 
@@ -205,7 +207,7 @@ fi
 # TODO?  Output all combinations of spec files to put in the tar file??
 
 makespec
-cp ${distdir}/wxPython${port}.spec ${builddir}/${tarver}/wxPython${port}.spec
+cp ${distdir}/wxPython.spec ${builddir}/${tarver}/wxPython.spec
 
 
 #----------------------------------------------------------------------
@@ -223,10 +225,10 @@ if [ -z "${skiptar}" ]; then
     tar cvf ${distdir}/${tarver}.tar ${tarver} > /dev/null
 
     echo "*** Compressing..."
-    if [ -e ${distdir}/${tarver}.tar.gz ]; then
-       rm ${distdir}/${tarver}.tar.gz
+    if [ -e ${distdir}/${tarver}.tar.bz2 ]; then
+       rm ${distdir}/${tarver}.tar.bz2
     fi
-    gzip --best ${distdir}/${tarver}.tar
+    bzip2 --best ${distdir}/${tarver}.tar
     popd > /dev/null
 fi
 
@@ -236,24 +238,51 @@ fi
 
 if [ -z "${skiprpm}" ]; then
     echo "*** Building RPMs..."
-    cp ${distdir}/${tarver}.tar.gz ${rpmtop}/SOURCES
-    rpmbuild ${rpmflag} \
-       --define "_topdir ${rpmtop}" \
-       --define "_tmppath ${builddir}" \
-       ${distdir}/wxPython${port}.spec
-    if [ "$?" != "0" ]; then
-       echo "*** RPM failure, exiting."
-       exit 1
-    else
-       echo "*** Moving RPMs to ${distdir}"
-       mv -f `find ${rpmtop} -name "wxPython*.rpm"` ${distdir}
+    cp ${distdir}/${tarver}.tar.bz2 ${rpmtop}/SOURCES
+
+    if [ "${srpmonly}" = "1" ]; then
+       rpmbuild -bs \
+           --define "_topdir ${rpmtop}" \
+           --define "_tmppath ${builddir}" \
+           --define "release 1" \
+           ${distdir}/wxPython.spec
+       if [ "$?" != "0" ]; then
+           echo "*** RPM failure, exiting."
+           exit 1
+       fi
+           
+    else 
+       rpmbuild  -ba \
+           --define "_topdir ${rpmtop}" \
+           --define "_tmppath ${builddir}" \
+           --define "port gtk" --define "unicode 0" \
+           --define "pyver ${pyver}" \
+           ${distdir}/wxPython.spec
+       if [ "$?" != "0" ]; then
+           echo "*** RPM failure, exiting."
+           exit 1
+       fi
+
+       rpmbuild  -ba \
+           --define "_topdir ${rpmtop}" \
+           --define "_tmppath ${builddir}" \
+           --define "port gtk2" --define "unicode 1" \
+           --define "pyver ${pyver}" \
+           ${distdir}/wxPython.spec
+       if [ "$?" != "0" ]; then
+           echo "*** RPM failure, exiting."
+           exit 1
+       fi
     fi
+
+    echo "*** Moving RPMs to ${distdir}"
+    mv -f `find ${rpmtop} -name "wxPython*.rpm"` ${distdir}
 fi
 
 #----------------------------------------------------------------------
 # Cleanup
 
-if [ -z ${skipclean} ]; then
+if [ "${skipclean}" = "0" ]; then
     echo "*** Cleaning up"
     rm -rf ${rpmtop}
     rm -rf ${builddir}