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 14f21ae24bac5ccba1e7285078b26a2a66854805..ca00468b28fa30781bc4b6d2756efdb537c32e5a 100755 (executable)
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -20,10 +20,10 @@ VERBOSE=0
 ZIPFLAGS=
 
 PROGNAME=$0
 ZIPFLAGS=
 
 PROGNAME=$0

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

 . $SCRIPTDIR/utils.inc
 
 . $SCRIPTDIR/utils.inc
 

-MANIFESTDIR=$SCRIPTDIR/manifests
+MANIFESTDIR=$WXWIN/distrib/scripts/manifests

 WEBFILES=$WXWIN/../wxWebSite
 if [ ! "$CYGPATH" = "" ]; then
   WEBFILES=`$CYGPATH "$WEBFILES"`
 WEBFILES=$WXWIN/../wxWebSite
 if [ ! "$CYGPATH" = "" ]; then
   WEBFILES=`$CYGPATH "$WEBFILES"`


@@ -76,7 +76,7 @@ getfilelist(){
   fi
   
   if [ $port = "all" ]; then
   fi
   
   if [ $port = "all" ]; then

-    filelist="$filelist palmos.rsp"
+    filelist="$filelist gtk1.rsp palmos.rsp docsrc.rsp"

   fi
   
   tempfile="/tmp/wx$port.files.in"
   fi
   
   tempfile="/tmp/wx$port.files.in"


@@ -126,29 +126,36 @@ dospinport(){
     portfiles="/tmp/wx$port.files"
     getfilelist "$port" "$portfiles"
     
     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
     rm -rf $TMPFILESDIR
     mkdir -p $TMPFILESDIR
 
     copyfilelist $portfiles $APPDIR $TMPFILESDIR

-    
-    if [ $port = "msw" ] || [ $port = "all" ]; then
-        cp -f README-MSW.txt INSTALL-MSW.txt $TMPFILESDIR      
-    fi
-    
-    if [ $port = "os2" ] || [ $port = "all" ]; then
-        cp -f INSTALL-OS2.txt $TMPFILESDIR        
+
+    if [ $port = "msw" ]; then
+        FILES=`find . -type f \( -path '*/CVS/*' -prune -o -exec ${SCRIPTDIR}/is_text.sh {} \; -print \)`
+        echo "$FILES" > /tmp/textfiles

     fi
     fi

-    
+

     pushd /tmp/wx$port
     pushd /tmp/wx$port

+    # use DOS line endings for text files for MSW archives.
+    if [ $port = "msw" ]; then
+        pushd /tmp/wx$port/wx$portname-$VERSION
+        for file in `cat /tmp/textfiles`; do
+            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..."
     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..."
     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
     popd
     rm -rf /tmp/wx$port

+    rm ${portfiles}
+#    rm /tmp/textfiles

 }
 
 prepareforrelease()
 }
 
 prepareforrelease()


@@ -167,6 +174,24 @@ prepareforrelease()
     cp $APPDIR/docs/lgpl.txt COPYING.LIB
     cp $APPDIR/docs/changes.txt CHANGES.txt
     cp $APPDIR/docs/readme.txt README.txt
     cp $APPDIR/docs/lgpl.txt COPYING.LIB
     cp $APPDIR/docs/changes.txt CHANGES.txt
     cp $APPDIR/docs/readme.txt README.txt

+
+    cp $APPDIR/docs/mgl/readme.txt $APPDIR/readme-mgl.txt
+    cp $APPDIR/docs/mgl/install.txt $APPDIR/install-mgl.txt
+
+    cp $APPDIR/docs/x11/readme.txt $APPDIR/readme-x11.txt
+    cp $APPDIR/docs/x11/install.txt $APPDIR/install-x11.txt
+
+    cp $APPDIR/docs/motif/readme.txt $APPDIR/readme-motif.txt
+    cp $APPDIR/docs/motif/install.txt $APPDIR/install-motif.txt
+
+    cp $APPDIR/docs/gtk/readme.txt $APPDIR/readme-gtk.txt
+    cp $APPDIR/docs/gtk/install.txt $APPDIR/install-gtk.txt
+
+    cp $APPDIR/docs/mac/readme.txt $APPDIR/readme-mac.txt
+    cp $APPDIR/docs/mac/install.txt $APPDIR/install-mac.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
     rm -f BuildCVS.txt descrip.mms
     
     # Now delete a few files that are unnecessary
     rm -f BuildCVS.txt descrip.mms


@@ -174,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 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
     rm -f src/gtk/descrip.mms src/motif/descrip.mms
     
     # Copy setup0.h files to setup.h


@@ -182,6 +207,10 @@ prepareforrelease()
     # 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
     # 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.
+    unix2dos `cat $MANIFESTDIR/vc.rsp` 
+    

     popd
 }
 
     popd
 }