added grid sizers

changed some build configurations


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

utils/wxPython/distrib/autobuild.py

@@ -72,7 +72,7 @@ def main():
         os.chdir(WXDIR + '/src/msw')
         do('make dll pch FINAL=1')
         validateFile(WXDIR + '/lib/wx'+dllVer+'.dll')
-        do("upx -9 " + WXDIR + '/lib/wx'+dllVer+'.dll')
+        ## do("upx -9 " + WXDIR + '/lib/wx'+dllVer+'.dll')
 
         do('makeaddons FINAL=1')
         validateFile(WXDIR + '/contrib/lib/ogl.lib')
@@ -117,8 +117,8 @@ FINAL=1
         validateFile(WXDIR+'\\utils\\wxPython\\oglc.pyd')
         validateFile(WXDIR+'\\utils\\wxPython\\stc_c.pyd')
 
-        os.chdir(WXDIR+'\\utils\\wxPython')
-        do("upx -9 *.pyd")
+        ## os.chdir(WXDIR+'\\utils\\wxPython')
+        ## do("upx -9 *.pyd")
 
         logSeparator("Building installer executable...")
         os.chdir(WXDIR+'\\utils\\wxPython\\distrib')
@@ -162,7 +162,7 @@ FINAL=1
 
 
         # #*#*#*#*#*  Comment this out to allow upload...
-        ##return
+        return
 
         logSeparator("Uploading to website...")
         do('python c:\\utils\\sendwxp.py %s' % destName)

utils/wxPython/distrib/build.py

@@ -92,6 +92,7 @@ Configuration Options
     OTHERTARGETS     Other targets to be placed on the default rule line
     OTHERINSTALLTARGETS
                      Other targets to be placed on the install rule line
+    OTHERDEFS        Text to place near the begining of the Makefile
     OTHERRULES       This text is placed at the end of the makefile and
                      will typically be used for adding rules and such
     DEFAULTRULE      Text to be used for the default rule in the makefile
@@ -245,6 +246,7 @@ class BuildConfig:
         self.WXPSRCDIR = '$(WXDIR)/utils/wxPython/src'
         self.SWIGDEPS = ''
         self.OTHERDEPS = ''
+        self.OTHERDEFS = ''
 
 
         if sys.platform == 'win32':
@@ -504,6 +506,7 @@ WXUSINGDLL = %(WXUSINGDLL)s
 GENCODEDIR = %(GENCODEDIR)s
 RESFILE = %(RESFILE)s
 WXPSRCDIR = %(WXPSRCDIR)s
+%(OTHERDEFS)s
 
 
 TARGETDIR = %(TARGETDIR)s
@@ -682,6 +685,7 @@ HELPERLIB = %(HELPERLIB)s
 HELPERLIBDIR = %(HELPERLIBDIR)s
 WXCONFIG=%(WXCONFIG)s
 TARGETDIR = %(TARGETDIR)s
+%(OTHERDEFS)s
 
 
 CCC = %(CCC)s

utils/wxPython/distrib/wxPython.wse

@@ -927,6 +927,12 @@ item: Install File
   Description=Demos
   Flags=0000000010000010
 end
+item: Install File
+  Source=C:\PROJECTS\wx\utils\wxPython\demo\data\tips.txt
+  Destination=%MAINDIR%\wxPython\demo\data\tips.txt
+  Description=Demos
+  Flags=0000000010000010
+end
 item: Remark
 end
 item: Install File