Merged modifications from the 2.6 branch

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

wxPython/distrib/mac/wxPythonOSX/build

@@ -419,7 +419,7 @@ EOF
 	$INSTALLROOT \
 	$RESOURCEDIR
 
-    mv $PKGNAME.pkg $DMGROOT
+    mv $PKGNAME.pkg $DMGROOT/$PKGNAME.pkg
 
     rm $RESOURCEDIR/postflight
     rm $RESOURCEDIR/preflight
@@ -569,7 +569,7 @@ EOF
     if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.gz ]; then
 	cat > "$DMGAPPS/Samples/Build ERROR.txt" <<EOF
 
-The wxPython-demo tarball was not found when building this disk image!
+The wxPython-$VERSION-demo tarball was not found when building this disk image!
 
 EOF
 	cp "$DMGAPPS/Samples/Build ERROR.txt" $DMGAPPS

wxPython/distrib/make_installer_inno4.py

@@ -23,17 +23,11 @@ will be created.
 import sys, os, time
 
 KEEP_TEMPS = 1
-ISCC = r"%s\InnoSetup2Ex\ISCC.exe %s"
+# default InnoSetup installer location
+ISCC = r"C:\progra~1\innose~1\ISCC.exe %s"
 
-# see if we can find Inno Setup 4 and use that if so
-USING_INNO4=False
-try:
-    import _winreg as wreg
-    key = wreg.OpenKey(wreg.HKEY_CURRENT_USER, "Software\Bjornar Henden\ISTool4\Prefs")
-    INNO_FOLDER = wreg.QueryValueEx(key,'InnoFolder')[0] 
-    USING_INNO4=True
-except:
-    pass		
+if os.environ.has_key("INNO4"):
+    ISCC = os.environ["INNO4"]
 
 
 #----------------------------------------------------------------------
@@ -403,7 +397,7 @@ Source: "demo\data\*.mpg";                  DestDir: "{app}\demo\data";
 ;;Source: "demo\dllwidget\makefile.*";        DestDir: "{app}\demo\dllwidget"; 
 
 Source: "licence\*.txt";                    DestDir: "{app}\docs\licence"; 
-Source: "%(WXDIR)s\docs\htmlhelp\wx.chm";   DestDir: "{app}\docs"; 
+;;Source: "%(WXDIR)s\docs\htmlhelp\wx.chm";   DestDir: "{app}\docs"; 
 ;;Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm";  DestDir: "{app}\docs"; 
 Source: "docs\README.txt";                  DestDir: "{app}\docs";  Flags: isreadme; 
 Source: "docs\*.txt";                       DestDir: "{app}\docs"; 
@@ -628,8 +622,7 @@ def main():
     ISSDEMOFILE     = "__wxPythonDemo.iss"
     IFSFILE         = "__wxPython.ifs"
     IFSFILEREF		= "CodeFile = " + IFSFILE
-    if USING_INNO4:
-        IFSFILEREF = ""
+    IFSFILEREF = ""
     UNINSTALL_BATCH = get_batch_files()
     PKGDIR          = open('src/wx.pth').read()
     LOCALE          = build_locale_string(PKGDIR)
@@ -669,18 +662,12 @@ def main():
     global IFS_Template
     global ISS_DocDemo_Template
 
-    if USING_INNO4:
-        ISS_Template = ISS_Template + "\n[Code]\n" + IFS_Template
+    ISS_Template = ISS_Template + "\n[Code]\n" + IFS_Template
 
     f = open(ISSFILE, "w")
     f.write(ISS_Template % vars())
     f.close()
 
-    if not USING_INNO4:
-        f = open(IFSFILE, "w")
-        f.write(IFS_Template % vars())
-        f.close()
-
     f = open(ISSDEMOFILE, "w")
     f.write(ISS_DocDemo_Template % vars())
     f.close()
@@ -688,16 +675,9 @@ def main():
     TOOLS = os.environ['TOOLS']
     if TOOLS.startswith('/cygdrive'):
         TOOLS = r"c:\TOOLS"  # temporary hack until I convert everything over to bash
-    if USING_INNO4:
-        print "Hello world!"
-        ISCC = os.path.join(INNO_FOLDER, "iscc.exe")
-        ISCC = r'"' + ISCC + '" %s'
-        os.system(ISCC % (ISSFILE))
-        #os.system(ISCC % (ISSDEMOFILE))
-    else:
-        print "not found..."
-        os.system(ISCC % (TOOLS, ISSFILE))
-        os.system(ISCC % (TOOLS, ISSDEMOFILE))
+        
+    os.system(ISCC % (ISSFILE))
+    os.system(ISCC % (ISSDEMOFILE))
     
     if not KEEP_TEMPS:
         time.sleep(1)

wxPython/distrib/makedemo

@@ -29,7 +29,7 @@ rm -f `find  _distrib_tgz/wxPython-$VERSION -name ".#*"`
 cd _distrib_tgz
 
 tar cvf ../dist/wxPython-demo-$VERSION.tar wxPython-$VERSION
-gzip -9 ../dist/wxPython-demo-$VERSION.tar
+gzip -9 -f ../dist/wxPython-demo-$VERSION.tar
 
 cd ..
 rm -r _distrib_tgz

wxPython/distrib/makedocs

@@ -9,7 +9,7 @@ fi
 
 
 VERSION=`python -c "import setup;print setup.VERSION"`
-CONTRIBS="ogl gizmos"
+CONTRIBS="gizmos"
 DEST=wxPython-$VERSION/docs
 
 
@@ -57,7 +57,7 @@ done
 popd
 cp ../distrib/viewdocs.py $DEST
 cp ../distrib/README.viewdocs.txt $DEST/README.txt
-cp ../docs/xml/wxPython-metadata.xml $DEST
+##cp ../docs/xml/wxPython-metadata.xml $DEST
 
 rm -f ../dist/wxPython-docs-$VERSION.tar.gz
 tar cvf ../dist/wxPython-docs-$VERSION.tar $DEST

wxPython/distrib/viewdocs.py

@@ -22,7 +22,6 @@ if os.access(basePath, os.W_OK):
     args = ['',
         '--cache='+basePath,
         os.path.join(basePath, 'wx.zip'),
-        os.path.join(basePath, 'ogl.zip'),
         ]
 
     # add any other .zip files found

wxPython/distrib/wxPythonFull.spec.in

@@ -118,7 +118,7 @@ Provides:  wxPython
 
 %description -n %{pkgname}%{ver2}-%{port}-%{chartype}
 wxPython is a GUI toolkit for the Python programming language. It
- allows Python programmers to create programs with a robust, highly
+allows Python programmers to create programs with a robust, highly
 functional graphical user interface, simply and easily. It is
 implemented as a Python extension module (native code) that wraps the
 popular wxWidgets cross platform GUI library, which is written in C++.