X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d20e98ab7a317c2eb194b95484a17534d8fc44b9..ded2661ab0b63742ea3bc612164e5a8120a649ec:/distrib/scripts/msw/makesetup.sh?ds=sidebyside

diff --git a/distrib/scripts/msw/makesetup.sh b/distrib/scripts/msw/makesetup.sh
index f82d96e967..5a9d4f5e7b 100755
--- a/distrib/scripts/msw/makesetup.sh
+++ b/distrib/scripts/msw/makesetup.sh
@@ -49,19 +49,43 @@ getfilelist(){
     filelist="$filelist $commonfiles" 
   fi 
   
-  if [ $port = "msw" || $port = "all" ]; then
-    filelist="$filelist msw.rsp univ.rsp vc.rsp mmedia.rsp wince.rsp palmos.rsp"
+  if [ $port = "msw" ] || [ $port = "all" ]; then
+    filelist="$filelist msw.rsp univ.rsp vc.rsp mmedia.rsp wince.rsp dmc.rsp"
   fi
   
-  if [ $port = "os2" || $port = "all" ]; then
-     filelist="$filelist os2.rsp"
+  if [ $port = "os2" ] || [ $port = "all" ]; then
+    filelist="$filelist os2.rsp"
+  fi
+  
+  if [ $port = "x11" ] || [ $port = "all" ]; then
+    filelist="$filelist x11.rsp"
+  fi
+  
+  if [ $port = "mgl" ] || [ $port = "all" ]; then
+    filelist="$filelist mgl.rsp" 
+  fi
+  
+  if [ $port = "gtk" ] || [ $port = "all" ]; then
+    filelist="$filelist gtk.rsp"
+  fi
+  
+  if [ $port = "cocoa" ] || [ $port = "all" ]; then
+    filelist="$filelist cocoa.rsp"
+  fi
+  
+  if [ $port = "motif" ] || [ $port = "all" ]; then
+    filelist="$filelist motif.rsp"
+  fi
+  
+  if [ $port = "mac" ] || [ $port = "all" ]; then
+    filelist="$filelist mac.rsp"
   fi
   
   if [ $port = "all" ]; then
-      filelist="$filelist x11.rsp gtk.rsp cocoa.rsp motif.rsp mac.rsp mgl.rsp"
+    filelist="$filelist palmos.rsp"
   fi
   
-  tempfile="/tmp/$portfiles.in"
+  tempfile="/tmp/wx$port.files.in"
   rm -f $tempfile 
   rm -f $outfile
   
@@ -133,6 +157,26 @@ rearchive()
     popd
 }
 
+ziptotar()
+{
+    archive=$1
+    dirname=$2
+    changeto=$3
+
+    pushd $changeto
+
+    unzip $ZIPFLAGS $archive
+    
+    tar cfz $archive.tar.gz $dirname
+
+    tar -cvf $dirname | bzip2 -9 > $archive.tar.bz2
+    
+    rm -rf $dirname
+
+    popd
+}
+
+
 rearchivetar()
 {
     archive=$1
@@ -323,78 +367,47 @@ dospindocs()
     rearchive wxWidgets-$VERSION-ExtraDoc.zip wxWidgets-$VERSION $DESTDIR
 }
 
-dospinmisc()
-{
-    cd $APPDIR
-
-    # zip up Univ-specific files
-    echo Creating $DESTDIR/wxWidgets-$VERSION-Univ.zip
-    expandlines $MANIFESTDIR/univ.rsp /tmp/univfiles
-    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-Univ.zip < /tmp/univfiles
-    rearchive wxWidgets-$VERSION-Univ.zip wxWidgets-$VERSION $DESTDIR
-
-    # DMC project files
-    echo Creating $DESTDIR/wxWidgets-$VERSION-DMC.zip
-    expandlines $MANIFESTDIR/dmc.rsp /tmp/dmcfiles
-    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-DMC.zip < /tmp/dmcfiles
-    rearchive wxWidgets-$VERSION-DMC.zip wxWidgets-$VERSION $DESTDIR
-
-    # BC++ project files
-    echo Creating $DESTDIR/wxWidgets-$VERSION-BC.zip
-    expandlines $MANIFESTDIR/bc.rsp /tmp/bcfiles
-    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-BC.zip < /tmp/bcfiles
-    rearchive wxWidgets-$VERSION-BC.zip wxWidgets-$VERSION $DESTDIR
-
-}
-
 
 dospinport(){
     port=$1
     
-    upperport="`echo $port|tr '[a-z]' '[A-Z]'`"
-    echo "Zipping wx$upperport..."
+    if [ $port != "all" ]; then
+        portname="`echo $port|tr '[a-z]' '[A-Z]'`"    
+    else
+        portname="wxWidgets"
+    fi
+    
+    echo "Zipping wx$portname..."
 
     cd $APPDIR
-    getfilelist "$port" "/tmp/$port_filelist"
+    portfiles="/tmp/wx$port.files"
+    getfilelist "$port" "$portfiles"
 
-    mkdir -p /tmp/wx$port/wxWidgets-$VERSION
+    zip $ZIPFLAGS -@ $DESTDIR/wx$portname-$VERSION.zip < $portfiles 
+    zip $ZIPFLAGS -g $DESTDIR/wx$portname-$VERSION.zip LICENSE.txt COPYING.LIB CHANGES.txt README.txt
     
-    for line in `cat /tmp/$port_filelist` ; do
-        cp -r $line /tmp/wx$port/wxWidgets-$VERSION
-    done
+    if [ $port = "msw" ] || [ $port = "all" ]; then
+        zip $ZIPFLAGS -g $DESTDIR/wx$portname-$VERSION.zip README-MSW.txt INSTALL-MSW.txt        
+    fi
     
-    cd /tmp/wxWidgets-$VERSION
-
-    echo Copying readme files...
-    cp $APPDIR/docs/msw/readme.txt README-MSW.txt
-    cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt
-    cp $APPDIR/docs/licence.txt LICENCE.txt
-    cp $APPDIR/docs/lgpl.txt COPYING.LIB
-    cp $APPDIR/docs/changes.txt CHANGES.txt
-    cp $APPDIR/docs/readme.txt README.txt
-
-    zip $ZIPFLAGS -r -@ $DESTDIR/wx$upperport-$VERSION.zip /tmp/wx$port/wxWidgets-$VERSION 
+    if [ $port = "os2" ] || [ $port = "all" ]; then
+        zip $ZIPFLAGS -g $DESTDIR/wx$portname-$VERSION.zip INSTALL-OS2.txt          
+    fi
+    
+    # put all files in a wxWidgets-$VERSION subdir in the zip archive
+    rearchive wx$portname-$VERSION.zip wxWidgets-$VERSION $DESTDIR
 }
 
 dospininstaller()
 {
     cd $DESTDIR
 
-    # Put all archives for transit to Linux in a zip file
-    echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
-    rm -f $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
-    zip $ZIPFLAGS $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip wxWidgets-$VERSION-LinuxDocs.zip wxWidgets-$VERSION-DMC.zip
-
     rm -f -r wxWidgets-$VERSION
 
     echo Unzipping the Windows files into wxWidgets-$VERSION
 
     mkdir -p wxWidgets-$VERSION
 
-    unzip $ZIPFLAGS -o wxWidgets-$VERSION-win.zip -d wxWidgets-$VERSION
-    unzip $ZIPFLAGS -o wxWidgets-$VERSION-DMC.zip -d wxWidgets-$VERSION
-    unzip $ZIPFLAGS -o wxWidgets-$VERSION-BC.zip -d wxWidgets-$VERSION
-
     unzip $ZIPFLAGS -o wxWidgets-$VERSION-HTMLHelp.zip
     unzip $ZIPFLAGS -o wxWidgets-$VERSION-ExtraDoc.zip
 
@@ -414,25 +427,18 @@ dospininstaller()
     rm -f *.spec
     rm -f src/gtk/descrip.mms src/motif/descrip.mms
 
-    echo Copying readme files...
-    cp $APPDIR/docs/msw/readme.txt README-MSW.txt
-    cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt
-    cp $APPDIR/docs/licence.txt LICENCE.txt
-    cp $APPDIR/docs/lgpl.txt COPYING.LIB
-    cp $APPDIR/docs/changes.txt CHANGES.txt
-    cp $APPDIR/docs/readme.txt README.txt
 
     # Disabled for now - Now cp some binary files to 'bin'
     if [ ! -d bin ]; then
         mkdir bin
     fi
     
-    cp $APPDIR/bin/tex2rtf.exe bin
-    cp $APPDIR/bin/tex2rtf.chm bin
-    cp $APPDIR/bin/widgets.exe bin
-    cp $APPDIR/bin/life.exe bin
-    cp $APPDIR/demos/life/breeder.lif bin
-    cp $APPDIR/docs/htmlhelp/tex2rtf.chm bin
+    #cp $APPDIR/bin/tex2rtf.exe bin
+    #cp $APPDIR/bin/tex2rtf.chm bin
+    #cp $APPDIR/bin/widgets.exe bin
+    #cp $APPDIR/bin/life.exe bin
+    #cp $APPDIR/demos/life/breeder.lif bin
+    #cp $APPDIR/docs/htmlhelp/tex2rtf.chm bin
 
     if [ ! -d docs/pdf ]; then
         mkdir docs/pdf
@@ -522,10 +528,7 @@ dospininstaller()
     # echo Putting all the setup files into a single zip archive
     # zip wxMSW-$VERSION-setup.zip readme-$VERSION.txt setup*.*
 
-    rm -f wxWidgets-$VERSION-win.zip
     rm -f wxWidgets-$VERSION-ExtraDoc.zip
-    rm -f wxWidgets-$VERSION-DMC.zip
-    rm -f wxWidgets-$VERSION-Univ.zip
     rm -f wxWidgets-$VERSION-DocSource.zip
     rm -f wxWidgets-$VERSION-LinuxDocs.zip
 
@@ -535,10 +538,6 @@ dospininstaller()
 
 makesetup()
 {
-#    if [ -d $SETUPIMAGEDIR ]; then
-#        echo Removing contents of existing $SETUPIMAGEDIR
-#        rm -f -r $SETUPIMAGEDIR/*
-#    fi
 
     if [ ! -d $SETUPIMAGEDIR ]; then
         echo Making the $SETUPIMAGEDIR for preparing the setup
@@ -606,7 +605,16 @@ makesetup()
     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
+    cp $APPDIR/docs/os2/install.txt INSTALL-OS2.txt
+    cp $APPDIR/docs/licence.txt LICENCE.txt
+    cp $APPDIR/docs/lgpl.txt COPYING.LIB
+    cp $APPDIR/docs/changes.txt CHANGES.txt
+    cp $APPDIR/docs/readme.txt README.txt
+    
     # 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
@@ -618,11 +626,6 @@ makesetup()
         dospinport "os2" #dospinos2
     fi
 
-    # Do Mac spin
-    if [ "$SPINMAC" = "1" ] || [ "$SPINALL" = "1" ]; then
-        dospinmac
-    fi
-
     # Do MSW spin
     if [ "$SPINMSW" = "1" ] || [ "$SPINALL" = "1" ]; then
         dospinport "msw" #dospinmsw
@@ -638,14 +641,22 @@ makesetup()
         dospinport "all" #dospinwxall
     fi
 
+    if [ "$SPINALL" = "1" ]; then
+        dospinport "mgl"
+        dospinport "gtk"
+        dospinport "x11"
+        dospinport "motif"
+        dospinport "mac"
+        dospinport "cocoa"
+        #dospinwxall
+    fi
+
+
     # Do docs spin
     if [ "$SPINDOCS" = "1" ] || [ "$SPINALL" = "1" ]; then
         dospindocs
     fi
 
-    # Do misc files spin
-    dospinmisc
-
     docopydocs $APPDIR $DESTDIR
     
     # Time to regenerate the Inno Install script