From c65b55c6b93dde5a99c05813e45a030b636d2a83 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 7 May 2011 05:08:17 +0000 Subject: [PATCH] - who will win.. 7z or xz? (so far 7z) --- mk/linux/makedata.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mk/linux/makedata.sh b/mk/linux/makedata.sh index fb3d893c..82bb2d75 100755 --- a/mk/linux/makedata.sh +++ b/mk/linux/makedata.sh @@ -2,7 +2,8 @@ VERSION=`./mg-version.sh --version` RELEASENAME=megaglest-data -PACKAGE="$RELEASENAME-$VERSION.7z" +#PACKAGE="$RELEASENAME-$VERSION.7z" +PACKAGE="$RELEASENAME-$VERSION.tar.xz" CURRENTDIR="$(dirname $(readlink -f $0))" RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION" SOURCEDIR="$CURRENTDIR/../../source/" @@ -45,10 +46,11 @@ svn export --force "$CURRENTDIR/../../data/glest_game/tutorials" "$RELEASEDIR/tu mkdir -p "$RELEASEDIR/data/core/misc_textures/flags/" svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/data/core/misc_textures/flags/" -cp -p CMakeLists.txt $RELEASEDIR +cp -p "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" $RELEASEDIR echo "creating $PACKAGE" rm "release/$PACKAGE" #tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION" -7z a -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION" +tar -cf - "$CURRENTDIR/release/$RELEASENAME-$VERSION" | xz -9e > release/$PACKAGE +# 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION"