Remove obsolete includes

[wxWidgets.git] / distrib / msw / makerpm

diff --git a/distrib/msw/makerpm b/distrib/msw/makerpm
index 6e369a9f39792c9c9e75b56e6579f73dcd4b3e0e..52ceae85c1425b194ad952b08bd48471c9a3de78 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
@@ -298,9 +322,9 @@ dospinwxbase()
   echo Copying wxBase.spec to $RPM_ROOT/SPECS...
   cp $WXSRC/wxBase.spec $RPM_ROOT/SPECS
 
-  echo Starting wxBase RPM build...
+  echo Starting wxBase RPM build, rpmbuild args=$RPMBUILDARGS...
   cd $RPM_ROOT
-  rpmbuild -ba SPECS/wxBase.spec 2>&1 | tee wxBase.out
+  rpmbuild -ba $RPMBUILDARGS SPECS/wxBase.spec 2>&1 | tee wxBase.out
 
   echo Finished wxBase RPM build, in $RPM_ROOT.
   echo "SRPMS:"
@@ -308,10 +332,13 @@ dospinwxbase()
   echo "RPMS/i386:"
   ls RPMS/i386
 
-  cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
-  cp $WXDEST/wxbase/release/*.tar.gz $WXDEST
-  cp $WXDEST/wxbase/release/*.tar.bz2 $WXDEST
+  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
 
 #  rm -f -r $WXDEST/wxbase
   echo Now try the RPMs with rpm -i.
@@ -340,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
@@ -371,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
 
@@ -390,6 +423,7 @@ SPINWXGTK2UNICODE=0
 SPINWXMAC=0
 SPINWXMOTIF=0
 SPINWXBASE=0
+SPINWXBASEUNICODE=0
 SPINWXMGL=0
 SPINEVERYTHING=0
 UPDATECVS=0
@@ -403,12 +437,14 @@ usage()
     echo "    --wxgtk2        Spin wxGTK2 RPMs"
     echo "    --wxgtk2unicode Spin wxGTK2 Unicode RPMs"
     echo "    --wxbase        Spin wxBase RPMs"
+    echo "    --wxbaseunicode Spin wxBase Unicode RPMs"
     echo "    --wxx11         Spin wxX11 RPMs"
     echo "    --wxmotif       Spin wxMotif RPMs"
     echo "    --wxmgl         Spin wxMGL RPMs"
     echo "    --wxmac         Make wxMac tarball"
     echo "    --all           Spin EVERYTHING"
     echo "    --updatecvs     Update from CVS"
+    echo "    --norpms        No RPMS, just tarballs"
 
     exit 1
 }
@@ -444,8 +480,10 @@ for i in "$@"; do
        --wxmgl) SPINWXMGL=1 ;;
        --wxmac) SPINWXMAC=1 ;;
        --wxbase) SPINWXBASE=1 ;;
+       --wxbaseunicode) SPINWXBASEUNICODE=1 ;;
        --all) SPINEVERYTHING=1 ;;
        --updatecvs) UPDATECVS=1 ;;
+       --norpms) NORPMS=1 ;;
        *)
            usage
            exit
@@ -487,6 +525,13 @@ if [ "$SPINWXGTK2UNICODE" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
 fi
 
 if [ "$SPINWXBASE" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  PLATFORM=base
+  dospinwxbase
+fi
+
+if [ "$SPINWXBASEUNICODE" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  RPMBUILDARGS="--with unicode"
+  PLATFORM=baseunicode
   dospinwxbase
 fi