more consistent naming

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

diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index aec2c51d026c5b6e70a0a30a23dd132c0d11ea38..a8308d7f4e5cfc89c7b50e15aa8fba9bce326960 100755 (executable)
--- a/wxPython/distrib/all/build-all
+++ b/wxPython/distrib/all/build-all
@@ -203,7 +203,7 @@ if [ $skipwin != yes ]; then
      ssh $WIN_HOST "cd $WIN_BUILD && $cmd $wxdir $WIN_BUILD $skipclean $VERSION $PYVER && rm $cmd"
 
      echo "Fetching the results..."
-     scp $WIN_HOST:$WIN_BUILD/wxPython*-win32*  $STAGING_DIR
+     scp "$WIN_HOST:$WIN_BUILD/wxPython*-win32*"  $STAGING_DIR
      ssh $WIN_HOST "rm $WIN_BUILD/wxPython*-win32*"
 fi
 

diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index 24d9d2bb00370b6366e02e3b3d349235c58e7ad0..a28104cbbb6cb3064c3fcbd4edf30e42b09dc2cc 100755 (executable)
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -86,6 +86,10 @@ PYLIB=$PYPREFIX/lib/python$PYVER
 SITEPACKAGES=$PYLIB/site-packages
 SHORTVER=`echo $VERSION | cut -c 1,2,3`
 
+# TODO: enable selecting unicode or ansi builds, then set this accordingly...
+CHARTYPE=ansi
+
+
 
 if [ -z "$TARBALLDIR" ]; then
     # this is a spot on my fileserver where the tarballs go, adjust
@@ -332,9 +336,9 @@ EOF
 
 
     # Build the main Installer Package...
-    rm -rf wxPython${SHORTVER}-osx-$KIND.pkg
+    rm -rf wxPython${SHORTVER}-osx-$CHARTYPE-$KIND.pkg
     python $PROGDIR/../buildpkg.py \
-       --Title=wxPython${SHORTVER}-osx-$KIND \
+       --Title=wxPython${SHORTVER}-osx-$CHARTYPE-$KIND \
        --Version=$VERSION \
        --Description="wxPython $VERSION for $W_MSG MacPython-OSX $PYVER" \
        --NeedsAuthorization="YES" \
@@ -343,7 +347,7 @@ EOF
        $INSTALLROOT \
        $RESOURCEDIR
 
-    mv wxPython${SHORTVER}-osx-$KIND.pkg $DMGDIR/root
+    mv wxPython${SHORTVER}-osx-$CHARTYPE-$KIND.pkg $DMGDIR/root
 
 
 
@@ -353,10 +357,10 @@ Welcome to wxPython!
 
 On this disk image you will find the installer for wxPython $VERSION for $W_MSG MacPython-OSX $PYVER.  MacPython-OSX is not included.
 
-   wxPython${SHORTVER}-osx-$KIND.pkg   The installer package.  It contains the wxPython
-                        extension modules, wxMac dynamic libraries and
-                        headers, and some scripts for the command-line
-                        tools.
+   wxPython${SHORTVER}-osx-$CHARTYPE-$KIND.pkg   The installer package.  
+                        It contains the wxPython extension modules,
+                        wxMac dynamic libraries and headers, and some
+                        scripts for the command-line tools.
 
 Everything else here is optional and you can drag them out of the disk
 image and drop them wherever you want.  You do need to install the above
@@ -496,10 +500,10 @@ EOF
 
 
     # and then finally make a disk image containing the packages and etc.
-    $PROGDIR/../makedmg $DMGDIR/root $DMGDIR wxPython${SHORTVER}-osx-$VERSION-$KIND-py$PYVER
+    $PROGDIR/../makedmg $DMGDIR/root $DMGDIR wxPython${SHORTVER}-osx-$CHARTYPE-$VERSION-$KIND-py$PYVER
 
-    echo Moving $DMGDIR/wxPython${SHORTVER}-osx-$VERSION-$KIND-py$PYVER.dmg to $DESTDIR
-    mv $DMGDIR/wxPython${SHORTVER}-osx-$VERSION-$KIND-py$PYVER.dmg  $DESTDIR
+    echo Moving $DMGDIR/wxPython${SHORTVER}-osx-$CHARTYPE-$VERSION-$KIND-py$PYVER.dmg to $DESTDIR
+    mv $DMGDIR/wxPython${SHORTVER}-osx-$CHARTYPE-$VERSION-$KIND-py$PYVER.dmg  $DESTDIR
 fi
 
 

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 500ed907780fd076a1ba12c0b3c03767b5700a6c..f8b642f19814f56bf47db3bbefb624c8e35ac027 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -317,7 +317,7 @@ ISS_DocDemo_Template = r'''
 [Setup]
 AppName = wxPython%(SHORTVER)s-DocsDemo
 AppVerName = wxPython Docs and Demos %(VERSION)s
-OutputBaseFilename = wxPython%(SHORTVER)s-DocsDemo-%(VERSION)s
+OutputBaseFilename = wxPython%(SHORTVER)s-win32-DocsDemo-%(VERSION)s
 AppCopyright = Copyright © 2004 Total Control Software
 DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs Demos and Tools
 DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools