use local scripts not the newly downloaded CVS

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

diff --git a/distrib/scripts/Bakefiles.release.bkgen b/distrib/scripts/Bakefiles.release.bkgen
index a86bef1b3a4d8205e3c658f45b49fe1d4fa9adb1..c8700ad1e16c460102ceaea9e7756a8b43f999f6 100644 (file)
--- a/distrib/scripts/Bakefiles.release.bkgen
+++ b/distrib/scripts/Bakefiles.release.bkgen
@@ -1,6 +1,8 @@
 <?xml version="1.0" ?>
 <bakefile-gen>
 <?xml version="1.0" ?>
 <bakefile-gen>

-  <include file="../../build/bakefiles/Bakefiles.bkgen"/>
+  <!-- this file is a symlink  -->
+  <include file="Bakefiles.bkgen"/>

   <!-- add extra formats to release -->
   <enable-formats>dmars,dmars_smake,msevc4prj</enable-formats>
   <!-- add extra formats to release -->
   <enable-formats>dmars,dmars_smake,msevc4prj</enable-formats>

-</bakefile-gen>
\ No newline at end of file
+</bakefile-gen>
+

diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh
index 539f8010754c9e867b98d1319b8b7f8db58ffa60..b906c4c271c82cbca2f1a8738e54a129286646f8 100755 (executable)
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -20,10 +20,10 @@ VERBOSE=0
 ZIPFLAGS=
 
 PROGNAME=$0
 ZIPFLAGS=
 
 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
 if [ ! "$CYGPATH" = "" ]; then
   WEBFILES=`$CYGPATH "$WEBFILES"`
 WEBFILES=$WXWIN/../wxWebSite
 if [ ! "$CYGPATH" = "" ]; then
   WEBFILES=`$CYGPATH "$WEBFILES"`


@@ -133,7 +133,7 @@ dospinport(){
     copyfilelist $portfiles $APPDIR $TMPFILESDIR
 
     if [ $port = "msw" ]; then
     copyfilelist $portfiles $APPDIR $TMPFILESDIR
 
     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
     fi
 
         echo "$FILES" > /tmp/textfiles
     fi
 


@@ -155,7 +155,7 @@ dospinport(){
     popd
     rm -rf /tmp/wx$port
     rm ${portfiles}
     popd
     rm -rf /tmp/wx$port
     rm ${portfiles}

-    rm /tmp/textfiles
+#    rm /tmp/textfiles

 }
 
 prepareforrelease()
 }
 
 prepareforrelease()

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index cb141c3e8eb7f49b82bc05605672c68f193735ce..1b4dcd3926e96a3cccc006f06e79fc6f60a19d29 100755 (executable)
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -8,6 +8,7 @@ fi
 echo "$WX_TEMP_DIR"
 
 START_DIR="$PWD"
 echo "$WX_TEMP_DIR"
 
 START_DIR="$PWD"

+SCRIPTDIR=${START_DIR}/scripts

 WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
 WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
 
 WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
 WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
 


@@ -47,7 +48,7 @@ fi
 #re-bake the bakefiles
 if [ $rebake = "yes" ]; then
   cd $WX_SRC_DIR/build/bakefiles
 #re-bake the bakefiles
 if [ $rebake = "yes" ]; then
   cd $WX_SRC_DIR/build/bakefiles

-  bakefile_gen -d ../../distrib/scripts/Bakefiles.release.bkgen
+  bakefile_gen -d ${SCRIPTDIR}/Bakefiles.release.bkgen

 fi
 
 cd $WX_SRC_DIR
 fi
 
 cd $WX_SRC_DIR


@@ -61,6 +62,8 @@ cd $WX_TEMP_DIR
 export APPDIR=$WX_TEMP_DIR/wxWidgets
 export WXWIN=$WX_TEMP_DIR/wxWidgets
 export VERSION=$BUILD_VERSION
 export APPDIR=$WX_TEMP_DIR/wxWidgets
 export WXWIN=$WX_TEMP_DIR/wxWidgets
 export VERSION=$BUILD_VERSION

+export SCRIPTDIR=${SCRIPTDIR}
+

 #remove old files
 rm -rf $APPDIR/deliver/*
 rm -rf $START_DIR/$DIST_DIR/*
 #remove old files
 rm -rf $APPDIR/deliver/*
 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`
 
 #export DESTDIR=$STAGING_DIR
 tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz `basename $APPDIR`
 
 #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
 $APPDIR/distrib/scripts/create_archives.sh --all
 
 chmod +x $APPDIR/distrib/scripts/create_archives.sh
 $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.bz2 $START_DIR/$DIST_DIR
 
 cp $APPDIR/deliver/*.tar.gz $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
   echo "ERROR: wxAll tarball was not created by pre-flight.sh. Build cannot continue."
 
 if [ ! -f $WX_TARBALL ]; then
   echo "ERROR: wxAll tarball was not created by pre-flight.sh. Build cannot continue."