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

use local scripts not the newly downloaded CVS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2006-07-21 09:10:35 +00:00
parent 3eecbda80c
commit 8afb1dca50
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/scripts/Bakefiles.release.bkgen
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<bakefile-gen> <bakefile-gen>
<include file="../../build/bakefiles/Bakefiles.bkgen"/> <!-- this file is a symlink -->
<include file="Bakefiles.bkgen"/>
<!-- add extra formats to release --> <!-- add extra formats to release -->
<enable-formats>dmars,dmars_smake,msevc4prj</enable-formats> <enable-formats>dmars,dmars_smake,msevc4prj</enable-formats>
</bakefile-gen> </bakefile-gen>

8
distrib/scripts/create_archives.sh
View File

@@ -20,10 +20,10 @@ VERBOSE=0
ZIPFLAGS= ZIPFLAGS=
PROGNAME=$0 PROGNAME=$0
SCRIPTDIR=$WXWIN/distrib/scripts ##SCRIPTDIR=$WXWIN/distrib/scripts
. $SCRIPTDIR/utils.inc . $SCRIPTDIR/utils.inc
MANIFESTDIR=$SCRIPTDIR/manifests MANIFESTDIR=$WXWIN/distrib/scripts/manifests
WEBFILES=$WXWIN/../wxWebSite WEBFILES=$WXWIN/../wxWebSite
if [ ! "$CYGPATH" = "" ]; then if [ ! "$CYGPATH" = "" ]; then
WEBFILES=`$CYGPATH "$WEBFILES"` WEBFILES=`$CYGPATH "$WEBFILES"`
@@ -133,7 +133,7 @@ dospinport(){
copyfilelist $portfiles $APPDIR $TMPFILESDIR copyfilelist $portfiles $APPDIR $TMPFILESDIR
if [ $port = "msw" ]; then if [ $port = "msw" ]; then
FILES=`find . -type f \( -path '*/CVS/*' -prune -o -exec distrib/scripts/is_text.sh {} \; -print \)` FILES=`find . -type f \( -path '*/CVS/*' -prune -o -exec ${SCRIPTDIR}/is_text.sh {} \; -print \)`
echo "$FILES" > /tmp/textfiles echo "$FILES" > /tmp/textfiles
fi fi
@@ -155,7 +155,7 @@ dospinport(){
popd popd
rm -rf /tmp/wx$port rm -rf /tmp/wx$port
rm ${portfiles} rm ${portfiles}
rm /tmp/textfiles # rm /tmp/textfiles
} }
prepareforrelease() prepareforrelease()

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

@@ -8,6 +8,7 @@ fi
echo "$WX_TEMP_DIR" echo "$WX_TEMP_DIR"
START_DIR="$PWD" START_DIR="$PWD"
SCRIPTDIR=${START_DIR}/scripts
WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
@@ -47,7 +48,7 @@ fi
#re-bake the bakefiles #re-bake the bakefiles
if [ $rebake = "yes" ]; then if [ $rebake = "yes" ]; then
cd $WX_SRC_DIR/build/bakefiles cd $WX_SRC_DIR/build/bakefiles
bakefile_gen -d ../../distrib/scripts/Bakefiles.release.bkgen bakefile_gen -d ${SCRIPTDIR}/Bakefiles.release.bkgen
fi fi
cd $WX_SRC_DIR cd $WX_SRC_DIR
@@ -61,6 +62,8 @@ cd $WX_TEMP_DIR
export APPDIR=$WX_TEMP_DIR/wxWidgets export APPDIR=$WX_TEMP_DIR/wxWidgets
export WXWIN=$WX_TEMP_DIR/wxWidgets export WXWIN=$WX_TEMP_DIR/wxWidgets
export VERSION=$BUILD_VERSION export VERSION=$BUILD_VERSION
export SCRIPTDIR=${SCRIPTDIR}
#remove old files #remove old files
rm -rf $APPDIR/deliver/* rm -rf $APPDIR/deliver/*
rm -rf $START_DIR/$DIST_DIR/* rm -rf $START_DIR/$DIST_DIR/*
@@ -68,7 +71,7 @@ rm -rf $START_DIR/$DIST_DIR/*
tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz `basename $APPDIR` tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz `basename $APPDIR`
#export DESTDIR=$STAGING_DIR #export DESTDIR=$STAGING_DIR
cp $START_DIR/scripts/create_archives.sh $APPDIR/distrib/scripts cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts
chmod +x $APPDIR/distrib/scripts/create_archives.sh chmod +x $APPDIR/distrib/scripts/create_archives.sh
$APPDIR/distrib/scripts/create_archives.sh --all $APPDIR/distrib/scripts/create_archives.sh --all
@@ -77,7 +80,7 @@ cp $APPDIR/deliver/*.zip $START_DIR/$DIST_DIR
cp $APPDIR/deliver/*.tar.gz $START_DIR/$DIST_DIR cp $APPDIR/deliver/*.tar.gz $START_DIR/$DIST_DIR
cp $APPDIR/deliver/*.tar.bz2 $START_DIR/$DIST_DIR cp $APPDIR/deliver/*.tar.bz2 $START_DIR/$DIST_DIR
echo "Tarball located at: $WX_TARBALL" echo "Tarballs located at: $START_DIR/$DIST_DIR"
if [ ! -f $WX_TARBALL ]; then if [ ! -f $WX_TARBALL ]; then
echo "ERROR: wxAll tarball was not created by pre-flight.sh. Build cannot continue." echo "ERROR: wxAll tarball was not created by pre-flight.sh. Build cannot continue."