diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh index 2a32f717ab..8ec90c1b4f 100755 --- 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 149d421600..d6ab2d8dcf 100644 --- 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 62e03b5b14..275388c728 100644 --- 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 85dc89f10d..cd4958d6d5 100644 --- 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 997a9d5c6b..1b93cb07ed 100644 --- 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 b24f5a1132..e23f87e1aa 100644 --- 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 69f4519051..aa8835c6d5 100644 --- 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 488d664f0e..673c2f0e3d 100644 --- 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 172e60db09..e8937008b5 100644 --- 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