Script updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index f4568c89594281adaf2a57eea48907a79782b420..e02fca6706dbe4e26d4205487db4f9c0143f0be1 100644 (file)
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -11,6 +11,8 @@ docs/licence.txt
 docs/msw/*.txt
 docs/wine/*.txt
 docs/wine/COPYING.LIB
 docs/msw/*.txt
 docs/wine/*.txt
 docs/wine/COPYING.LIB

+docs/microwin/readme.txt
+docs/microwin/microwindows.patches

 
 distrib/msw/*.rsp
 distrib/msw/*.bat
 
 distrib/msw/*.rsp
 distrib/msw/*.bat

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 1aaa1723b05a163b85507c9286d36434f8bf1f2e..232504e67d8c002ffe12d80d6c9c15fdaae92738 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -156,6 +156,23 @@ $TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
 rm -f -r wxWindows-${WXVER}
 gzip $2/wxMac-${WXVER}.tar
 
 rm -f -r wxWindows-${WXVER}
 gzip $2/wxMac-${WXVER}.tar
 

+### wxUniv: universal-specific files
+cd $1
+cat $1/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
+expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
+$TAR cf $2/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
+
+echo Re-tarring wxUniversal in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-Univ.tar
+cd ..
+rm -f wxWindows-${WXVER}-Univ.tar
+$TAR cf $2/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxWindows-${WXVER}-Univ.tar
+

 ### 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
 ### 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

diff --git a/distrib/msw/univ.rsp b/distrib/msw/univ.rsp
index ebb03ea24fafb9e734947b478221f8926ab3426e..7f3b9468ee7da748dd7351c28f4cbd8f8d5714ea 100644 (file)
--- a/distrib/msw/univ.rsp
+++ b/distrib/msw/univ.rsp
@@ -8,7 +8,5 @@ src/univ/*.c
 src/univ/*.lst
 src/univ/themes/*.cpp
 
 src/univ/*.lst
 src/univ/themes/*.cpp
 

-docs/microwin/readme.txt
-docs/microwin/microwindows.patches

 docs/univ/*.txt
 
 docs/univ/*.txt
 

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index 6c3d78c339a638b697941cf33e49894e929b617a..83e09dd20b3ac3766c2ae815259ceac3fdc6f62d 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -218,7 +218,9 @@ copy %src\docs\x11\readme.txt %dest\readme-x11-%version%.txt
 copy %src\docs\x11\readme-nanox.txt %dest\readme-nanox-%version%.txt
 copy %src\docs\msw\readme.txt %dest\readme-msw-%version%.txt
 copy %src\docs\mac\readme.txt %dest\readme-mac-%version%.txt
 copy %src\docs\x11\readme-nanox.txt %dest\readme-nanox-%version%.txt
 copy %src\docs\msw\readme.txt %dest\readme-msw-%version%.txt
 copy %src\docs\mac\readme.txt %dest\readme-mac-%version%.txt

+copy %src\docs\base\readme.txt %dest\readme-base-%version%.txt

 copy %src\docs\os2\install.txt %dest\install-os2-%version%.txt
 copy %src\docs\os2\install.txt %dest\install-os2-%version%.txt

+copy %src\docs\univ\readme.txt %dest\readme-univ-%version%.txt

 copy %src\docs\readme_vms.txt %dest\readme-vms-%version%.txt
 copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
 copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
 copy %src\docs\readme_vms.txt %dest\readme-vms-%version%.txt
 copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
 copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%