Updated distribution stuff

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

diff --git a/wxPython/distrib/autobuild.py b/wxPython/distrib/autobuild.py
index edeade7f9ac0051b7f8a5f60ce886ec20b915bbb..e5434e669e380cdc7b5070ebb925fc40dfa0e157 100755 (executable)
--- a/wxPython/distrib/autobuild.py
+++ b/wxPython/distrib/autobuild.py
@@ -7,8 +7,8 @@ cwd = os.getcwd()
 
 logfile = 'c:\\temp\\autobuild.log'
 WXDIR   = os.environ['WXWIN']
 
 logfile = 'c:\\temp\\autobuild.log'
 WXDIR   = os.environ['WXWIN']

-dllVer  = '22_1'
-wxpVer  = '2.2.1'
+dllVer  = '23_0'
+wxpVer  = '2.3b1'

 dateSt  = time.strftime("%Y%m%d", time.localtime(time.time()))
 
 base = os.path.split(sys.argv[0])[0]
 dateSt  = time.strftime("%Y%m%d", time.localtime(time.time()))
 
 base = os.path.split(sys.argv[0])[0]


@@ -71,7 +71,7 @@ def main():
         do('make touchmanual htmlhelp')
         validateFile(WXDIR + '/docs/htmlhelp/wx.chm')
 
         do('make touchmanual htmlhelp')
         validateFile(WXDIR + '/docs/htmlhelp/wx.chm')
 

-        logSeparator("Building wxWindows and other libraries...")
+        logSeparator("Building wxWindows...")

         os.chdir(WXDIR + '/src/msw')
         do('make dll pch FINAL=1')
         validateFile(WXDIR + '/lib/wx'+dllVer+'.dll')
         os.chdir(WXDIR + '/src/msw')
         do('make dll pch FINAL=1')
         validateFile(WXDIR + '/lib/wx'+dllVer+'.dll')


@@ -80,35 +80,14 @@ def main():
 
         logSeparator("Cleaning wxPython build directory...")
         os.chdir(WXPYDIR)
 
         logSeparator("Cleaning wxPython build directory...")
         os.chdir(WXPYDIR)

-        do('buildall.bat -c')
-        os.rename('build.local', 'build.local.save')
-        f = open("build.local", "w")
-        f.write("""
-CRTFLAG='/MD'
-FINAL=1
-""")
-        f.close()
+        do('b.bat c')

 
 

-
-        logSeparator("Building core wxPython...")
+        logSeparator("Building wxPython...")

         os.chdir(WXPYDIR + '\\src')
         os.chdir(WXPYDIR + '\\src')

-        do("build -b")
+        do("b.bat f")

         validateFile(WXPYDIR+'\\wxPython\\wxc.pyd')
 
 
         validateFile(WXPYDIR+'\\wxPython\\wxc.pyd')
 
 

-        logSeparator("Building wxPython addon modules...")
-        os.chdir(WXPYDIR+'\\contrib')
-        do("buildall -b")
-        validateFile(WXPYDIR+'\\wxPython\\glcanvasc.pyd')
-        validateFile(WXPYDIR+'\\wxPython\\oglc.pyd')
-        validateFile(WXPYDIR+'\\wxPython\\stc_c.pyd')
-
-
-        os.chdir(WXPYDIR)
-        os.unlink('build.local')
-        os.rename('build.local.save', 'build.local')
-
-

         logSeparator("Building installer executable...")
         os.chdir(WXPYDIR+'\\distrib')
         do("autoit2 wise.aut")
         logSeparator("Building installer executable...")
         os.chdir(WXPYDIR+'\\distrib')
         do("autoit2 wise.aut")


@@ -123,19 +102,12 @@ FINAL=1
             logSeparator("****** UNABLE TO RENAME FILE ******")
 
 
             logSeparator("****** UNABLE TO RENAME FILE ******")
 
 

-        logSeparator("Building source and docs zip files...")
+        logSeparator("Building docs zip file...")

         os.chdir(WXPYDIR)
         do("distrib\\zipit.bat %s" % wxpVer)
         os.chdir(WXPYDIR)
         do("distrib\\zipit.bat %s" % wxpVer)

-        srcZName =  WXPYDIR+'\\distrib\\wxPython-src-'+wxpVer+'.zip'
-        destZName = WXPYDIR+'\\distrib\\wxPython-src-'+wxpVer+'-'+dateSt+'.zip'
-        validateFile(srcZName)
-        try:
-            os.rename(srcZName, destZName)
-        except:
-            pass

 
 

-        srcDName  = WXPYDIR+'\\distrib\\wxPython-docs-'+wxpVer+'.zip'
-        destDName = WXPYDIR+'\\distrib\\wxPython-docs-'+wxpVer+'-'+dateSt+'.zip'
+        srcDName  = WXPYDIR+'\\distrib\\wxPython-docs-'+wxpVer+'.tar.gz'
+        destDName = WXPYDIR+'\\distrib\\wxPython-docs-'+wxpVer+'-'+dateSt+'.tar.gz'

         validateFile(srcDName)
         try:
             os.rename(srcDName, destDName)
         validateFile(srcDName)
         try:
             os.rename(srcDName, destDName)


@@ -145,12 +117,11 @@ FINAL=1
 
 
         # #*#*#*#*#*  Comment this out to allow upload...
 
 
         # #*#*#*#*#*  Comment this out to allow upload...

-        return
+        #return

 
         logSeparator("Uploading to website...")
         do('python c:\\utils\\sendwxp.py %s' % destName)
 
         logSeparator("Uploading to website...")
         do('python c:\\utils\\sendwxp.py %s' % destName)

-        #do('python c:\\utils\\sendwxp.py %s' % destZName)
-        do('python c:\\utils\\sendwxp.py %s' % destDName)
+        #do('python c:\\utils\\sendwxp.py %s' % destDName)

 
 
         logSeparator("Finished!!!")
 
 
         logSeparator("Finished!!!")

diff --git a/wxPython/distrib/wxPython.WSM b/wxPython/distrib/wxPython.WSM
index f3ebe132f8dd4126671daff19688d932b59fec83..1a9e35266f380844ca6f33c93f7232bfa8d84520 100644 (file)
Binary files a/wxPython/distrib/wxPython.WSM and b/wxPython/distrib/wxPython.WSM differ

diff --git a/wxPython/distrib/wxPython.wse b/wxPython/distrib/wxPython.wse
index 14697059cb22aa53618df482e2627902c0f628be..900319ee72547d737e470299ff710bc1980e1ab3 100644 (file)
--- a/wxPython/distrib/wxPython.wse
+++ b/wxPython/distrib/wxPython.wse
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=6.01
 Document Type: WSE
 item: Global
   Version=6.01

-  Title=wxPython 2.2 Installation
+  Title=wxPython 2.3 Installation

   Flags=10010111
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
   Flags=10010111
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic


@@ -17,7 +17,7 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000

-  EXE Filename=wxPython-2.2.2.exe
+  EXE Filename=wxPython-2.3b1.exe

   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6
   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6


@@ -55,12 +55,12 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
 end
 item: Set Variable
   Variable=APPTITLE

-  Value=wxPython 2.2
+  Value=wxPython 2.3

   Flags=10000000
 end
 item: Set Variable
   Variable=GROUP
   Flags=10000000
 end
 item: Set Variable
   Variable=GROUP

-  Value=wxPython 2.2
+  Value=wxPython 2.3

   Flags=10000000
 end
 item: Set Variable
   Flags=10000000
 end
 item: Set Variable


@@ -81,10 +81,6 @@ item: Set Variable
   Variable=PYTHONVER
   Value=2.0
 end
   Variable=PYTHONVER
   Value=2.0
 end

-item: Set Variable
-  Variable=SAMEDIR
-  Value=1
-end

 item: Remark
 end
 item: Get Registry Key Value
 item: Remark
 end
 item: Get Registry Key Value


@@ -817,24 +813,11 @@ item: Install File
   Destination=%SYS%\Msvcrt.dll
   Flags=0000001010000011
 end
   Destination=%SYS%\Msvcrt.dll
   Flags=0000001010000011
 end

-item: If/While Statement
-  Variable=SAMEDIR
-  Value=0
-end

 item: Install File
 item: Install File

-  Source=c:\projects\wx\lib\wx22_2.dll
-  Destination=%SYS%\wx22_2.dll
-  Flags=0000001010010010
-end
-item: Else Statement
-end
-item: Install File
-  Source=c:\projects\wx\lib\wx22_2.dll
-  Destination=%MAINDIR%\wxPython\wx22_2.dll
+  Source=c:\projects\wx\lib\wx23_0.dll
+  Destination=%MAINDIR%\wxPython\wx23_0.dll

   Flags=0000000010010010
 end
   Flags=0000000010010010
 end

-item: End Block
-end

 item: Install File
   Source=c:\Projects\wx\wxPython\wxPython\*.py
   Destination=%MAINDIR%\wxPython
 item: Install File
   Source=c:\Projects\wx\wxPython\wxPython\*.py
   Destination=%MAINDIR%\wxPython