making sure the overlay moves with its parent on OSX

[wxWidgets.git] / distrib / msw / makerpm

diff --git a/distrib/msw/makerpm b/distrib/msw/makerpm
index f9d515f1e5bffb521431a659c24f4481ae4979b6..6e8438e41f0426f070d7b3280178a312ef09cea8 100755 (executable)
--- a/distrib/msw/makerpm
+++ b/distrib/msw/makerpm
@@ -3,6 +3,7 @@
 
 RPMBUILDARGS=
 PLATFORM=
+NORPMS=
 
 doupdatecvs()
 {
@@ -34,6 +35,11 @@ dospinwxgtk()
   echo Making...
   make -j1 dist bzip-dist-only
 
+  mkdir $WXDEST/$PLATFORM
+
+  if [ "$NORPMS" != "1" ]
+  then
+
   echo Setting up RPM build dir $RPM_ROOT...
   rm -f -r $RPM_ROOT
   mkdir $RPM_ROOT
@@ -63,10 +69,11 @@ dospinwxgtk()
   echo "RPMS/i386:"
   ls RPMS/i386
 
-  mkdir $WXDEST/$PLATFORM
-
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST/$PLATFORM
   cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST/$PLATFORM
+
+  fi
+
   cp $WXDEST/wxgtk/release/*.tar.gz $WXDEST/$PLATFORM
   cp $WXDEST/wxgtk/release/*.tar.bz2 $WXDEST/$PLATFORM
 
@@ -98,6 +105,9 @@ dospinwxmgl()
   echo Making...
   make -j1 dist bzip-dist-only
 
+  if [ "$NORPMS" != "1" ]
+  then
+
   echo Setting up RPM build dir $RPM_ROOT...
   rm -f -r $RPM_ROOT
   mkdir $RPM_ROOT
@@ -129,6 +139,9 @@ dospinwxmgl()
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
   cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
+
+  fi
+
   cp $WXDEST/wxmgl/release/*.tar.gz $WXDEST
   cp $WXDEST/wxmgl/release/*.tar.bz2 $WXDEST
 
@@ -160,6 +173,9 @@ dospinwxmotif()
   echo Making...
   make -j1 dist bzip-dist-only
 
+  if [ "$NORPMS" != "1" ]
+  then
+
   echo Setting up RPM build dir $RPM_ROOT...
   rm -f -r $RPM_ROOT
   mkdir $RPM_ROOT
@@ -191,6 +207,9 @@ dospinwxmotif()
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
   cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
+
+  fi
+
   cp $WXDEST/wxmotif/release/*.tar.gz $WXDEST
   cp $WXDEST/wxmotif/release/*.tar.bz2 $WXDEST
 
@@ -279,6 +298,11 @@ dospinwxbase()
   echo Making...
   make -j1 dist bzip-dist-only
 
+  mkdir $WXDEST/$PLATFORM
+
+  if [ "$NORPMS" != "1" ]
+  then
+
   echo Setting up RPM build dir $RPM_ROOT...
   rm -f -r $RPM_ROOT
   mkdir $RPM_ROOT
@@ -308,10 +332,11 @@ dospinwxbase()
   echo "RPMS/i386:"
   ls RPMS/i386
 
-  mkdir $WXDEST/$PLATFORM
-
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST/$PLATFORM
   cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST/$PLATFORM
+
+  fi
+
   cp $WXDEST/wxbase/release/*.tar.gz $WXDEST/$PLATFORM
   cp $WXDEST/wxbase/release/*.tar.bz2 $WXDEST/$PLATFORM
 
@@ -342,6 +367,9 @@ dospinwxx11()
   echo Making...
   make -j1 dist bzip-dist-only
 
+  if [ "$NORPMS" != "1" ]
+  then
+
   echo Setting up RPM build dir $RPM_ROOT...
   rm -f -r $RPM_ROOT
   mkdir $RPM_ROOT
@@ -373,6 +401,9 @@ dospinwxx11()
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
   cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
+
+  fi
+
   cp $WXDEST/wxx11/release/*.tar.gz $WXDEST
   cp $WXDEST/wxx11/release/*.tar.bz2 $WXDEST
 
@@ -413,6 +444,7 @@ usage()
     echo "    --wxmac         Make wxMac tarball"
     echo "    --all           Spin EVERYTHING"
     echo "    --updatecvs     Update from CVS"
+    echo "    --norpms        No RPMS, just tarballs"
 
     exit 1
 }
@@ -451,6 +483,7 @@ for i in "$@"; do
        --wxbaseunicode) SPINWXBASEUNICODE=1 ;;
        --all) SPINEVERYTHING=1 ;;
        --updatecvs) UPDATECVS=1 ;;
+       --norpms) NORPMS=1 ;;
        *)
            usage
            exit
@@ -474,7 +507,7 @@ if [ "$SPINWXX11" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
 fi
 
 if [ "$SPINWXGTK1" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
-  RPMBUILDARGS=
+  RPMBUILDARGS="--without gtk2"
   PLATFORM=gtk1
   dospinwxgtk
 fi