restore snapshot and remove 2 toplevels dirs from tarball

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

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 27cf72be353084d77f5caeae155e3d9e0196577f..cb141c3e8eb7f49b82bc05605672c68f193735ce 100755 (executable)
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -61,9 +61,11 @@ 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

+#remove old files

 rm -rf $APPDIR/deliver/*
 rm -rf $APPDIR/deliver/*

+rm -rf $START_DIR/$DIST_DIR/*

 
 

-tar czvf $START_DIR/$DIST_DIR/wxWidgets-$BUILD_VERSION-snapshot.tar.gz $APPDIR
+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
 
 #export DESTDIR=$STAGING_DIR
 cp $START_DIR/scripts/create_archives.sh $APPDIR/distrib/scripts


@@ -71,7 +73,6 @@ chmod +x $APPDIR/distrib/scripts/create_archives.sh
 $APPDIR/distrib/scripts/create_archives.sh --all
 
 # copy all the archives we created to the master machine's deliver directory
 $APPDIR/distrib/scripts/create_archives.sh --all
 
 # copy all the archives we created to the master machine's deliver directory

-rm -rf $START_DIR/$DIST_DIR/*

 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/*.zip $START_DIR/$DIST_DIR
 cp $APPDIR/deliver/*.tar.gz $START_DIR/$DIST_DIR
 cp $APPDIR/deliver/*.tar.bz2 $START_DIR/$DIST_DIR