Script updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/generic.rsp

@@ -135,6 +135,19 @@ src/regex/tests
 src/regex/regex.3
 src/regex/regex.7
 
+src/iodbc/AUTHORS
+src/iodbc/COPYING
+src/iodbc/autoconfig
+src/iodbc/Changes.log
+src/iodbc/IAFA-PACKAGE
+src/iodbc/INSTALL
+src/iodbc/NEWS
+src/iodbc/README
+src/iodbc/*.c
+src/iodbc/*.h
+src/iodbc/*.ci
+src/iodbc/*.exp
+
 include/wx/*.h
 include/wx/*.inl
 include/wx/*.cpp

distrib/msw/makerpm

@@ -1,6 +1,9 @@
 #!/bin/sh
 # Makes the wxWidgets RPMs
 
+RPMBUILDARGS=
+PLATFORM=
+
 doupdatecvs()
 {
   cd $WXSRC
@@ -50,9 +53,9 @@ dospinwxgtk()
   echo Copying wxGTK.spec to $RPM_ROOT/SPECS...
   cp $WXSRC/wxGTK.spec $RPM_ROOT/SPECS
 
-  echo Starting wxGTK RPM build...
+  echo Starting wxGTK RPM build, rpmbuild args=$RPMBUILDARGS...
   cd $RPM_ROOT
-  rpmbuild -ba SPECS/wxGTK.spec 2>&1 | tee wxGTK.out
+  rpmbuild -ba $RPMBUILDARGS SPECS/wxGTK.spec 2>&1 | tee wxGTK.out
 
   echo Finished wxGTK RPM build, in $RPM_ROOT.
   echo "SRPMS:"
@@ -60,12 +63,14 @@ dospinwxgtk()
   echo "RPMS/i386:"
   ls RPMS/i386
 
-  cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
+  mkdir $WXDEST/$PLATFORM
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
-  cp $WXDEST/wxgtk/release/*.tar.gz $WXDEST
-  cp $WXDEST/wxgtk/release/*.tar.bz2 $WXDEST
 
-  rm -f -r $WXDEST/wxgtk
+  cp $RPM_ROOT/SRPMS/*.rpm $WXDEST/$PLATFORM
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST/$PLATFORM
+  cp $WXDEST/wxgtk/release/*.tar.gz $WXDEST/$PLATFORM
+  cp $WXDEST/wxgtk/release/*.tar.bz2 $WXDEST/$PLATFORM
+
+#  rm -f -r $WXDEST/wxgtk
 
   echo Now try the RPMs with rpm -i.
 }
@@ -123,11 +128,11 @@ dospinwxmgl()
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxmgl/release/*.tar.gz $WXDEST
   cp $WXDEST/wxmgl/release/*.tar.bz2 $WXDEST
 
-  rm -f -r $WXDEST/wxmgl
+#  rm -f -r $WXDEST/wxmgl
 
   echo Now try the RPMs with rpm -i.
 }
@@ -185,7 +190,7 @@ dospinwxmotif()
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxmotif/release/*.tar.gz $WXDEST
   cp $WXDEST/wxmotif/release/*.tar.bz2 $WXDEST
 
@@ -203,7 +208,7 @@ dospinwxmotif()
   bzip2 -f9 ../wxMotif-$WXVER.tar
   cd ..
   rm -f -r wxMotif.tmp
-  rm -f -r $WXDEST/wxmotif
+#  rm -f -r $WXDEST/wxmotif
 
   echo Now try the RPMs with rpm -i.
 }
@@ -304,11 +309,11 @@ dospinwxbase()
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxbase/release/*.tar.gz $WXDEST
   cp $WXDEST/wxbase/release/*.tar.bz2 $WXDEST
 
-  rm -f -r $WXDEST/wxbase
+#  rm -f -r $WXDEST/wxbase
   echo Now try the RPMs with rpm -i.
 }
 
@@ -365,11 +370,11 @@ dospinwxx11()
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxx11/release/*.tar.gz $WXDEST
   cp $WXDEST/wxx11/release/*.tar.bz2 $WXDEST
 
-  rm -f -r $WXDEST/wxx11
+#  rm -f -r $WXDEST/wxx11
   echo Now try the RPMs with rpm -i.
 }
 
@@ -379,7 +384,9 @@ WXDEST=$2
 WXVER=$3
 
 SPINWXX11=0
-SPINWXGTK=0
+SPINWXGTK1=0
+SPINWXGTK2=0
+SPINWXGTK2UNICODE=0
 SPINWXMAC=0
 SPINWXMOTIF=0
 SPINWXBASE=0
@@ -391,15 +398,17 @@ usage()
 {
     echo Usage: $PROGNAME "src-dir dest-dir version-number [ options ]"
     echo Options:
-    echo "    --help         Display this help message"
+    echo "    --help          Display this help message"
-    echo "    --wxgtk        Spin wxGTK RPMs"
+    echo "    --wxgtk1        Spin wxGTK1 RPMs"
-    echo "    --wxbase       Spin wxBase RPMs"
+    echo "    --wxgtk2        Spin wxGTK2 RPMs"
-    echo "    --wxx11        Spin wxX11 RPMs"
+    echo "    --wxgtk2unicode Spin wxGTK2 Unicode RPMs"
-    echo "    --wxmotif      Spin wxMotif RPMs"
+    echo "    --wxbase        Spin wxBase RPMs"
-    echo "    --wxmgl        Spin wxMGL RPMs"
+    echo "    --wxx11         Spin wxX11 RPMs"
-    echo "    --wxmac        Make wxMac tarball"
+    echo "    --wxmotif       Spin wxMotif RPMs"
-    echo "    --all          Spin EVERYTHING"
+    echo "    --wxmgl         Spin wxMGL RPMs"
-    echo "    --updatecvs    Update from CVS"
+    echo "    --wxmac         Make wxMac tarball"
+    echo "    --all           Spin EVERYTHING"
+    echo "    --updatecvs     Update from CVS"
 
     exit 1
 }
@@ -428,7 +437,9 @@ shift 3
 for i in "$@"; do
     case "$i" in
 	--wxx11) SPINWXX11=1 ;;
-	--wxgtk) SPINWXGTK=1 ;;
+	--wxgtk1) SPINWXGTK1=1 ;;
+	--wxgtk2) SPINWXGTK2=1 ;;
+	--wxgtk2unicode) SPINWXGTK2UNICODE=1 ;;
 	--wxmotif) SPINWXMOTIF=1 ;;
 	--wxmgl) SPINWXMGL=1 ;;
 	--wxmac) SPINWXMAC=1 ;;
@@ -457,7 +468,21 @@ if [ "$SPINWXX11" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
   dospinwxx11
 fi
 
-if [ "$SPINWXGTK" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+if [ "$SPINWXGTK1" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  RPMBUILDARGS=
+  PLATFORM=gtk1
+  dospinwxgtk
+fi
+
+if [ "$SPINWXGTK2" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  RPMBUILDARGS="--with gtk2"
+  PLATFORM=gtk2
+  dospinwxgtk
+fi
+
+if [ "$SPINWXGTK2UNICODE" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  RPMBUILDARGS="--with gtk2 --with unicode"
+  PLATFORM=gtk2unicode
   dospinwxgtk
 fi
 

distrib/msw/os2.rsp

@@ -22,6 +22,7 @@ src/os2/makefile.va
 src/os2/*.def
 src/os2/*.lst
 src/os2/*.sh
+src/*.icc
 
 include/wx/os2/*.h
 include/wx/os2/*.rc
@@ -30,3 +31,5 @@ include/wx/msw/*.cur
 include/wx/msw/*.ico
 include/wx/msw/*.bmp
 
+samples/minimal/Minimal.icc
+

distrib/msw/tardist

@@ -284,7 +284,8 @@ cd ..
 rm -f wxAll-${WXVER}.tar
 $TAR cf $WXDEST/wxAll-${WXVER}.tar wxWidgets-${WXVER}/*
 rm -f -r wxWidgets-${WXVER}
-gzip $WXDEST/wxAll-${WXVER}.tar
+gzip -c $WXDEST/wxAll-${WXVER}.tar > $WXDEST/wxAll-${WXVER}.tar.gz
+bzip2 $WXDEST/wxAll-${WXVER}.tar
 }
 
 dospinwxdocs()