Fixes for distribution scripts

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-10-12 16:32:03 +00:00
parent 1be06faf73
commit 73a2995f98
12 changed files with 456 additions and 165 deletions

View File

@@ -1,6 +1,5 @@
*.spec
BuildCVS.txt
acconfig.h
*.m4
autogen.sh
configure
@@ -9,15 +8,11 @@ config.sub
configure.in
setup.h.in
install-sh
ltconfig
ltmain.sh
missing
mkinstalldirs
modules
template.mak
wx-config.in
makefile.unx.in
wxinstall
setup.h_vms
distrib/msw/*.rsp
@@ -41,9 +36,7 @@ locale/*.mo
docs/readme.txt
docs/readme_vms.txt
docs/install.txt
docs/release.txt
docs/changes.txt
docs/upgrade.txt
docs/todo.txt
docs/licence.txt
docs/licendoc.txt
@@ -63,9 +56,6 @@ docs/tech/*.txt
docs/tech/*.htm
src/makeenvs/*.env
src/make.env
src/makeprog.env
src/makelib.env
src/*.inc
src/mkdir
@@ -1126,4 +1116,3 @@ demos/dbbrowse/help.std/*.htm
demos/dbbrowse/help.std/*.hhc
demos/dbbrowse/help.std/*.hhp
demos/dbbrowse/help.std/*.hhk

View File

@@ -9,13 +9,10 @@ docs/gtk/makewxgtk
include/wx/gtk/*.h
include/wx/gtk/*.xpm
include/install-sh
include/wx/install-sh
src/gtk/files.lst
src/gtk/*.cpp
src/gtk/*.c
src/gtk/*.inc
src/gtk/*.xbm
src/iodbc/*.c

View File

@@ -16,7 +16,6 @@ samples/dragimag/Makefile.in
samples/drawing/Makefile.in
samples/dynamic/Makefile.in
samples/exec/Makefile.in
samples/genvalid/Makefile.in
samples/grid/Makefile.in
samples/newgrid/Makefile.in
samples/help/Makefile.in
@@ -60,7 +59,6 @@ samples/treectrl/Makefile.in
samples/typetest/Makefile.in
samples/validate/Makefile.in
samples/wizard/Makefile.in
samples/socket/Makefile.in
samples/dialup/Makefile.in
samples/font/Makefile.in
samples/menu/Makefile.in

51
distrib/msw/makewise.sh Normal file
View File

@@ -0,0 +1,51 @@
#! /bin/sh
# Make a WISE Installer distribution list, where each file is represented by
# a section like this:
#
# item: Install File
# Source=d:\wx2\thefile.txt
# Destination=%MAINDIR%\thefile.txt
# Flags=0000000000000010
# end
wxdir=`cygpath -u $WXWIN`
tempdir=`cygpath -u $TEMP`
# Generate a list of all files in the distribution.
# We pass the output through sed in order to remove the preceding "./"
cd $wxdir/deliver/wx
find . -print | sed -e "s/\.\\///g" > $tempdir/files1.tmp
# Now we iterate through the list of files, writing out the middle section of
# the file.
# We have to remove the first part of the path,
# by truncating the start by the size of the current directory.
rm -f $tempdir/files2.tmp
# First add system files
cat $wxdir/distrib/msw/wisesys.txt > $tempdir/files2.tmp
for line in `cat $tempdir/files1.tmp` ; do
# If not a directory, add to file
if [ ! -d $line ] ; then
# The relative path
line2=`cygpath -w $line`
# The absolute path
line1=$WXWIN"\\"$line2
echo "item: Install File " >> $tempdir/files2.tmp
echo " Source=$line1 " >> $tempdir/files2.tmp
echo " Destination=%MAINDIR%\\"$line2 >> $tempdir/files2.tmp
echo " Flags=0000000000000010" >> $tempdir/files2.tmp
echo "end" >> $tempdir/files2.tmp
fi
done
# Concatenate the 3 sections
cat $wxdir/distrib/msw/wisetop.txt $tempdir/files2.tmp $wxdir/distrib/msw/wisebott.txt > $wxdir/distrib/msw/wxwin2.wse
rm -f $tempdir/files1.tmp

View File

@@ -53,6 +53,7 @@ src/common/dosyacc.c
src/common/doslex.c
src/common/y_tab.c
src/common/lex_yy.c
src/common/*.rc
src/msw/*.cpp
src/msw/*.h

View File

@@ -1,3 +1,8 @@
wxBase.dsp
wxBase.dsw
wxBaseDll.dsp
wxBaseDll.dsw
src/wxvc.dsp
src/wxvc.dsw
src/wxvc_dll.dsp
@@ -138,6 +143,9 @@ samples/newgrid/NewgridVC.dsw
samples/notebook/NotebookVC.dsp
samples/notebook/NotebookVC.dsw
samples/oleauto/OleautoVC.dsp
samples/oleauto/OleautoVC.dsw
samples/ownerdrw/OwnerDrwVC.dsp
samples/ownerdrw/OwnerDrwVC.dsw
@@ -150,6 +158,9 @@ samples/png/PngVC.dsw
samples/printing/PrintingVC.dsp
samples/printing/PrintingVC.dsw
samples/proplist/ProplistVC.dsp
samples/proplist/ProplistVC.dsw
samples/propsize/PropsizeVC.dsp
samples/propsize/PropsizeVC.dsw
@@ -247,6 +258,9 @@ utils/tex2rtf/src/Tex2RTFVC.dsw
utils/hhp2cached/hhp2cachedVC.dsp
utils/hhp2cached/hhp2cachedVC.dsw
utils/helpgen/src/HelpGenVC.dsp
utils/helpgen/src/HelpGenVC.dsw
contrib/src/ogl/OglVC.dsp
contrib/src/ogl/OglVC.dsw
@@ -258,7 +272,8 @@ contrib/samples/ogl/studio/StudioVC.dsw
contrib/src/xml/wxXMLVC.dsp
contrib/src/xml/wxXMLVC.dsw
contrib/samples/ogl/ogledit/OgleditVC.dsp
contrib/samples/xml/XmlDemoVC.dsp
contrib/samples/xml/XmlDemoVC.dsw
contrib/src/mmedia/MmediaVC.dsp
contrib/src/mmedia/MMediaVC.dsw
@@ -275,3 +290,9 @@ contrib/samples/stc/StcTestVC.dsw
contrib/utils/wxrc/wxrcVC.dsp
contrib/utils/wxrc/wxrcVC.dsw
contrib/utils/convertrc/ConvertVC.dsp
contrib/utils/convertrc/ConvertVC.dsw
contrib/utils/wxrcedit/wxrceditVC.dsp
contrib/utils/wxrcedit/wxrceditVC.dsw

View File

@@ -1,7 +1,7 @@
Document Type: WSE
item: Global
Version=5.0
Title=wxWindows 2.2.0 Installation
Title=wxWindows 2.3.0 Installation
Flags=00000100
Split=1420
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -17,7 +17,7 @@ item: Global
Patch Flags=0000000000000001
Patch Threshold=85
Patch Memory=4000
EXE Filename=D:\wx2\wxWindows\deliver\setup.exe
EXE Filename=d:\wx2dev\wxWindows\deliver\setup.exe
FTP Cluster Size=20
Variable Name1=_SYS_
Variable Default1=C:\WINDOWS\SYSTEM
@@ -47,7 +47,7 @@ item: End Block
end
item: Set Variable
Variable=APPTITLE
Value=wxWindows 2.2.0
Value=wxWindows 2.3.0
end
item: Set Variable
Variable=GROUP
@@ -62,7 +62,7 @@ item: Set Variable
Value=wx2
end
item: Display Graphic
Pathname=D:\wx2\wxWindows\distrib\msw\wxwin01.bmp
Pathname=d:\wx2dev\wxWindows\distrib\msw\wxwin01.bmp
X Position=16
Y Position=16
end

137
distrib/msw/xml.rsp Normal file
View File

@@ -0,0 +1,137 @@
contrib/docs/html/xml/*.htm
contrib/docs/html/xml/*.gif
contrib/docs/html/xml/*.png
contrib/docs/winhelp/xml.hlp
contrib/docs/winhelp/xml.cnt
contrib/docs/pdf/xml.pdf
contrib/docs/latex/xml/*.tex
contrib/docs/latex/xml/*.sty
contrib/docs/latex/xml/*.bib
contrib/docs/latex/xml/*.hpj
contrib/docs/latex/xml/*.ini
contrib/docs/latex/xml/*.txt
contrib/docs/latex/xml/*.cnt
contrib/docs/latex/xml/*.eps
contrib/docs/latex/xml/*.bmp
contrib/docs/latex/xml/*.gif
contrib/docs/latex/xml/*.wmf
contrib/src/xml/*.cpp
contrib/src/xml/*.h
contrib/src/xml/*.rc
contrib/src/xml/*.def
contrib/src/xml/*.xbm
contrib/src/xml/*.xpm
contrib/src/xml/XmlVC.dsp
contrib/src/xml/XmlVC.dsw
contrib/src/xml/makefile.vc
contrib/src/xml/makefile.bcc
contrib/src/xml/makefile.b32
contrib/src/xml/makefile.wat
contrib/src/xml/makefile.g95
contrib/src/xml/makefile.unx
contrib/src/xml/makefile.dos
contrib/src/xml/makefile.vms
contrib/src/xml/Makefile.in
contrib/src/xml/*.txt
contrib/src/xml/*.ico
contrib/src/xml/*.bmp
contrib/src/xml/README
contrib/include/wx/xml/*.h
contrib/samples/xml/*.cpp
contrib/samples/xml/*.h
contrib/samples/xml/*.rc
contrib/samples/xml/*.def
contrib/samples/xml/*.xbm
contrib/samples/xml/makefile.vc
contrib/samples/xml/makefile.bcc
contrib/samples/xml/makefile.b32
contrib/samples/xml/makefile.wat
contrib/samples/xml/makefile.g95
contrib/samples/xml/makefile.unx
contrib/samples/xml/makefile.dos
contrib/samples/xml/makefile.vms
contrib/samples/xml/Makefile.in
contrib/samples/xml/*.txt
contrib/samples/xml/*.ico
contrib/samples/xml/*.bmp
contrib/samples/xml/*.xpm
contrib/samples/xml/XmlDemoVC.dsp
contrib/samples/xml/XmlDemoVC.dsw
contrib/samples/xml/rc/*.bmp
contrib/samples/xml/rc/*.gif
contrib/samples/xml/rc/*.ico
contrib/samples/xml/rc/.xpm
contrib/samples/xml/rc/.xrc
contrib/utils/convertrc/*.cpp
contrib/utils/convertrc/*.h
contrib/utils/convertrc/*.rc
contrib/utils/convertrc/*.def
contrib/utils/convertrc/*.xbm
contrib/utils/convertrc/makefile.vc
contrib/utils/convertrc/makefile.bcc
contrib/utils/convertrc/makefile.b32
contrib/utils/convertrc/makefile.wat
contrib/utils/convertrc/makefile.g95
contrib/utils/convertrc/makefile.unx
contrib/utils/convertrc/makefile.dos
contrib/utils/convertrc/makefile.vms
contrib/utils/convertrc/Makefile.in
contrib/utils/convertrc/*.txt
contrib/utils/convertrc/*.ico
contrib/utils/convertrc/*.bmp
contrib/utils/convertrc/*.xpm
contrib/utils/convertrc/ConvertVC.dsp
contrib/utils/convertrc/ConvertVC.dsw
contrib/utils/wxrc/*.cpp
contrib/utils/wxrc/*.h
contrib/utils/wxrc/*.rc
contrib/utils/wxrc/*.def
contrib/utils/wxrc/*.xbm
contrib/utils/wxrc/makefile.vc
contrib/utils/wxrc/makefile.bcc
contrib/utils/wxrc/makefile.b32
contrib/utils/wxrc/makefile.wat
contrib/utils/wxrc/makefile.g95
contrib/utils/wxrc/makefile.unx
contrib/utils/wxrc/makefile.dos
contrib/utils/wxrc/makefile.vms
contrib/utils/wxrc/Makefile.in
contrib/utils/wxrc/*.txt
contrib/utils/wxrc/*.ico
contrib/utils/wxrc/*.bmp
contrib/utils/wxrc/*.xpm
contrib/utils/wxrc/wxrcVC.dsp
contrib/utils/wxrc/wxrcVC.dsw
contrib/utils/wxrcedit/*.cpp
contrib/utils/wxrcedit/*.h
contrib/utils/wxrcedit/*.rc
contrib/utils/wxrcedit/*.def
contrib/utils/wxrcedit/*.xbm
contrib/utils/wxrcedit/makefile.vc
contrib/utils/wxrcedit/makefile.bcc
contrib/utils/wxrcedit/makefile.b32
contrib/utils/wxrcedit/makefile.wat
contrib/utils/wxrcedit/makefile.g95
contrib/utils/wxrcedit/makefile.unx
contrib/utils/wxrcedit/makefile.dos
contrib/utils/wxrcedit/makefile.vms
contrib/utils/wxrcedit/Makefile.in
contrib/utils/wxrcedit/*.txt
contrib/utils/wxrcedit/*.ico
contrib/utils/wxrcedit/*.bmp
contrib/utils/wxrcedit/*.xpm
contrib/utils/wxrcedit/wxrceditVC.dsp
contrib/utils/wxrcedit/wxrceditVC.dsw
contrib/utils/wxrcedit/df/*.df
distrib/msw/xml.rsp
distrib/msw/zipxml.bat

View File

@@ -1,161 +1,166 @@
@echo off
rem Zip up an external, generic + Windows distribution of wxWindows 2
set src=%wxwin
set dest=%src\deliver
set src=%wxwin%
set dest=%src%\deliver
set wise=0
Rem Set this to the required version
set version=2.2.0
set version=2.3.0
if "%src" == "" goto usage
if "%dest" == "" goto usage
if "%1" == "-help" goto usage
if "%1" == "--help" goto usage
if "%1" == "/?" goto usage
if "%1" == "wiseonly" goto dounzip
if "%1" == "wise" set wise=1
if "%src%" == "" goto usage
if "%dest%" == "" goto usage
if "%1%" == "-help" goto usage
if "%1%" == "--help" goto usage
if "%1%" == "/?" goto usage
if "%1%" == "wiseonly" goto dounzip
if "%1%" == "wise" set wise=1
echo About to archive an external wxWindows distribution:
echo From %src
echo To %dest
echo From %src%
echo To %dest%
if "%wise" == "1" echo with WISE setup creation.
echo CTRL-C if this is not correct.
pause
erase %dest\wx*.zip
erase %dest\*.htb
erase %dest\ogl3.zip
erase %dest\tex2rtf2.zip
erase %dest\jpeg.zip
erase %dest\tiff.zip
erase %dest\dialoged.zip
erase %dest\utils.zip
erase %dest\extradoc.zip
erase %dest\*-win32.zip
erase %dest%\wx*.zip
erase %dest%\*.htb
erase %dest%\ogl3.zip
erase %dest%\tex2rtf2.zip
erase %dest%\wxxml.zip
erase %dest%\jpeg.zip
erase %dest%\tiff.zip
erase %dest%\dialoged.zip
erase %dest%\utils.zip
erase %dest%\extradoc.zip
erase %dest%\*-win32.zip
if direxist %dest\wx deltree /Y %dest\wx
if exist %dest%\wx\BuildCVS.txt rmdir /S %dest%\wx
cd %src
cd %src%
echo Zipping...
Rem Zip up the complete wxMSW-xxx.zip file
Rem NO, do it by unarchiving component files, deleting/copying some files, then
Rem rearchiving.
Rem zip32 -@ %dest\wxMSW-%version%.zip < %src\distrib\msw\generic.rsp
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\msw.rsp
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\wx_chm.rsp
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\jpeg.rsp
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp
Rem zip -@ %dest%\wxMSW-%version%.zip < %src%\distrib\msw\generic.rsp
Rem zip -@ -u %dest%\wxMSW-%version%.zip < %src%\distrib\msw\msw.rsp
Rem zip -@ -u %dest%\wxMSW-%version%.zip < %src%\distrib\msw\wx_chm.rsp
Rem zip -@ -u %dest%\wxMSW-%version%.zip < %src%\distrib\msw\jpeg.rsp
Rem zip -@ -u %dest%\wxMSW-%version%.zip < %src%\distrib\msw\tiff.rsp
Rem Below is the old-style separated-out format. This is retained only
Rem for local use, and for creating wxMSW-xxx.zip.
zip32 -@ %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\generic.rsp
zip32 -@ -u %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\makefile.rsp
zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp
zip32 -@ -u %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\makefile.rsp
zip32 -@ %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\gtk.rsp
zip32 -@ -u %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\makefile.rsp
zip32 -@ %dest\wxWindows-%version%-stubs.zip < %src\distrib\msw\stubs.rsp
zip32 -@ %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\motif.rsp
zip32 -@ -u %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\makefile.rsp
Rem (Obsolete) zip32 -@ %dest\wxWindows-%version%-user.zip < %src\distrib\msw\user.rsp
zip -@ %dest%\wxWindows-%version%-gen.zip < %src%\distrib\msw\generic.rsp
zip -@ -u %dest%\wxWindows-%version%-gen.zip < %src%\distrib\msw\makefile.rsp
zip -@ %dest%\wxWindows-%version%-msw.zip < %src%\distrib\msw\msw.rsp
zip -@ -u %dest%\wxWindows-%version%-msw.zip < %src%\distrib\msw\makefile.rsp
zip -@ %dest%\wxWindows-%version%-gtk.zip < %src%\distrib\msw\gtk.rsp
zip -@ -u %dest%\wxWindows-%version%-gtk.zip < %src%\distrib\msw\makefile.rsp
zip -@ %dest%\wxWindows-%version%-stubs.zip < %src%\distrib\msw\stubs.rsp
zip -@ %dest%\wxWindows-%version%-mot.zip < %src%\distrib\msw\motif.rsp
zip -@ -u %dest%\wxWindows-%version%-mot.zip < %src%\distrib\msw\makefile.rsp
Rem (Obsolete) zip -@ %dest%\wxWindows-%version%-user.zip < %src%\distrib\msw\user.rsp
zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
zip -@ %dest%\wxWindows-%version%-DocSource.zip < %src%\distrib\msw\docsrc.rsp
zip -@ %dest%\wxWindows-%version%-WinHelp.zip < %src%\distrib\msw\wx_hlp.rsp
zip -@ %dest%\wxWindows-%version%-HTML.zip < %src%\distrib\msw\wx_html.rsp
zip -@ %dest%\wxWindows-%version%-PDF.zip < %src%\distrib\msw\wx_pdf.rsp
zip -@ %dest%\wxWindows-%version%-Word.zip < %src%\distrib\msw\wx_word.rsp
zip -@ %dest%\wxWindows-%version%-HTB.zip < %src%\distrib\msw\wx_htb.rsp
zip -@ %dest%\wxWindows-%version%-HTMLHelp.zip < %src%\distrib\msw\wx_chm.rsp
Rem PDF/HTML docs that should go into the Windows setup because
Rem there are no WinHelp equivalents
zip32 -@ %dest\extradoc.zip < %src\distrib\msw\extradoc.rsp
zip -@ %dest%\extradoc.zip < %src%\distrib\msw\extradoc.rsp
rem VC++ project files
zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp
zip -@ %dest%\wxWindows-%version%-vc.zip < %src%\distrib\msw\vc.rsp
rem BC++ project files
zip32 -@ %dest\wxWindows-%version%-bc.zip < %src\distrib\msw\bc.rsp
zip -@ %dest%\wxWindows-%version%-bc.zip < %src%\distrib\msw\bc.rsp
rem CodeWarrior project files
zip32 -@ %dest\wxWindows-%version%-cw.zip < %src\distrib\msw\cw.rsp
zip -@ %dest%\wxWindows-%version%-cw.zip < %src%\distrib\msw\cw.rsp
rem OGL 3
zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
zip -@ %dest%\ogl3.zip < %src%\distrib\msw\ogl.rsp
rem wxXML
zip -@ %dest%\wxxml.zip < %src%\distrib\msw\xml.rsp
rem MMedia
zip32 -@ %dest\mmedia.zip < %src\distrib\msw\mmedia.rsp
zip -@ %dest%\mmedia.zip < %src%\distrib\msw\mmedia.rsp
rem STC (Scintilla widget)
zip32 -@ %dest\stc.zip < %src\distrib\msw\stc.rsp
zip -@ %dest%\stc.zip < %src%\distrib\msw\stc.rsp
rem GLCanvas: obsolete, now in main library
rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp
rem zip -@ %dest%\glcanvas.zip < %src%\distrib\msw\glcanvas.rsp
rem Tex2RTF
zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
zip -@ %dest%\tex2rtf2.zip < %src%\distrib\msw\tex2rtf.rsp
rem JPEG source
zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
zip -@ %dest%\jpeg.zip < %src%\distrib\msw\jpeg.rsp
rem TIFF source
zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
zip -@ %dest%\tiff.zip < %src%\distrib\msw\tiff.rsp
rem Dialog Editor source and binary
erase %dest\dialoged_source.zip
zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
zip32 -j %dest\dialoged.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
erase %dest\dialoged_source.zip
erase %dest%\dialoged_source.zip
zip -@ %dest%\dialoged_source.zip < %src%\distrib\msw\dialoged.rsp
zip -j %dest%\dialoged.zip %dest%\dialoged_source.zip %src%\bin\dialoged.exe %src%\docs\winhelp\dialoged.hlp %src%\docs\winhelp\dialoged.cnt
erase %dest%\dialoged_source.zip
rem Misc. utils not in the main distribution
zip32 -@ %dest\utils.zip < %src\distrib\msw\utils.rsp
zip32 -@ -u %dest\utils.zip < %src\distrib\msw\utilmake.rsp
zip -@ %dest%\utils.zip < %src%\distrib\msw\utils.rsp
zip -@ -u %dest%\utils.zip < %src%\distrib\msw\utilmake.rsp
copy %src\docs\changes.txt %dest
copy %src\docs\msw\install.txt %dest\install_msw.txt
copy %src\docs\motif\install.txt %dest\install_motif.txt
copy %src\docs\gtk\install.txt %dest\install_gtk.txt
copy %src\docs\readme.txt %dest
copy %src\docs\motif\readme.txt %dest\readme_motif.txt
copy %src\docs\gtk\readme.txt %dest\readme_gtk.txt
copy %src\docs\msw\readme.txt %dest\readme_msw.txt
copy %src\docs\readme_vms.txt %dest
copy %src\docs\motif\makewxmotif %dest
copy %src\docs\gtk\makewxgtk %dest
copy %src%\docs\changes.txt %dest%
copy %src%\docs\msw\install.txt %dest%\install_msw.txt
copy %src%\docs\motif\install.txt %dest%\install_motif.txt
copy %src%\docs\gtk\install.txt %dest%\install_gtk.txt
copy %src%\docs\readme.txt %dest%
copy %src%\docs\motif\readme.txt %dest%\readme_motif.txt
copy %src%\docs\gtk\readme.txt %dest%\readme_gtk.txt
copy %src%\docs\msw\readme.txt %dest%\readme_msw.txt
copy %src%\docs\readme_vms.txt %dest%
copy %src%\docs\motif\makewxmotif %dest%
copy %src%\docs\gtk\makewxgtk %dest%
Rem Skip WISE setup if wise is 0.
if "%wise" == "0" goto end
if "%wise%" == "0" goto end
:dounzip
Rem Make dialoged-win32.zip and tex2rtf-win32.zip
cd %src\bin
cd %src%\bin
zip32 %dest\dialoged-win32.zip dialoged.*
zip32 %dest\tex2rtf-win32.zip tex2rtf.*
zip %dest%\dialoged-win32.zip dialoged.*
zip %dest%\tex2rtf-win32.zip tex2rtf.*
cd %dest
cd %dest%
rem Unzip the Windows files into 'wx'
mkdir %dest\wx
mkdir %dest%\wx
Rem After this change of directory, we're in the
Rem temporary 'wx' directory and not acting on
Rem the source wxWindows directory.
cd %dest\wx
unzip32 -o ..\wxWindows-%version%-msw.zip
unzip32 -o ..\wxWindows-%version%-gen.zip
unzip32 -o ..\wxWindows-%version%-vc.zip
unzip32 -o ..\wxWindows-%version%-bc.zip
unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip
unzip32 -o ..\extradoc.zip
cd %dest%\wx
unzip -o ..\wxWindows-%version%-msw.zip
unzip -o ..\wxWindows-%version%-gen.zip
unzip -o ..\wxWindows-%version%-vc.zip
unzip -o ..\wxWindows-%version%-bc.zip
unzip -o ..\wxWindows-%version%-HTMLHelp.zip
unzip -o ..\extradoc.zip
Rem Need Word file, for Remstar DB classes
unzip32 -o ..\wxWindows-%version%-Word.zip
unzip32 -o ..\ogl3.zip
unzip32 -o ..\jpeg.zip
unzip32 -o ..\tiff.zip
unzip32 -o ..\tex2rtf2.zip
unzip -o ..\wxWindows-%version%-Word.zip
unzip -o ..\ogl3.zip
unzip -o ..\wxxml.zip
unzip -o ..\jpeg.zip
unzip -o ..\tiff.zip
unzip -o ..\tex2rtf2.zip
rem Now delete a few files that are unnecessary
attrib -R *
@@ -169,38 +174,38 @@ erase /Y contrib\docs\winhelp\stc.*
erase /Y contrib\docs\htmlhelp\mmedia.*
erase /Y contrib\docs\htmlhelp\stc.*
erase /Y contrib\docs\pdf\*.*
deltree /Y contrib\docs\latex\ogl
rmdir /S contrib\docs\latex\ogl
erase /Y src\mingegcs.bat
erase /Y distrib
rem Now copy some binary files to 'bin'
if not isdir bin mkdir bin
copy %src\bin\dialoged.exe bin
copy %src\bin\tex2rtf.exe bin
copy %src\bin\dbgview.* bin
copy %src\bin\life.exe bin
copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin
copy %src%\bin\dialoged.exe bin
copy %src%\bin\tex2rtf.exe bin
copy %src%\bin\dbgview.* bin
copy %src%\bin\life.exe bin
copy %src%\docs\winhelp\dialoged.hlp %src%\docs\winhelp\dialoged.cnt bin
copy %src%\docs\winhelp\tex2rtf.hlp %src%\docs\winhelp\tex2rtf.cnt bin
Rem Make wxMSW-xxx.zip
zip32 -r ..\wxMSW-%version%.zip *
zip -r ..\wxMSW-%version%.zip *
rem Time to regenerate the WISE install script, wxwin2.wse.
rem NB: if you've changed wxwin2.wse using WISE, call splitwise.exe
rem from within distrib\msw, to split off wisetop.txt and wisebott.txt.
echo Calling 'makewise' to generate wxwin2.wse...
call %WXWIN\distrib\msw\makewise.bat
call %WXWIN%\distrib\msw\makewise.bat
erase /Y %dest\setup.*
erase /Y %dest%\setup.*
rem Now invoke WISE install on the new wxwin2.wse
set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN%\distrib\msw\wxwin2.wse
echo Invoking %wisecmd...
start %wisecmd
pause Press any key to continue with the wxWindows distribution...
Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\wxMSW-%version%-setup.exe
Rem ren %WXWIN%\deliver\setup.EXE %WXWIN%\deliver\wxMSW-%version%-setup.exe
cd %dest
cd %dest%
Rem tidy up capitalisation of filenames
ren setup.EXE s
@@ -228,7 +233,7 @@ ren setup.w08 s
ren s setup.w08
rem Put all the setup files into a single zip archive.
zip32 wxMSW-%version%-setup.zip readme.txt setup.*
zip wxMSW-%version%-setup.zip readme.txt setup.*
echo wxWindows archived.

View File

@@ -73,8 +73,7 @@ dowise()
# from within distrib/msw, to split off wisetop.txt and wisebott.txt.
echo Calling 'makewise' to generate wxwin2.wse...
# TODO!!!!
call $WXWIN/distrib/msw/makewise.bat
sh $WXWIN/distrib/msw/makewise.sh
rm -f $dest/setup.*
@@ -115,6 +114,19 @@ dowise()
zip wxMSW-$version-setup.zip readme.txt setup.*
}
expandlines()
{
toexpand=$1
outputfile=$2
rm -f $outputfile
touch $outputfile
for line in `cat $toexpand` ; do
if [ $line != "" ]; then
ls $line >> $outputfile
fi
done
}
# Process command line options.
for i in "$@"; do
@@ -171,68 +183,116 @@ echo Zipping...
# Below is the old-style separated-out format. This is retained only
# for local use, and for creating wxMSW-xxx.zip.
ls `cat $src/distrib/msw/generic.rsp` | zip -@ $dest/wxWindows-$version-gen.zip
ls `cat $src/distrib/msw/makefile.rsp` | zip -@ -u $dest/wxWindows-$version-gen.zip
ls `cat $src/distrib/msw/msw.rsp` | zip -@ $dest/wxWindows-$version-msw.zip
ls `cat $src/distrib/msw/makefile.rsp` | zip -@ -u $dest/wxWindows-$version-msw.zip
ls `cat $src/distrib/msw/gtk.rsp` | zip -@ $dest/wxWindows-$version-gtk.zip
ls `cat $src/distrib/msw/makefile.rsp` | zip -@ -u $dest/wxWindows-$version-gtk.zip
ls `cat $src/distrib/msw/stubs.rsp` | zip -@ $dest/wxWindows-$version-stubs.zip
ls `cat $src/distrib/msw/motif.rsp` | zip -@ $dest/wxWindows-$version-mot.zip
ls `cat $src/distrib/msw/makefile.rsp` | zip -@ -u $dest/wxWindows-$version-mot.zip
# ls `cat $src/distrib/msw/user.rsp` | zip -@ $dest/wxWindows-$version-user.zip # Obsolete
ls `cat $src/distrib/msw/docsrc.rsp` | zip -@ $dest/wxWindows-$version-DocSource.zip
ls `cat $src/distrib/msw/wx_hlp.rsp` | zip -@ $dest/wxWindows-$version-WinHelp.zip
ls `cat $src/distrib/msw/wx_html.rsp` | zip -@ $dest/wxWindows-$version-HTML.zip
ls `cat $src/distrib/msw/wx_pdf.rsp` | zip -@ $dest/wxWindows-$version-PDF.zip
ls `cat $src/distrib/msw/wx_word.rsp` | zip -@ $dest/wxWindows-$version-Word.zip
ls `cat $src/distrib/msw/wx_htb.rsp` | zip -@ $dest/wxWindows-$version-HTB.zip
ls `cat $src/distrib/msw/wx_chm.rsp` | zip -@ $dest/wxWindows-$version-HTMLHelp.zip
# We can't use e.g. this:
# ls `cat $src/distrib/msw/makefile.rsp` zip -@ -u $dest/wxWindows-$version-gen.zip
# because there's not enough space on the command line, plus we need to ignore the
# blank lines.
expandlines $src/distrib/msw/generic.rsp temp.txt
zip -@ $dest/wxWindows-$version-gen.zip < temp.txt
expandlines $src/distrib/msw/makefile.rsp temp.txt
zip -@ -u $dest/wxWindows-$version-gen.zip < temp.txt
expandlines $src/distrib/msw/msw.rsp temp.txt
zip -@ $dest/wxWindows-$version-msw.zip < temp.txt
expandlines $src/distrib/msw/makefile.rsp temp.txt
zip -@ -u $dest/wxWindows-$version-msw.zip < temp.txt
expandlines $src/distrib/msw/gtk.rsp temp.txt
zip -@ $dest/wxWindows-$version-gtk.zip < temp.txt
expandlines $src/distrib/msw/makefile.rsp temp.txt
zip -@ -u $dest/wxWindows-$version-gtk.zip < temp.txt
expandlines $src/distrib/msw/stubs.rsp temp.txt
zip -@ $dest/wxWindows-$version-stubs.zip < temp.txt
expandlines $src/distrib/msw/motif.rsp temp.txt
zip -@ $dest/wxWindows-$version-mot.zip < temp.txt
expandlines $src/distrib/msw/makefile.rsp temp.txt
zip -@ -u $dest/wxWindows-$version-mot.zip < temp.txt
expandlines $src/distrib/msw/docsrc.rsp temp.txt
zip -@ $dest/wxWindows-$version-DocSource.zip < temp.txt
expandlines $src/distrib/msw/wx_hlp.rsp temp.txt
zip -@ $dest/wxWindows-$version-WinHelp.zip < temp.txt
expandlines $src/distrib/msw/wx_html.rsp temp.txt
zip -@ $dest/wxWindows-$version-HTML.zip < temp.txt
expandlines $src/distrib/msw/wx_pdf.rsp temp.txt
zip -@ $dest/wxWindows-$version-PDF.zip < temp.txt
expandlines $src/distrib/msw/wx_word.rsp temp.txt
zip -@ $dest/wxWindows-$version-Word.zip < temp.txt
expandlines $src/distrib/msw/wx_htb.rsp temp.txt
zip -@ $dest/wxWindows-$version-HTB.zip < temp.txt
expandlines $src/distrib/msw/wx_chm.rsp temp.txt
zip -@ $dest/wxWindows-$version-HTMLHelp.zip < temp.txt
# PDF/HTML docs that should go into the Windows setup because
# there are no WinHelp equivalents
ls `cat $src/distrib/msw/extradoc.rsp` | zip -@ $dest/extradoc.zip
expandlines $src/distrib/msw/extradoc.rsp temp.txt
zip -@ $dest/extradoc.zip < temp.txt
# VC++ project files
ls `cat $src/distrib/msw/vc.rsp` | zip -@ $dest/wxWindows-$version-vc.zip
expandlines $src/distrib/msw/vc.rsp temp.txt
zip -@ $dest/wxWindows-$version-vc.zip < temp.txt
# BC++ project files
ls `cat $src/distrib/msw/bc.rsp` | zip -@ $dest/wxWindows-$version-bc.zip
expandlines $src/distrib/msw/bc.rsp temp.txt
zip -@ $dest/wxWindows-$version-bc.zip < temp.txt
# CodeWarrior project files
ls `cat $src/distrib/msw/cw.rsp` | zip -@ $dest/wxWindows-$version-cw.zip
expandlines $src/distrib/msw/cw.rsp temp.txt
zip -@ $dest/wxWindows-$version-cw.zip < temp.txt
# OGL 3
ls `cat $src/distrib/msw/ogl.rsp` | zip -@ $dest/ogl3.zip
expandlines $src/distrib/msw/ogl.rsp temp.txt
zip -@ $dest/ogl3.zip < temp.txt
# MMedia
ls `cat $src/distrib/msw/mmedia.rsp` | zip -@ $dest/mmedia.zip
expandlines $src/distrib/msw/mmedia.rsp temp.txt
zip -@ $dest/mmedia.zip < temp.txt
# STC (Scintilla widget)
ls `cat $src/distrib/msw/stc.rsp` | zip -@ $dest/stc.zip
# GLCanvas: obsolete, now in main library
# ls `cat $src/distrib/msw/glcanvas.rsp` | zip -@ $dest/glcanvas.zip
expandlines $src/distrib/msw/stc.rsp temp.txt
zip -@ $dest/stc.zip < temp.txt
# Tex2RTF
ls `cat $src/distrib/msw/tex2rtf.rsp` | zip -@ $dest/tex2rtf2.zip
expandlines $src/distrib/msw/tex2rtf.rsp temp.txt
zip -@ $dest/tex2rtf2.zip < temp.txt
# JPEG source
ls `cat $src/distrib/msw/jpeg.rsp` | zip -@ $dest/jpeg.zip
expandlines $src/distrib/msw/jpeg.rsp temp.txt
zip -@ $dest/jpeg.zip < temp.txt
# TIFF source
ls `cat $src/distrib/msw/tiff.rsp` | zip -@ $dest/tiff.zip
expandlines $src/distrib/msw/tiff.rsp temp.txt
zip -@ $dest/tiff.zip < temp.txt
# Dialog Editor source and binary
rm -f $dest/dialoged_source.zip
ls `cat $src/distrib/msw/dialoged.rsp` | zip -@ $dest/dialoged_source.zip
expandlines $src/distrib/msw/dialoged.rsp temp.txt
zip -@ $dest/dialoged_source.zip < temp.txt
zip -j $dest/dialoged.zip $dest/dialoged_source.zip $src/bin/dialoged.exe $src/docs/winhelp/dialoged.hlp $src/docs/winhelp/dialoged.cnt
rm -f $dest/dialoged_source.zip
# Misc. utils not in the main distribution
ls `cat $src/distrib/msw/utils.rsp` | zip -@ $dest/utils.zip
ls `cat $src/distrib/msw/utilmake.rsp` | zip -@ -u $dest/utils.zip
expandlines $src/distrib/msw/utils.rsp temp.txt
zip -@ $dest/utils.zip < temp.txt
expandlines $src/distrib/msw/utilmake.rsp temp.txt
zip -@ -u $dest/utilmake.zip < temp.txt
rm -f temp.txt
cp $src/docs/changes.txt $dest
cp $src/docs/msw/install.txt $dest/install_msw.txt
@@ -247,7 +307,7 @@ cp $src/docs/motif/makewxmotif $dest
cp $src/docs/gtk/makewxgtk $dest
# Skip WISE setup if wise is 0.
if [ "$wise" = "1"] ; then
if [ "$wise" = "1" ]; then
dowise
fi

30
distrib/msw/zipxml.bat Executable file
View File

@@ -0,0 +1,30 @@
@echo off
rem Zip up an external distribution of wxXML
set src=d:\wx2\wxWindows
set dest=d:\wx2\wxWindows\deliver
if "%src" == "" goto usage
if "%dest" == "" goto usage
echo About to archive an external wxXML distribution:
echo From %src
echo To %dest\xml.zip
echo CTRL-C if this is not correct.
inkey /W4 `Press any key to continue...` %%input
erase %dest\xml.zip
cd %src
zip32 -@ %dest\xml.zip < %src\distrib\msw\xml.rsp
cd %dest
echo wxXML archived.
goto end
:usage
echo DOS wxXML distribution.
echo Usage: zipxml source destination
echo e.g. zipxml d:\wx2\wxWindows d:\wx2\wxWindows\deliver
:end

View File

@@ -2,8 +2,10 @@ WX.GID
WX.HLP
wx.ref
wx.cnt
Wx.rtf
Wx.con
wx.rtf
wx.con
WX.PH
manual.bb
minimald.hpj
minimald.ref
minimald.con