Create the root dir install and readme files, and put them in the manifests. Also...

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

diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh
index 2a32f717abfc3cbed8c80c7a509b98542d0d31ee..8ec90c1b4f09d5de42a36086728d1e5c32694d77 100755 (executable)
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -132,15 +132,11 @@ dospinport(){
 
     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        
-    fi
-    
     pushd /tmp/wx$port
+    # use DOS line endings for all files for MSW archives.
+    if [ $port = "msw" ]; then
+        unix2dos `cat $portfiles`
+    fi
     echo "Creating wx$portname-$VERSION.zip..."
     zip $ZIPFLAGS -r -9 $APPDIR/deliver/wx$portname-$VERSION.zip .
     echo "Creating wx$portname-$VERSION.tar.gz..."
@@ -167,6 +163,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/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
@@ -183,7 +197,7 @@ prepareforrelease()
     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 have DOS line endings.
+    # Make MSW project files always have DOS line endings.
     unix2dos `cat $MANIFESTDIR/vc.rsp` 
     
     popd

diff --git a/distrib/scripts/manifests/cocoa.rsp b/distrib/scripts/manifests/cocoa.rsp
index 149d421600629049cafdd59445165a6bb3906fed..d6ab2d8dcfc9234d39389f6594d0312eca9ed4d5 100644 (file)
--- a/distrib/scripts/manifests/cocoa.rsp
+++ b/distrib/scripts/manifests/cocoa.rsp
@@ -1,3 +1,6 @@
+install-cocoa.txt
+readme-cocoa.txt
+
 include/wx/cocoa/*.h
 src/cocoa/*.cpp
 src/cocoa/*.mm

diff --git a/distrib/scripts/manifests/gtk.rsp b/distrib/scripts/manifests/gtk.rsp
index 62e03b5b14b82d0f13b975e5dffedeb1b9f9c3a3..275388c728ffa3b87db5166965ce41232427c5b0 100644 (file)
--- a/distrib/scripts/manifests/gtk.rsp
+++ b/distrib/scripts/manifests/gtk.rsp
@@ -1,3 +1,6 @@
+install-gtk.txt
+readme-gtk.txt
+
 docs/gtk/*.html
 docs/gtk/*.txt
 docs/gtk/COPYING.LIB

diff --git a/distrib/scripts/manifests/mac.rsp b/distrib/scripts/manifests/mac.rsp
index 85dc89f10dc544a9a37d2e0e2092096ddf4763ff..cd4958d6d5d8606f088f7337dd386dd2a33b97ef 100644 (file)
--- a/distrib/scripts/manifests/mac.rsp
+++ b/distrib/scripts/manifests/mac.rsp
@@ -1,3 +1,6 @@
+install-mac.txt
+readme-mac.txt
+
 lib/dummy
 
 docs/licence.txt

diff --git a/distrib/scripts/manifests/mgl.rsp b/distrib/scripts/manifests/mgl.rsp
index 997a9d5c6b10867e796916743b62628c508dda2a..1b93cb07ed717a59b9dfea357ae72741e1ef44de 100644 (file)
--- a/distrib/scripts/manifests/mgl.rsp
+++ b/distrib/scripts/manifests/mgl.rsp
@@ -1,3 +1,6 @@
+install-mgl.txt
+readme-mgl.txt
+
 build/mgl/*
 
 include/wx/mgl/*.h

diff --git a/distrib/scripts/manifests/motif.rsp b/distrib/scripts/manifests/motif.rsp
index b24f5a11323b1b0540e2904d3f8e85faae4a13a5..e23f87e1aa63da5f1716de87a4090b6ea06efb70 100644 (file)
--- a/distrib/scripts/manifests/motif.rsp
+++ b/distrib/scripts/manifests/motif.rsp
@@ -1,3 +1,6 @@
+install-motif.txt
+readme-motif.txt
+
 src/motif/files.lst
 src/motif/*.cpp
 src/motif/*.c

diff --git a/distrib/scripts/manifests/msw.rsp b/distrib/scripts/manifests/msw.rsp
index 69f4519051a37b53f464d00f3b04156208233544..aa8835c6d5f4f169905cc8a2895690b6663a0c32 100644 (file)
--- a/distrib/scripts/manifests/msw.rsp
+++ b/distrib/scripts/manifests/msw.rsp
@@ -1,3 +1,6 @@
+README-MSW.txt
+INSTALL-MSW.txt
+
 build/msw/config.*
 build/msw/makefile.*
 

diff --git a/distrib/scripts/manifests/os2.rsp b/distrib/scripts/manifests/os2.rsp
index 488d664f0e30aa0746956828314c1dc436b39ffa..673c2f0e3dd4b349cf25d2c6f8687424d4137762 100644 (file)
--- a/distrib/scripts/manifests/os2.rsp
+++ b/distrib/scripts/manifests/os2.rsp
@@ -1,3 +1,5 @@
+INSTALL-OS2.txt
+
 lib/dummy
 
 build/os2/*

diff --git a/distrib/scripts/manifests/x11.rsp b/distrib/scripts/manifests/x11.rsp
index 172e60db0910c2abb1d1057e698e6f41b0256127..e8937008b517522c4db93935eb4961ff6047ce2c 100644 (file)
--- a/distrib/scripts/manifests/x11.rsp
+++ b/distrib/scripts/manifests/x11.rsp
@@ -1,3 +1,6 @@
+install-x11.txt
+readme-x11.txt
+
 src/x11/files.lst
 src/x11/*.cpp
 src/x11/*.c