diff --git a/CMakeLists.txt b/CMakeLists.txt index 97392886..64584d3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,16 @@ OPTION(BUILD_MEGAGLEST_MAP_EDITOR "Build map editor" ON) OPTION(BUILD_MEGAGLEST_CONFIGURATOR "Build configurator" ON) OPTION(BUILD_MEGAGLEST "Build MegaGlest" ON) +FIND_PROGRAM(HELP2MAN "help2man") + +set(XVFB_EXEC "") +find_program(XVFB_RUN NAMES "xvfb-run") +if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND") + set(XVFB_EXEC ${XVFB_RUN}) + message(STATUS "Using xvfb-run to run man2help.") +endif() + + ## Compiler flags IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) IF(CMAKE_COMPILER_IS_GNUCXX) diff --git a/build-mg.sh b/build-mg.sh index 46eee4ec..fc72626c 100755 --- a/build-mg.sh +++ b/build-mg.sh @@ -1,4 +1,8 @@ #!/bin/bash +# Use this script to build MegaGlest using cmake +# ---------------------------------------------------------------------------- +# Written by Mark Vejvoda +# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'` diff --git a/mk/linux/makedata-source.sh b/mk/linux/makedata-source.sh new file mode 100755 index 00000000..777b0d4d --- /dev/null +++ b/mk/linux/makedata-source.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# Use this script to build MegaGlest Data Archive for a Version Release +# ---------------------------------------------------------------------------- +# Written by Mark Vejvoda +# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ + +VERSION=`./mg-version.sh --version` +RELEASENAME=megaglest-data-source +#PACKAGE="$RELEASENAME-$VERSION.7z" +PACKAGE="$RELEASENAME-$VERSION.tar.xz" +CURRENTDIR="$(dirname $(readlink -f $0))" +RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION" +SOURCEDIR="$CURRENTDIR/../../source/" + +echo "Creating data package in $RELEASEDIR" + +[[ -d "$RELEASEDIR" ]] && rm -rf "$RELEASEDIR" +mkdir -p "$RELEASEDIR" + +project_parent_dir="$(basename $(readlink -f -- "$(dirname -- "$0")/../../") )" +# echo "$project_parent_dir" +if [[ $project_parent_dir == trunk* ]] ; +then + echo 'this is the trunk!' +else + echo '*NOTE: This script currently only works on the trunk, aborting!' + exit +fi + +# copy data +svn export --force "$CURRENTDIR/../../../trunk-data-source" "$RELEASEDIR/data-source/" + +echo "creating $PACKAGE" +[[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE" +#tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION" +tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz -9e > release/$PACKAGE +# 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION" + +ls -la release/$PACKAGE diff --git a/mk/linux/makedata.sh b/mk/linux/makedata.sh index 60b733b1..f4b59539 100755 --- a/mk/linux/makedata.sh +++ b/mk/linux/makedata.sh @@ -36,6 +36,8 @@ mkdir -p "$RELEASEDIR/data/" svn export --force "$CURRENTDIR/../../data/glest_game/data" "$RELEASEDIR/data/" mkdir -p "$RELEASEDIR/docs/" svn export --force "$CURRENTDIR/../../data/glest_game/docs" "$RELEASEDIR/docs/" +svn export --force "$CURRENTDIR/../../docs/CHANGELOG.txt" "$RELEASEDIR/docs/CHANGELOG.txt" +svn export --force "$CURRENTDIR/../../docs/README.txt" "$RELEASEDIR/docs/README.txt" mkdir -p "$RELEASEDIR/maps/" svn export --force "$CURRENTDIR/../../data/glest_game/maps" "$RELEASEDIR/maps/" mkdir -p "$RELEASEDIR/scenarios/" @@ -59,3 +61,4 @@ echo "creating $PACKAGE" tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz -9e > release/$PACKAGE # 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION" +ls -la release/$PACKAGE diff --git a/mk/linux/makerelease.sh b/mk/linux/makerelease.sh index 9658a3c0..41034259 100755 --- a/mk/linux/makerelease.sh +++ b/mk/linux/makerelease.sh @@ -53,3 +53,5 @@ svn export --force "$CURRENTDIR/../../CMakeLists.txt" $RELEASEDIR/CMakeLists.txt echo "Creating $PACKAGE" [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE" tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/$RELEASENAME-$VERSION" "megaglest-$VERSION" + +ls -la release/$PACKAGE