wxUSE_STL/wxArrayString fixes.

[wxWidgets.git] / wxPython / distrib / makerpm

diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index b1f22465c63850a6ce193e261ea8af86b5735e52..63e897907170fbcc35f26310223d7912dd4ed694 100755 (executable)
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -40,7 +40,7 @@ function usage {
     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"
@@ -87,7 +87,7 @@ for flag in $*; do
     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                ;;
@@ -150,6 +150,12 @@ if [ -z "${skipcopy}" ]; 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
     for dir in `grep -v '#' ${wxdir}/wxPython/distrib/DIRLIST`; do
@@ -158,6 +164,13 @@ if [ -z "${skipcopy}" ]; then
        cp -pf --link ${wxdir}/${dir}/* ${tarver}/${dir} > /dev/null 2>&1
     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
     cleanup .cvsignore