Some minor updates, fixes, etc.

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

utils/wxPython/distrib/autobuild.py

@@ -6,8 +6,8 @@ from ftplib import FTP
 
 logfile = 'e:\\temp\\autobuild.log'
 WXDIR   = os.environ['WXWIN']
-dllVer  = '21_11'
-wxpVer  = '2.1.11'
+dllVer  = '21_12'
+wxpVer  = '2.1.12'
 dateSt  = time.strftime("%Y%m%d", time.localtime(time.time()))
 
 #----------------------------------------------------------------------
@@ -128,7 +128,9 @@ FINAL=1
         destName = WXDIR+'\\utils\\wxPython\\distrib\\wxPython-'+wxpVer+'-'+dateSt+'.EXE'
         validateFile(srcName)
         try:
+            time.sleep(5)
             os.rename(srcName, destName)
+            validateFile(destName)
         except:
             pass
 
@@ -145,6 +147,9 @@ FINAL=1
             pass
 
 
+
+        return
+
         logSeparator("Uploading to website...")
         do('python d:\util32\sendwxp.py %s' % destName)
         do('python d:\util32\sendwxp.py %s' % destZName)

utils/wxPython/distrib/build.py

@@ -604,7 +604,7 @@ $(CPPFLAGS) /c $<
 $(TARGET) : $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(RESFILE)
 	$(link) @<<
 /out:$@
-$(LFLAGS) /def:$(MODULE).def /implib:./$(MODULE).lib
+$(LFLAGS) /export:init$(MODULE) /implib:./$(MODULE).lib
 $(DUMMYOBJ) $(OBJECTS) $(RESFILE)
 $(LIBS)
 <<

utils/wxPython/distrib/wxPython.wse

@@ -17,7 +17,7 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
-  EXE Filename=wxPython-2.1.11.exe
+  EXE Filename=wxPython-2.1.12.exe
   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6
@@ -815,8 +815,8 @@ item: Install File
   Flags=0000001010000011
 end
 item: Install File
-  Source=e:\projects\wx\lib\wx21_11.dll
-  Destination=%SYS%\wx21_11.dll
+  Source=e:\projects\wx\lib\wx21_12.dll
+  Destination=%SYS%\wx21_12.dll
   Flags=0000001010010010
 end
 item: Install File