more consistent naming

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-10-15 20:05:01 +00:00
parent 409ded0fc5
commit bceb17b2e0
3 changed files with 16 additions and 12 deletions

View File

@@ -203,7 +203,7 @@ if [ $skipwin != yes ]; then
ssh $WIN_HOST "cd $WIN_BUILD && $cmd $wxdir $WIN_BUILD $skipclean $VERSION $PYVER && rm $cmd" ssh $WIN_HOST "cd $WIN_BUILD && $cmd $wxdir $WIN_BUILD $skipclean $VERSION $PYVER && rm $cmd"
echo "Fetching the results..." 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*" ssh $WIN_HOST "rm $WIN_BUILD/wxPython*-win32*"
fi fi

View File

@@ -86,6 +86,10 @@ PYLIB=$PYPREFIX/lib/python$PYVER
SITEPACKAGES=$PYLIB/site-packages SITEPACKAGES=$PYLIB/site-packages
SHORTVER=`echo $VERSION | cut -c 1,2,3` 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 if [ -z "$TARBALLDIR" ]; then
# this is a spot on my fileserver where the tarballs go, adjust # this is a spot on my fileserver where the tarballs go, adjust
@@ -332,9 +336,9 @@ EOF
# Build the main Installer Package... # Build the main Installer Package...
rm -rf wxPython${SHORTVER}-osx-$KIND.pkg rm -rf wxPython${SHORTVER}-osx-$CHARTYPE-$KIND.pkg
python $PROGDIR/../buildpkg.py \ python $PROGDIR/../buildpkg.py \
--Title=wxPython${SHORTVER}-osx-$KIND \ --Title=wxPython${SHORTVER}-osx-$CHARTYPE-$KIND \
--Version=$VERSION \ --Version=$VERSION \
--Description="wxPython $VERSION for $W_MSG MacPython-OSX $PYVER" \ --Description="wxPython $VERSION for $W_MSG MacPython-OSX $PYVER" \
--NeedsAuthorization="YES" \ --NeedsAuthorization="YES" \
@@ -343,7 +347,7 @@ EOF
$INSTALLROOT \ $INSTALLROOT \
$RESOURCEDIR $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. 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 wxPython${SHORTVER}-osx-$CHARTYPE-$KIND.pkg The installer package.
extension modules, wxMac dynamic libraries and It contains the wxPython extension modules,
headers, and some scripts for the command-line wxMac dynamic libraries and headers, and some
tools. scripts for the command-line tools.
Everything else here is optional and you can drag them out of the disk 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 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. # 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 echo Moving $DMGDIR/wxPython${SHORTVER}-osx-$CHARTYPE-$VERSION-$KIND-py$PYVER.dmg to $DESTDIR
mv $DMGDIR/wxPython${SHORTVER}-osx-$VERSION-$KIND-py$PYVER.dmg $DESTDIR mv $DMGDIR/wxPython${SHORTVER}-osx-$CHARTYPE-$VERSION-$KIND-py$PYVER.dmg $DESTDIR
fi fi

View File

@@ -317,7 +317,7 @@ ISS_DocDemo_Template = r'''
[Setup] [Setup]
AppName = wxPython%(SHORTVER)s-DocsDemo AppName = wxPython%(SHORTVER)s-DocsDemo
AppVerName = wxPython Docs and Demos %(VERSION)s AppVerName = wxPython Docs and Demos %(VERSION)s
OutputBaseFilename = wxPython%(SHORTVER)s-DocsDemo-%(VERSION)s OutputBaseFilename = wxPython%(SHORTVER)s-win32-DocsDemo-%(VERSION)s
AppCopyright = Copyright <20> 2004 Total Control Software AppCopyright = Copyright <20> 2004 Total Control Software
DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs Demos and Tools DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs Demos and Tools
DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools