Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cvs to svn changes for 2.8.5

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2007-08-07 12:01:07 +00:00
parent 8de86fa902
commit 72d5e4361f
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/scripts/build-environ.cfg
View File

@@ -11,13 +11,13 @@ STAGING_DIR=./BUILD
DIST_DIR=../deliver DIST_DIR=../deliver
# directory to store the wx tree we pull from CVS # directory to store the wx tree we pull from CVS
WX_TEMP_DIR=/tmp/wx-temp WX_TEMP_DIR=/tmp/wx-temp28
DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
CURDATE=`date -I` CURDATE=`date -I`
# build info # build info
BUILD_VERSION=2.8.4 BUILD_VERSION=2.8.5-rc1
BUILD_TAG=HEAD BUILD_TAG=HEAD
@@ -26,7 +26,7 @@ if [ "$KIND" = "release" ]; then
else else
KIND=daily KIND=daily
BUILD_VERSION=${CURDATE} BUILD_VERSION=${CURDATE}
FTPDIR=/home/ftp/pub/CVS_HEAD/v2 FTPDIR=/home/ftp/pub/28_Branch/v2
fi fi
echo "Building for ${BUILD_VERSION}" echo "Building for ${BUILD_VERSION}"

2
distrib/scripts/create_archives.sh
View File

@@ -209,7 +209,7 @@ prepareforrelease()
cp $APPDIR/docs/cocoa/install.txt $APPDIR/install-cocoa.txt cp $APPDIR/docs/cocoa/install.txt $APPDIR/install-cocoa.txt
# Now delete a few files that are unnecessary # Now delete a few files that are unnecessary
rm -f BuildCVS.txt descrip.mms rm -f BuildSVN.txt descrip.mms
rm -f setup.h_vms rm -f setup.h_vms
rm -f docs/html/wxbook.htm docs/html/roadmap.htm rm -f docs/html/wxbook.htm docs/html/roadmap.htm
rm -f -r contrib/docs/latex/ogl rm -f -r contrib/docs/latex/ogl

19
distrib/scripts/pre-flight.sh
View File

@@ -9,7 +9,6 @@ echo "temp dir is $WX_TEMP_DIR"
START_DIR="$PWD" START_DIR="$PWD"
SCRIPTDIR=${START_DIR}/scripts SCRIPTDIR=${START_DIR}/scripts
WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
CURDATE=`date -I` CURDATE=`date -I`
@@ -21,25 +20,15 @@ fi
cd $WX_TEMP_DIR cd $WX_TEMP_DIR
# just do an update if we started a build but it failed somewhere
if [ ! -d $WX_WEB_DIR ]; then
cvs -d:pserver:anoncvs:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets login
echo "Grabbing wxWebSite sources..."
cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxWebSite
else
cd $WX_WEB_DIR
cvs update -d -P
fi
if [ ! -d $WX_SRC_DIR ]; then if [ ! -d $WX_SRC_DIR ]; then
cd $WX_TEMP_DIR cd $WX_TEMP_DIR
cvs -d:pserver:anoncvs:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets login
echo "Grabbing wx CVS with tag $BUILD_TAG" echo "Grabbing wx CVS with tag $BUILD_TAG"
cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout -r $BUILD_TAG wxWidgets svn up https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH/ wxWidgets
cd $WX_SRC_DIR cd $WX_SRC_DIR
else else
cd $WX_SRC_DIR cd $WX_SRC_DIR
cvs update -d -P svn up
fi fi
#copy setup0.h setup.h for msw #copy setup0.h setup.h for msw
rm include/wx/msw/setup.h rm include/wx/msw/setup.h
@@ -81,8 +70,8 @@ export SCRIPTDIR=${SCRIPTDIR}
rm -rf $APPDIR/deliver/* rm -rf $APPDIR/deliver/*
rm -rf $START_DIR/$DIST_DIR/* rm -rf $START_DIR/$DIST_DIR/*
# no general tarball for 2.8 branch
tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz $WX_TEMP_DIR #tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz $WX_TEMP_DIR
#export DESTDIR=$STAGING_DIR #export DESTDIR=$STAGING_DIR
cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts