From 384e1abeb7f444bcf59cc83aad1da518923f1391 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Fri, 16 Nov 2007 10:02:09 +0000 Subject: [PATCH] possible os2 watcom makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/scripts/build-environ.cfg | 2 +- distrib/scripts/pre-flight.sh | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg index 9c1edbfc20..3e07aff6a0 100644 --- a/distrib/scripts/build-environ.cfg +++ b/distrib/scripts/build-environ.cfg @@ -18,7 +18,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/ CURDATE=`date -I` # build info -BUILD_VERSION=2.8.6 +BUILD_VERSION=2.8.7-rc2 BUILD_TAG=HEAD diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh index 7e5fb24fed..9def44e364 100755 --- a/distrib/scripts/pre-flight.sh +++ b/distrib/scripts/pre-flight.sh @@ -79,6 +79,19 @@ cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts chmod +x $APPDIR/distrib/scripts/create_archives.sh $APPDIR/distrib/scripts/create_archives.sh --all +#rebake the bakefiles for os2 +if [ $rebake = "yes" ]; then + if [ ! -d $WX_SRC_DIR/build/bakefiles ]; then + mkdir $WX_SRC_DIR/build/bakefiles + fi + + cd $WX_SRC_DIR/build/bakefiles + rm .ba* + bakefile_gen -f watcom -d ../os2/Bakefiles.os2.bkgen +fi + +$APPDIR/distrib/scripts/create_archives.sh --wxos2 + # copy all the archives we created to the master machine's deliver directory cp $APPDIR/deliver/*.zip $START_DIR/$DIST_DIR cp $APPDIR/deliver/*.tar.gz $START_DIR/$DIST_DIR