Fixed variable name mismatch.

[wxWidgets.git] / distrib / msw / tarwxall

diff --git a/distrib/msw/tarwxall b/distrib/msw/tarwxall
index 896ebb327a96461ab6211cd177f56b4c7a392540..eb4c107e95ffbae7495f5d506a6d2fb9801ce0dd 100755 (executable)
--- a/distrib/msw/tarwxall
+++ b/distrib/msw/tarwxall
@@ -66,7 +66,7 @@ rm -f $2/wxAll-${WXVER}*.tar.gz
 
 ### wxAll: all distributions in one giant archive
 cd $1
-cat $1/distrib/msw/generic.rsp $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/mac.rsp $1/distrib/msw/os2.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/mgl.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/mmedia.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
+cat $1/distrib/msw/generic.rsp $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/mac.rsp $1/distrib/msw/os2.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/mgl.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/deprecated.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/mmedia.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
 expandlines /tmp/wxall_in.txt /tmp/wxall.txt
 $TAR cf $2/wxAll-${WXVER}.tar -T /tmp/wxall.txt
 
@@ -74,26 +74,36 @@ echo Re-tarring wxAll in a subdirectory...
 cd $2
 rm -f -r wxWindows-${WXVER}
 mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
 
-# Copy OS/2 specific configure files
-cp $1/distrib/os2/os2-specific.zip docs/os2
+# If we have the full set of VC++ project files,
+# get them
+if [ -f $2/extra/wxWindows-${WXVER}-VC.zip ]; then
+  unzip -o $2/extra/wxWindows-${WXVER}-VC.zip
+else
+  echo "Warning - did not find $2/deliver/extra/wxWindows-${WXVER}-VC.zip"
+fi
+
+cd wxWindows-${WXVER}
+$TAR xf ../wxAll-${WXVER}.tar
 
 # Translate all .dsp and .dsw files to DOS format
 unix2dos --unix2dos `cat $1/distrib/msw/vc.rsp`
 
+# Copy OS/2 specific configure files
+cp $1/distrib/os2/os2-specific.zip docs/os2
+
 # Copy the OS/2 files which probably haven't been copied yet
 mkdir include/wx/os2
 mkdir src/os2
 cp $1/include/wx/os2/*.H include/wx/os2
-cp $1/src/os2/*.CPP src/os2
+cp $1/src/os2/*.CPP $1/src/os2/*.I src/os2
 
 # Make all OS/2 files lower case
-$1/distrib/namedown include/wx/os2/*.H
-$1/distrib/namedown src/os2/*.CPP
+$1/distrib/msw/namedown include/wx/os2/*.H
+$1/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
 
-$TAR xf ../wxAll-${WXVER}.tar
 cd ..
+
 rm -f wxAll-${WXVER}.tar
 $TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
 rm -f -r wxWindows-${WXVER}