Updated distribution scripts

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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index cc368023b53d4aad3f55cd74e656b9229d0a797a..b990b5fa6db22dc985d2c218d13a6404fc10581f 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -953,15 +953,6 @@ samples/statbar/*.xpm
 samples/statbar/*.bmp
 samples/statbar/*.txt
 
-samples/plot/*.cpp
-samples/plot/*.h
-samples/plot/makefile*
-samples/plot/*.rc
-samples/plot/*.def
-samples/plot/*.ico
-samples/plot/*.xpm
-samples/plot/*.txt
-
 samples/exec/*.cpp
 samples/exec/*.h
 samples/exec/makefile*

diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt
index 91a792de763c35ea7de6b7add9e556d0a4e58542..ee50041d17e8629d56ad13f1854194e86c855c8f 100644 (file)
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -31,10 +31,10 @@
 ; DO NOT DELETE THEM or you may be unable to reload the script
 
 ;[ScriptSetup]
-;VerNum=2.2.6
+;VerNum=2.3.0
 ;InnoVer=1.3
 ;AddVerTo=AppVerName
 ;SetupFilename=setup.exe
-;OutputFolder=C:\wx2stable\wxWindows\deliver
+;OutputFolder=C:\wx2dev\wxWindows\deliver
 ;CopyrightText=Copyright © The wxWindows Team
 

diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt
index bdf9d70bdf3bd09a8d1da1c033cc730fbe552e90..6c3011dc19940714227f474f66025cdb41f7bbbe 100644 (file)
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -9,8 +9,8 @@
     CreateUninstallRegKey=1
     UsePreviousAppDir=1
     UsePreviousGroup=1
-    AppVersion=2.2.6
-    AppVerName=wxWindows 2.2.6
+    AppVersion=2.3.0
+    AppVerName=wxWindows 2.3.0
     AppCopyright=Copyright © The wxWindows Team
     BackColor=$FF0000
     BackColor2=$000000
@@ -31,16 +31,16 @@
     UninstallIconName=Uninstall wxWindows
     Uninstallable=1
     DefaultDirName=c:\wx2
-    DefaultGroupName=wxWindows 2.2.6
-    LicenseFile=C:\wx2stable\wxWindows\docs\licence.txt
-    InfoBeforeFile=C:\wx2stable\wxWindows\docs\readme.txt
-    InfoAfterFile=C:\wx2stable\wxWindows\docs\msw\install.txt
+    DefaultGroupName=wxWindows 2.3.0
+    LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
+    InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt
+    InfoAfterFile=C:\wx2dev\wxWindows\docs\msw\install.txt
     MessagesFile=compiler:default.isl
     DiskSpanning=1
     DiskSize=1457664
     DiskClusterSize=512
     ReserveBytes=0
     UseSetupLdr=1
-    SourceDir=C:\wx2stable\wxWindows\deliver\wx
-    OutputDir=C:\wx2stable\wxWindows\deliver
+    SourceDir=C:\wx2dev\wxWindows\deliver\wx
+    OutputDir=C:\wx2dev\wxWindows\deliver
 

diff --git a/distrib/msw/makeinno.bat b/distrib/msw/makeinno.bat
index a6ada9c35f028f6f7ec231b5079b664bd9de25df..59f04ddee2734a05db2419ad70e72954f2b7bdd5 100755 (executable)
--- a/distrib/msw/makeinno.bat
+++ b/distrib/msw/makeinno.bat
@@ -7,7 +7,7 @@ Rem
 Rem [Files]
 Rem     Source: c:\wx2stable\wxWindows\deliver2\docs\readme.txt; DestDir: {app}\docs\; DestName: readme.txt
 
-set wxwindir=c:\wx2stable\wxWindows
+set wxwindir=%WXWIN
 
 Rem Generate a list of all files in the distribution.
 Rem We have to be in the right directory already.

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index c1aae4cf3007814ca8b9fa05522c0cd640e895fd..ed016995a75ee2b77d3fa480d927dfd9b914749f 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -6,7 +6,7 @@ set dest=%src\deliver
 set inno=0
 
 Rem Set this to the required version
-set version=2.2.6
+set version=2.3.0
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -104,6 +104,8 @@ zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
 rem TIFF source
 zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
 
+zip32 -@ %dest\wxxml.zip < %src\distrib\msw\xml.rsp
+
 rem Dialog Editor source and binary
 erase %dest\dialoged_source.zip
 zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
@@ -158,6 +160,7 @@ unzip32 -o ..\wxWindows-%version%-Word.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
 unzip32 -o ..\tiff.zip
+unzip32 -o ..\xml.zip
 unzip32 -o ..\tex2rtf2.zip
 
 rem Now delete a few files that are unnecessary

diff --git a/distrib/msw/zipxml.bat b/distrib/msw/zipxml.bat
index 368a299be04990b1372e9a1772277c20eecaa889..fe2d7ee5c6e6c4506bbaf9b677725da6300b6f7b 100755 (executable)
--- a/distrib/msw/zipxml.bat
+++ b/distrib/msw/zipxml.bat
@@ -1,7 +1,7 @@
 @echo off
 rem Zip up an external distribution of wxXML
-set src=d:\wx2\wxWindows
-set dest=d:\wx2\wxWindows\deliver
+set src=%WXWIN%
+set dest=%WXWIN%\deliver
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage