remove extraneous semicolons

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

diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh
index 88078c99d426f7888aada9b06d7c079203e47feb..ca00468b28fa30781bc4b6d2756efdb537c32e5a 100755 (executable)
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -20,10 +20,10 @@ VERBOSE=0
 ZIPFLAGS=
 
 PROGNAME=$0
-SCRIPTDIR=$WXWIN/distrib/scripts
+##SCRIPTDIR=$WXWIN/distrib/scripts
 . $SCRIPTDIR/utils.inc
 
-MANIFESTDIR=$SCRIPTDIR/manifests
+MANIFESTDIR=$WXWIN/distrib/scripts/manifests
 WEBFILES=$WXWIN/../wxWebSite
 if [ ! "$CYGPATH" = "" ]; then
   WEBFILES=`$CYGPATH "$WEBFILES"`
@@ -76,7 +76,7 @@ getfilelist(){
   fi
   
   if [ $port = "all" ]; then
-    filelist="$filelist palmos.rsp"
+    filelist="$filelist gtk1.rsp palmos.rsp docsrc.rsp"
   fi
   
   tempfile="/tmp/wx$port.files.in"
@@ -126,34 +126,36 @@ dospinport(){
     portfiles="/tmp/wx$port.files"
     getfilelist "$port" "$portfiles"
     
-    TMPFILESDIR=/tmp/wx$port/wxWidgets-$VERSION
+    TMPFILESDIR=/tmp/wx$port/wx$portname-$VERSION
     rm -rf $TMPFILESDIR
     mkdir -p $TMPFILESDIR
 
     copyfilelist $portfiles $APPDIR $TMPFILESDIR
 
     if [ $port = "msw" ]; then
-        FILES=`find . -type f \( -path '*/CVS/*' -prune -o -exec distrib/scripts/is_text.sh {} \; -print \)`
+        FILES=`find . -type f \( -path '*/CVS/*' -prune -o -exec ${SCRIPTDIR}/is_text.sh {} \; -print \)`
         echo "$FILES" > /tmp/textfiles
     fi
 
     pushd /tmp/wx$port
     # use DOS line endings for text files for MSW archives.
     if [ $port = "msw" ]; then
-        pushd /tmp/wx$port/wxWidgets-$VERSION
+        pushd /tmp/wx$port/wx$portname-$VERSION
         for file in `cat /tmp/textfiles`; do
-            todos $file
+            unix2dos $file
         done
         popd
     fi
     echo "Creating wx$portname-$VERSION.zip..."
     zip $ZIPFLAGS -r -9 $APPDIR/deliver/wx$portname-$VERSION.zip .
     echo "Creating wx$portname-$VERSION.tar.gz..."
-    tar czvf $APPDIR/deliver/wx$portname-$VERSION.tar.gz wxWidgets-$VERSION
+    tar czf $APPDIR/deliver/wx$portname-$VERSION.tar.gz wx$portname-$VERSION
     echo "Creating wx$portname-$VERSION.tar.bz2..."
-    tar ch wxWidgets-$VERSION | bzip2 -f9 > $APPDIR/deliver/wx$portname-$VERSION.tar.bz2
+    tar ch wx$portname-$VERSION | bzip2 -f9 > $APPDIR/deliver/wx$portname-$VERSION.tar.bz2
     popd
     rm -rf /tmp/wx$port
+    rm ${portfiles}
+#    rm /tmp/textfiles
 }
 
 prepareforrelease()
@@ -197,7 +199,7 @@ prepareforrelease()
     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 *.spec
     rm -f src/gtk/descrip.mms src/motif/descrip.mms
     
     # Copy setup0.h files to setup.h