more code simplification

[wxWidgets.git] / distrib / scripts / create_archives.sh

diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh
index 1985c83cd6f44a3c534143029266e22e31fbcec0..6e2220626bd133eae864e1ac9e600c2807be67c1 100755 (executable)
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -20,7 +20,7 @@ VERBOSE=0
 ZIPFLAGS=
 
 PROGNAME=$0
 ZIPFLAGS=
 
 PROGNAME=$0

-##SCRIPTDIR=$WXWIN/distrib/scripts
+

 . $SCRIPTDIR/utils.inc
 
 MANIFESTDIR=$WXWIN/distrib/scripts/manifests
 . $SCRIPTDIR/utils.inc
 
 MANIFESTDIR=$WXWIN/distrib/scripts/manifests


@@ -37,56 +37,59 @@ fi
 getfilelist(){
   port=$1
   outfile=$2
 getfilelist(){
   port=$1
   outfile=$2

-  
+

   filelist="base.rsp"
   filelist="base.rsp"

-  contribfiles="stc.rsp contrib.rsp ogl.rsp"

   utilsfiles="tex2rtf.rsp utils.rsp utilmake.rsp"
   utilsfiles="tex2rtf.rsp utils.rsp utilmake.rsp"

-  commonfiles="generic.rsp jpeg.rsp tiff.rsp xml.rsp deprecated.rsp makefile.rsp $utilsfiles $contribfiles"
-  
+  commonfiles="generic.rsp generic_samples.rsp stc.rsp jpeg.rsp tiff.rsp xml.rsp makefile.rsp $utilsfiles"
+

   if [ ! $port = "base" ]; then
   if [ ! $port = "base" ]; then

-    filelist="$filelist $commonfiles" 
-  fi 
-  
+    filelist="$filelist $commonfiles"
+  fi
+

   if [ $port = "msw" ] || [ $port = "all" ]; then
   if [ $port = "msw" ] || [ $port = "all" ]; then

-    filelist="$filelist msw.rsp univ.rsp vc.rsp mmedia.rsp wince.rsp dmc.rsp"
+    filelist="$filelist msw.rsp univ.rsp vc.rsp wince.rsp dmc.rsp"

   fi
   fi

-  
+

   if [ $port = "os2" ] || [ $port = "all" ]; then
     filelist="$filelist os2.rsp"
   fi
   if [ $port = "os2" ] || [ $port = "all" ]; then
     filelist="$filelist os2.rsp"
   fi

-  
+

   if [ $port = "x11" ] || [ $port = "all" ]; then
   if [ $port = "x11" ] || [ $port = "all" ]; then

-    filelist="$filelist x11.rsp"
+    filelist="$filelist univ.rsp x11.rsp"

   fi
   fi

-  
+

   if [ $port = "mgl" ] || [ $port = "all" ]; then
   if [ $port = "mgl" ] || [ $port = "all" ]; then

-    filelist="$filelist mgl.rsp" 
+    filelist="$filelist univ.rsp mgl.rsp"
+  fi
+
+  if [ $port = "dfb" ] || [ $port = "all" ]; then
+    filelist="$filelist univ.rsp dfb.rsp"

   fi
   fi

-  
+

   if [ $port = "gtk" ] || [ $port = "all" ]; then
     filelist="$filelist gtk.rsp"
   fi
   if [ $port = "gtk" ] || [ $port = "all" ]; then
     filelist="$filelist gtk.rsp"
   fi

-  
+

   if [ $port = "motif" ] || [ $port = "all" ]; then
     filelist="$filelist motif.rsp"
   fi
   if [ $port = "motif" ] || [ $port = "all" ]; then
     filelist="$filelist motif.rsp"
   fi

-  
+

   if [ $port = "mac" ] || [ $port = "all" ]; then
     filelist="$filelist mac.rsp cocoa.rsp"
   fi
   if [ $port = "mac" ] || [ $port = "all" ]; then
     filelist="$filelist mac.rsp cocoa.rsp"
   fi

-  
+

   if [ $port = "all" ]; then
     filelist="$filelist gtk1.rsp palmos.rsp docsrc.rsp"
   fi
   if [ $port = "all" ]; then
     filelist="$filelist gtk1.rsp palmos.rsp docsrc.rsp"
   fi

-  
+

   tempfile="/tmp/wx$port.files.in"
   rm -f $outfile
   tempfile="/tmp/wx$port.files.in"
   rm -f $outfile

-  
+

   olddir=$PWD
   cd $MANIFESTDIR
   olddir=$PWD
   cd $MANIFESTDIR

-  
+

   cat $filelist > $outfile
   cat $filelist > $outfile

-  
+

   cd $olddir
 }
 
   cd $olddir
 }
 


@@ -94,12 +97,12 @@ copyfilelist(){
     FILELIST=$1
     APPDIR=$2
     DESTDIR=$3
     FILELIST=$1
     APPDIR=$2
     DESTDIR=$3

-    
+

     for line in `cat $FILELIST` ; do
       if [ "$line" != "" ]; then
         subdir=`dirname $line`
         mkdir -p $DESTDIR/$subdir
     for line in `cat $FILELIST` ; do
       if [ "$line" != "" ]; then
         subdir=`dirname $line`
         mkdir -p $DESTDIR/$subdir

-        cp -rf $APPDIR/$line $DESTDIR/$subdir 
+        cp -rf $APPDIR/$line $DESTDIR/$subdir

       fi
     done
 }
       fi
     done
 }


@@ -113,7 +116,7 @@ doinit()
 
 dospinport(){
     port=$1
 
 dospinport(){
     port=$1

-    
+

     case "$port" in
         all)
             portname="Widgets";;
     case "$port" in
         all)
             portname="Widgets";;


@@ -124,17 +127,17 @@ dospinport(){
         mac)
             portname="Mac";;
         *)
         mac)
             portname="Mac";;
         *)

-            # for all the others (DFB, GTK, MGL, MSW, X11) just use the
+            # for all the others (DFB, GTK, MGL, DFB, MSW, X11) just use the

             # upper-case version as they are abbreviations
             portname=`echo $port | tr '[a-z]' '[A-Z]'`;;
     esac
             # upper-case version as they are abbreviations
             portname=`echo $port | tr '[a-z]' '[A-Z]'`;;
     esac

-    
+

     echo "Creating wx$portname distribution..."
 
     cd $APPDIR
     portfiles="/tmp/wx$port.files"
     getfilelist "$port" "$portfiles"
     echo "Creating wx$portname distribution..."
 
     cd $APPDIR
     portfiles="/tmp/wx$port.files"
     getfilelist "$port" "$portfiles"

-    
+

     TMPFILESDIR=/tmp/wx$port/wx$portname-$VERSION
     rm -rf $TMPFILESDIR
     mkdir -p $TMPFILESDIR
     TMPFILESDIR=/tmp/wx$port/wx$portname-$VERSION
     rm -rf $TMPFILESDIR
     mkdir -p $TMPFILESDIR


@@ -156,11 +159,11 @@ dospinport(){
         popd
     fi
     echo "Creating wx$portname-$VERSION.zip..."
         popd
     fi
     echo "Creating wx$portname-$VERSION.zip..."

-    zip $ZIPFLAGS -r -9 $APPDIR/deliver/wx$portname-$VERSION.zip .
+    zip $ZIPFLAGS -r -9 $DIST_DIR/wx$portname-$VERSION.zip .

     echo "Creating wx$portname-$VERSION.tar.gz..."
     echo "Creating wx$portname-$VERSION.tar.gz..."

-    tar czf $APPDIR/deliver/wx$portname-$VERSION.tar.gz wx$portname-$VERSION
+    tar czf $DIST_DIR/wx$portname-$VERSION.tar.gz wx$portname-$VERSION

     echo "Creating wx$portname-$VERSION.tar.bz2..."
     echo "Creating wx$portname-$VERSION.tar.bz2..."

-    tar ch wx$portname-$VERSION | bzip2 -f9 > $APPDIR/deliver/wx$portname-$VERSION.tar.bz2
+    tar ch wx$portname-$VERSION | bzip2 -f9 > $DIST_DIR//wx$portname-$VERSION.tar.bz2

     popd
     rm -rf /tmp/wx$port
     rm ${portfiles}
     popd
     rm -rf /tmp/wx$port
     rm ${portfiles}


@@ -174,7 +177,7 @@ prepareforrelease()
     cp $WEBFILES/site/faq*.htm $APPDIR/docs/html
     cp $WEBFILES/site/platform.htm $APPDIR/docs/html
     cp $WEBFILES/site/i18n.htm $APPDIR/docs/html
     cp $WEBFILES/site/faq*.htm $APPDIR/docs/html
     cp $WEBFILES/site/platform.htm $APPDIR/docs/html
     cp $WEBFILES/site/i18n.htm $APPDIR/docs/html

-    
+

     echo Copying readme files...
     cp $APPDIR/docs/msw/readme.txt README-MSW.txt
     cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt
     echo Copying readme files...
     cp $APPDIR/docs/msw/readme.txt README-MSW.txt
     cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt


@@ -187,6 +190,8 @@ prepareforrelease()
     cp $APPDIR/docs/mgl/readme.txt $APPDIR/readme-mgl.txt
     cp $APPDIR/docs/mgl/install.txt $APPDIR/install-mgl.txt
 
     cp $APPDIR/docs/mgl/readme.txt $APPDIR/readme-mgl.txt
     cp $APPDIR/docs/mgl/install.txt $APPDIR/install-mgl.txt
 

+    cp $APPDIR/docs/dfb/install.txt $APPDIR/install-dfb.txt
+

     cp $APPDIR/docs/x11/readme.txt $APPDIR/readme-x11.txt
     cp $APPDIR/docs/x11/install.txt $APPDIR/install-x11.txt
 
     cp $APPDIR/docs/x11/readme.txt $APPDIR/readme-x11.txt
     cp $APPDIR/docs/x11/install.txt $APPDIR/install-x11.txt
 


@@ -201,25 +206,24 @@ prepareforrelease()
 
     cp $APPDIR/docs/cocoa/readme.txt $APPDIR/readme-cocoa.txt
     cp $APPDIR/docs/cocoa/install.txt $APPDIR/install-cocoa.txt
 
     cp $APPDIR/docs/cocoa/readme.txt $APPDIR/readme-cocoa.txt
     cp $APPDIR/docs/cocoa/install.txt $APPDIR/install-cocoa.txt

-    
+

     # Now delete a few files that are unnecessary
     # Now delete a few files that are unnecessary

-    rm -f BuildCVS.txt descrip.mms
+    rm -f BuildSVN.txt descrip.mms

     rm -f setup.h_vms
     rm -f docs/html/wxbook.htm docs/html/roadmap.htm
     rm -f setup.h_vms
     rm -f docs/html/wxbook.htm docs/html/roadmap.htm

-    rm -f -r contrib/docs/latex/ogl

     rm -f src/mingegcs.bat
 #    rm -f *.spec
     rm -f src/gtk/descrip.mms src/motif/descrip.mms
     rm -f src/mingegcs.bat
 #    rm -f *.spec
     rm -f src/gtk/descrip.mms src/motif/descrip.mms

-    
+

     # Copy setup0.h files to setup.h
     # OS/2 always built with configure now
     # cp $APPDIR/include/wx/os2/setup0.h $APPDIR/include/wx/os2/setup.h
     cp $APPDIR/include/wx/msw/setup0.h $APPDIR/include/wx/msw/setup.h
     cp $APPDIR/include/wx/univ/setup0.h $APPDIR/include/wx/univ/setup.h
     # Copy setup0.h files to setup.h
     # OS/2 always built with configure now
     # cp $APPDIR/include/wx/os2/setup0.h $APPDIR/include/wx/os2/setup.h
     cp $APPDIR/include/wx/msw/setup0.h $APPDIR/include/wx/msw/setup.h
     cp $APPDIR/include/wx/univ/setup0.h $APPDIR/include/wx/univ/setup.h

-    
+

     # Make MSW project files always have DOS line endings.
     # Make MSW project files always have DOS line endings.

-    unix2dos `cat $MANIFESTDIR/vc.rsp` 
-    
+    unix2dos `cat $MANIFESTDIR/vc.rsp`
+

     popd
 }
 
     popd
 }
 


@@ -280,11 +284,12 @@ fi
 
 # Do wxAll spin
 if [ "$SPINWXALL" = "1" ] || [ "$SPINALL" = "1" ]; then
 
 # Do wxAll spin
 if [ "$SPINWXALL" = "1" ] || [ "$SPINALL" = "1" ]; then

-    dospinport "all" 
+    dospinport "all"

 fi
 
 if [ "$SPINALL" = "1" ]; then
     dospinport "mgl"
 fi
 
 if [ "$SPINALL" = "1" ]; then
     dospinport "mgl"

+    dospinport "dfb"

     dospinport "gtk"
     dospinport "x11"
     dospinport "motif"
     dospinport "gtk"
     dospinport "x11"
     dospinport "motif"