Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- missed some updates

This commit is contained in:
SoftCoder 2014-01-24 09:50:17 -08:00
parent 50c6bba9a9
commit 1cacb0df27
22 changed files with 92 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit 4148a9e4d7e62270edb2c07174606cbc03561330
Subproject commit 28765fb9baf715ab5adea9b71d12415464c2f0c7

18
mk/linux/make-binary-archive.sh
View File

@ -15,12 +15,10 @@ kernel=`uname -s | tr '[A-Z]' '[a-z]'`
architecture=`uname -m | tr '[A-Z]' '[a-z]'`
RELEASENAME=megaglest-binary-$kernel-$architecture
#PACKAGE="$RELEASENAME-$VERSION.7z"
PACKAGE="$RELEASENAME-$VERSION.tar.xz"
CURRENTDIR="$(dirname $(readlink -f $0))"
#RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION"
#PROJDIR="$CURRENTDIR/../../"
RELEASEDIR_ROOT="$CURRENTDIR/../../../release/"
RELEASEDIR="${RELEASEDIR_ROOT}/${RELEASENAME-$VERSION}"
PROJDIR="$CURRENTDIR/"
echo "Creating binary package in $RELEASEDIR"
@ -44,7 +42,7 @@ fi
cd $PROJDIR
mkdir -p "$RELEASEDIR/lib"
#cd mk/linux
[[ -d "lib" ]] && rm -rf "lib"
echo "building binary dependencies ..."
./makedeps_folder.sh megaglest
@ -71,12 +69,10 @@ cp start_megaglest_gameserver "$RELEASEDIR/"
echo "creating $PACKAGE"
cd $CURRENTDIR
[[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
#tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION"
#tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "./" | xz > release/$PACKAGE
cd release/$RELEASENAME-$VERSION/
[[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE"
cd ${RELEASEDIR_ROOT}/$RELEASENAME-$VERSION/
tar -cf - * | xz > ../$PACKAGE
cd $CURRENTDIR
# 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION"
ls -la release/$PACKAGE
ls -la ${RELEASEDIR_ROOT}/$PACKAGE

45
mk/linux/make-data-archive.sh
View File

@ -9,11 +9,10 @@
VERSION=`./mg-version.sh --version`
RELEASENAME=megaglest-standalone-data
#PACKAGE="$RELEASENAME-$VERSION.7z"
PACKAGE="$RELEASENAME-$VERSION.tar.xz"
CURRENTDIR="$(dirname $(readlink -f $0))"
#RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION"
RELEASEDIR_ROOT="$CURRENTDIR/../../../release/"
RELEASEDIR="${RELEASEDIR_ROOT}/${RELEASENAME-$VERSION}"
PROJDIR="$CURRENTDIR/../../"
REPODIR="$CURRENTDIR/../../"
@ -24,31 +23,14 @@ mkdir -p "$RELEASEDIR"
# copy data
echo "copying data ..."
#svn export --force "$CURRENTDIR/../../mk/linux/megaglest.bmp" "$RELEASEDIR/megaglest.bmp"
#svn export --force "$CURRENTDIR/../../mk/linux/megaglest.desktop" "$RELEASEDIR/megaglest.desktop"
#svn export --force "$CURRENTDIR/../../mk/linux/megaglest.png" "$RELEASEDIR/megaglest.png"
#svn export --force "$CURRENTDIR/../../mk/linux/megaglest.xpm" "$RELEASEDIR/megaglest.xpm"
#svn export --force "$CURRENTDIR/../../mk/linux/glest.ico" "$RELEASEDIR/glest.ico"
#svn export --force "$CURRENTDIR/../../mk/linux/configuration.xml" "$RELEASEDIR/configuration.xml"
#svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" "$RELEASEDIR/megaglest.ico"
#svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" "$RELEASEDIR/g3dviewer.ico"
#svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" "$RELEASEDIR/editor.ico"
#svn export --force "$CURRENTDIR/../../data/glest_game/servers.ini" "$RELEASEDIR/servers.ini"
#svn export --force "$CURRENTDIR/../../data/glest_game/glest.ini" "$RELEASEDIR/glest_windows.ini"
#svn export --force "$CURRENTDIR/../../mk/linux/glest.ini" "$RELEASEDIR/glest_linux.ini"
#svn export --force "$CURRENTDIR/../../data/glest_game/glestkeys.ini" "$RELEASEDIR/glestkeys.ini"
mkdir -p "$RELEASEDIR/data/"
cd "$RELEASEDIR/data/"
#svn export --force "$CURRENTDIR/../../data/glest_game/data" "$RELEASEDIR/data/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:data | tar x
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/docs/"
cd "$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"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:docs | tar x
git archive --remote ${REPODIR} HEAD:docs/ CHANGELOG.txt | tar x
git archive --remote ${REPODIR} HEAD:docs/ README.txt | tar x
@ -56,55 +38,40 @@ git archive --remote ${REPODIR} HEAD:docs/ README.txt | tar x
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/maps/"
cd "$RELEASEDIR/maps/"
#svn export --force "$CURRENTDIR/../../data/glest_game/maps" "$RELEASEDIR/maps/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:maps | tar x
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/scenarios/"
cd "$RELEASEDIR/scenarios/"
#svn export --force "$CURRENTDIR/../../data/glest_game/scenarios" "$RELEASEDIR/scenarios/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:scenarios | tar x
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/techs/"
cd "$RELEASEDIR/techs/"
#svn export --force "$CURRENTDIR/../../data/glest_game/techs" "$RELEASEDIR/techs/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:techs | tar x
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/tilesets/"
cd "$RELEASEDIR/tilesets/"
#svn export --force "$CURRENTDIR/../../data/glest_game/tilesets" "$RELEASEDIR/tilesets/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:tilesets | tar x
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/tutorials/"
cd "$RELEASEDIR/tutorials/"
#svn export --force "$CURRENTDIR/../../data/glest_game/tutorials" "$RELEASEDIR/tutorials/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:tutorials | tar x
# special export for flag images
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/data/core/misc_textures/flags/"
cd "$RELEASEDIR/data/core/misc_textures/flags/"
# svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/data/core/misc_textures/flags/"
git archive --remote ${REPODIR} HEAD:source/masterserver/flags | tar x
#svn export --force "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" "$RELEASEDIR/CMakeLists.txt"
# START
# remove embedded data
#rm -rf "$RELEASEDIR/data/core/fonts"
# END
cd "$CURRENTDIR"
echo "creating data archive: $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 > release/$PACKAGE
cd $CURRENTDIR/release/$RELEASENAME-$VERSION
[[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE"
cd ${RELEASEDIR_ROOT}/$RELEASENAME-$VERSION
tar -cf - * | xz > ../$PACKAGE
cd $CURRENTDIR
# 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION"
ls -la release/$PACKAGE
ls -la ${RELEASEDIR_ROOT}/$PACKAGE

12
mk/linux/makedata-diff.sh
View File

@ -14,9 +14,12 @@ OLD_VERSION=`./mg-version.sh --oldversion`
VERSION=`./mg-version.sh --version`
NEW_SUBFOLDER_PATH="megaglest-$VERSION"
cd release
CURDIR="`pwd`"
cd ..
CURRENTDIR="$(dirname $(readlink -f $0))"
RELEASEDIR_ROOT="$CURRENTDIR/../../../release/"
cd $RELEASEDIR_ROOT
CURDIR=$RELEASEDIR_ROOT
cd $CURRENTDIR
RELEASENAME=megaglest-data-updates-$VERSION
@ -101,6 +104,5 @@ echo Current Folder is [`pwd`]
#7za a -mx=9 -ms=on -mhc=on "../$RELEASENAME.7z" $files_list
tar -cf - --add-file $files_list | xz > ../$RELEASENAME.tar.xz
cd ..
cd $CURRENTDIR
cd ..

14
mk/linux/makedata-source.sh
View File

@ -9,10 +9,10 @@
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"
RELEASEDIR_ROOT="$CURRENTDIR/../../../release/"
RELEASEDIR="$RELEASEDIR_ROOT/$RELEASENAME-$VERSION/megaglest-$VERSION"
SOURCEDIR="$CURRENTDIR/../../source/"
# Below we assume you have the data source contents root in a folder called: git-data-source/
REPODIR="$CURRENTDIR/../../../git-data-source/"
@ -36,14 +36,12 @@ fi
# copy data
mkdir -p "$RELEASEDIR/data-source"
cd "$RELEASEDIR/data-source"
#svn export --force "$CURRENTDIR/../../../git-data-source" "$RELEASEDIR/data-source/"
git archive --remote ${REPODIR}/ HEAD: | tar x
cd "$CURRENTDIR"
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 > release/$PACKAGE
# 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION"
[[ -f "$RELEASEDIR_ROOT/$PACKAGE" ]] && rm "$RELEASEDIR_ROOT/$PACKAGE"
tar -cf - -C "$RELEASEDIR_ROOT/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz > $RELEASEDIR_ROOT/$PACKAGE
ls -la $RELEASEDIR_ROOT/$PACKAGE
ls -la release/$PACKAGE

58
mk/linux/makedata.sh
View File

@ -9,10 +9,10 @@
VERSION=`./mg-version.sh --version`
RELEASENAME=megaglest-data
#PACKAGE="$RELEASENAME-$VERSION.7z"
PACKAGE="$RELEASENAME-$VERSION.tar.xz"
CURRENTDIR="$(dirname $(readlink -f $0))"
RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
RELEASEDIR_ROOT="$CURRENTDIR/../../../release/"
RELEASEDIR="$RELEASEDIR_ROOT/$RELEASENAME-$VERSION/megaglest-$VERSION"
SOURCEDIR="$CURRENTDIR/../../source/"
REPODIR="$CURRENTDIR/../../"
@ -24,101 +24,56 @@ mkdir -p "$RELEASEDIR"
# copy data
echo "Exporting image and ini files ..."
cd "$RELEASEDIR"
# svn export --force "$CURRENTDIR/../../mk/linux/megaglest.bmp" "$RELEASEDIR/megaglest.bmp"
# svn export --force "$CURRENTDIR/../../mk/linux/megaglest.desktop" "$RELEASEDIR/megaglest.desktop"
# svn export --force "$CURRENTDIR/../../mk/linux/megaglest.png" "$RELEASEDIR/megaglest.png"
# svn export --force "$CURRENTDIR/../../mk/linux/megaglest.xpm" "$RELEASEDIR/megaglest.xpm"
# svn export --force "$CURRENTDIR/../../mk/linux/glest.ico" "$RELEASEDIR/glest.ico"
# svn export --force "$CURRENTDIR/../../mk/linux/configuration.xml" "$RELEASEDIR/configuration.xml"
# svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" "$RELEASEDIR/megaglest.ico"
# svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" "$RELEASEDIR/g3dviewer.ico"
# svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" "$RELEASEDIR/editor.ico"
# svn export --force "$CURRENTDIR/../../data/glest_game/servers.ini" "$RELEASEDIR/servers.ini"
# svn export --force "$CURRENTDIR/../../data/glest_game/glest.ini" "$RELEASEDIR/glest_windows.ini"
# svn export --force "$CURRENTDIR/../../mk/linux/glest.ini" "$RELEASEDIR/glest_linux.ini"
# svn export --force "$CURRENTDIR/../../data/glest_game/glestkeys.ini" "$RELEASEDIR/glestkeys.ini"
git archive --remote ${REPODIR}/data/glest_game/ HEAD: CMakeLists.txt | tar x
#git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.bmp | tar x
#git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.desktop | tar x
#git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.png | tar x
#git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.xpm | tar x
#git archive --remote ${REPODIR} HEAD:mk/linux/ glest.ico | tar x
#git archive --remote ${REPODIR} HEAD:mk/linux/ glest.ini | tar x
#mv glest.ini glest_linux.ini
#git archive --remote ${REPODIR}/data/glest_game/ HEAD: megaglest.ico | tar x
#git archive --remote ${REPODIR}/data/glest_game/ HEAD: g3dviewer.ico | tar x
#git archive --remote ${REPODIR}/data/glest_game/ HEAD: editor.ico | tar x
#git archive --remote ${REPODIR}/data/glest_game/ HEAD: servers.ini | tar x
#git archive --remote ${REPODIR}/data/glest_game/ HEAD: glest.ini | tar x
#git archive --remote ${REPODIR}/data/glest_game/ HEAD: glestkeys.ini | tar x
#mv glest.ini glest_windows.ini
echo "Exporting game data files ..."
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/data/"
cd "$RELEASEDIR/data/"
# svn export --force "$CURRENTDIR/../../data/glest_game/data" "$RELEASEDIR/data/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:data | tar x
echo "Exporting doc files ..."
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/docs/"
cd "$RELEASEDIR/docs/"
#svn export --force "$CURRENTDIR/../../data/glest_game/docs" "$RELEASEDIR/docs/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:docs | tar x
cd "$RELEASEDIR/docs/"
#svn export --force "$CURRENTDIR/../../docs/CHANGELOG.txt" "$RELEASEDIR/docs/CHANGELOG.txt"
git archive --remote ${REPODIR} HEAD:docs/ CHANGELOG.txt | tar x
cd "$RELEASEDIR/docs/"
#svn export --force "$CURRENTDIR/../../docs/README.txt" "$RELEASEDIR/docs/README.txt"
git archive --remote ${REPODIR} HEAD:docs/ README.txt | tar x
echo "Exporting map files ..."
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/maps/"
cd "$RELEASEDIR/maps/"
#svn export --force "$CURRENTDIR/../../data/glest_game/maps" "$RELEASEDIR/maps/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:maps | tar x
echo "Exporting scenario files ..."
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/scenarios/"
cd "$RELEASEDIR/scenarios/"
#svn export --force "$CURRENTDIR/../../data/glest_game/scenarios" "$RELEASEDIR/scenarios/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:scenarios | tar x
echo "Exporting tech files ..."
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/techs/"
cd "$RELEASEDIR/techs/"
#svn export --force "$CURRENTDIR/../../data/glest_game/techs" "$RELEASEDIR/techs/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:techs | tar x
echo "Exporting tileset files ..."
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/tilesets/"
cd "$RELEASEDIR/tilesets/"
#svn export --force "$CURRENTDIR/../../data/glest_game/tilesets" "$RELEASEDIR/tilesets/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:tilesets | tar x
echo "Exporting tutorial files ..."
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/tutorials/"
cd "$RELEASEDIR/tutorials/"
# svn export --force "$CURRENTDIR/../../data/glest_game/tutorials" "$RELEASEDIR/tutorials/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:tutorials | tar x
# special export for flag images
# mkdir -p "$RELEASEDIR/data/core/misc_textures/flags/"
# svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/data/core/misc_textures/flags/"
# cd "$RELEASEDIR"
#svn export --force "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" "$RELEASEDIR/CMakeLists.txt"
# git archive --remote ${REPODIR}/data/glest_game/ HEAD: CMakeLists.txt | tar x
echo "Removing non required files ..."
cd "$CURRENTDIR"
# START
@ -127,9 +82,8 @@ rm -rf "$RELEASEDIR/data/core/fonts"
# END
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 > release/$PACKAGE
# 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION"
[[ -f "$RELEASEDIR_ROOT/$PACKAGE" ]] && rm "$RELEASEDIR_ROOT/$PACKAGE"
tar -cf - -C "$RELEASEDIR_ROOT/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz > $RELEASEDIR_ROOT/$PACKAGE
ls -la $RELEASEDIR_ROOT/$PACKAGE
ls -la release/$PACKAGE

21
mk/linux/makerelease-embedded.sh
View File

@ -9,7 +9,8 @@ VERSION=$(./mg-version.sh --version)
RELEASENAME=megaglest-source-embedded
PACKAGE="$RELEASENAME-$VERSION.tar.xz"
CURRENTDIR="$(dirname $(readlink -f $0))"
RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
RELEASEDIR_ROOT="$CURRENTDIR/../../../release/"
RELEASEDIR="$RELEASEDIR_ROOT/$RELEASENAME-$VERSION/megaglest-$VERSION"
SOURCEDIR="$CURRENTDIR/../../source/"
REPODIR="$CURRENTDIR/../../"
@ -21,39 +22,29 @@ mkdir -p "$RELEASEDIR"
mkdir -p "$RELEASEDIR/source/shared_lib/sources/libircclient/"
mkdir -p "$RELEASEDIR/source/shared_lib/include/libircclient/"
cd "$RELEASEDIR/source/shared_lib/sources/libircclient/"
#svn export --force "$SOURCEDIR/shared_lib/sources/libircclient" "$RELEASEDIR/source/shared_lib/sources/libircclient"
git archive --remote ${REPODIR} HEAD:source/shared_lib/sources/libircclient | tar x
cd "$RELEASEDIR/source/shared_lib/include/libircclient/"
#svn export --force "$SOURCEDIR/shared_lib/include/libircclient" "$RELEASEDIR/source/shared_lib/include/libircclient"
git archive --remote ${REPODIR} HEAD:source/shared_lib/include/libircclient | tar x
mkdir -p "$RELEASEDIR/source/shared_lib/sources/platform/miniupnpc/"
mkdir -p "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc/"
cd "$RELEASEDIR/source/shared_lib/sources/platform/miniupnpc/"
#svn export --force "$SOURCEDIR/shared_lib/sources/platform/miniupnpc" "$RELEASEDIR/source/shared_lib/sources/platform/miniupnpc"
git archive --remote ${REPODIR} HEAD:source/shared_lib/sources/platform/miniupnpc | tar x
cd "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc/"
#svn export --force "$SOURCEDIR/shared_lib/include/platform/miniupnpc" "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc"
git archive --remote ${REPODIR} HEAD:source/shared_lib/include/platform/miniupnpc | tar x
#mkdir -p "$RELEASEDIR/source/shared_lib/sources/streflop/"
#mkdir -p "$RELEASEDIR/source/shared_lib/include/streflop/"
#svn export --force "$SOURCEDIR/shared_lib/sources/streflop" "$RELEASEDIR/source/shared_lib/sources/streflop"
#svn export --force "$SOURCEDIR/shared_lib/include/streflop" "$RELEASEDIR/source/shared_lib/include/streflop"
mkdir -p "$RELEASEDIR/source/masterserver/flags/"
cd "$RELEASEDIR/source/masterserver/flags/"
#svn export --force "$SOURCEDIR/masterserver/flags" "$RELEASEDIR/source/masterserver/flags"
git archive --remote ${REPODIR} HEAD:source/masterserver/flags | tar x
mkdir -p "$RELEASEDIR/data/core/fonts/"
cd "$RELEASEDIR/data/core/fonts/"
#svn export --force "$SOURCEDIR/../data/glest_game/data/core/fonts" "$RELEASEDIR/data/core/fonts"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:data/core/fonts | tar x
cd "$CURRENTDIR"
echo "Creating $PACKAGE"
[[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/$RELEASENAME-$VERSION" "megaglest-$VERSION"
[[ -f "$RELEASEDIR_ROOT/$PACKAGE" ]] && rm "$RELEASEDIR_ROOT/$PACKAGE"
tar cJf "$RELEASEDIR_ROOT/$PACKAGE" -C "$RELEASEDIR_ROOT/$RELEASENAME-$VERSION" "megaglest-$VERSION"
ls -la $RELEASEDIR_ROOT/$PACKAGE
ls -la release/$PACKAGE

55
mk/linux/makerelease.sh
View File

@ -8,7 +8,8 @@ VERSION=$(./mg-version.sh --version)
RELEASENAME=megaglest-source
PACKAGE="$RELEASENAME-$VERSION.tar.xz"
CURRENTDIR="$(dirname $(readlink -f $0))"
RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
RELEASEDIR_ROOT="$CURRENTDIR/../../../release/"
RELEASEDIR="$RELEASEDIR_ROOT/$RELEASENAME-$VERSION/megaglest-$VERSION"
SOURCEDIR="$CURRENTDIR/../../source/"
REPODIR="$CURRENTDIR/../../"
@ -19,7 +20,6 @@ echo "Creating source package in: ${RELEASEDIR} git REPO is in: ${REPODIR}"
mkdir -p "$RELEASEDIR"
echo "Exporting source ..."
# svn export --force "$SOURCEDIR" "$RELEASEDIR/source"
cd "$RELEASEDIR"
mkdir source
cd source
@ -27,39 +27,22 @@ git archive --remote ${REPODIR} HEAD:source | tar x
cd "$RELEASEDIR"
echo "Exporting mk ..."
# mkdir -p "$RELEASEDIR/mk/cmake/"
# svn export --force "$CURRENTDIR/../cmake/" "$RELEASEDIR/mk/cmake/"
# mkdir -p "$RELEASEDIR/mk/macosx/"
# svn export --force "$CURRENTDIR/../macosx/" "$RELEASEDIR/mk/macosx/"
# mkdir -p "$RELEASEDIR/mk/windoze/"
# svn export --force "$CURRENTDIR/../windoze/" "$RELEASEDIR/mk/windoze/"
mkdir -p mk
cd mk
git archive --remote ${REPODIR} HEAD:mk | tar x
cd "$RELEASEDIR"
echo "Exporting docs ..."
# svn export --force "$CURRENTDIR/../../docs" $RELEASEDIR
mkdir docs
cd docs
git archive --remote ${REPODIR} HEAD:docs | tar x
cd "$RELEASEDIR"
echo "Exporting files in mk/linux ..."
# svn export --force "$CURRENTDIR/glest.ini" $RELEASEDIR/glest.ini
# svn export --force "$CURRENTDIR/glestkeys.ini" $RELEASEDIR/glestkeys.ini
# svn export --force "$CURRENTDIR/servers.ini" $RELEASEDIR/servers.ini
# svn export --force "$CURRENTDIR/glest.ico" $RELEASEDIR/glest.ico
# svn export --force "$CURRENTDIR/megaglest.bmp" $RELEASEDIR/megaglest.bmp
# svn export --force "$CURRENTDIR/megaglest.png" $RELEASEDIR/megaglest.png
# svn export --force "$CURRENTDIR/megaglest.xpm" $RELEASEDIR/megaglest.xpm
# svn export --force "$CURRENTDIR/megaglest.desktop" $RELEASEDIR/megaglest.desktop
# svn export --force "$CURRENTDIR/megaglest_editor.desktop" $RELEASEDIR/megaglest_editor.desktop
# svn export --force "$CURRENTDIR/megaglest_g3dviewer.desktop" $RELEASEDIR/megaglest_g3dviewer.desktop
git archive --remote ${REPODIR} HEAD:mk/linux/ glest.ini | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ glestkeys.ini | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ servers.ini | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ glest.ico | tar x
git archive --remote ${REPODIR} HEAD:mk/shared/ glestkeys.ini | tar x
git archive --remote ${REPODIR} HEAD:mk/shared/ servers.ini | tar x
git archive --remote ${REPODIR} HEAD:mk/shared/ glest.ico | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.bmp | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.png | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.xpm | tar x
@ -67,23 +50,10 @@ git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.desktop | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest_editor.desktop | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest_g3dviewer.desktop | tar x
# The mnpages are auto generated by the build process so no need to ship with source
# svn export --force "$CURRENTDIR/megaglest.6" $RELEASEDIR/megaglest.6
# svn export --force "$CURRENTDIR/megaglest_editor.6" $RELEASEDIR/megaglest_editor.6
# svn export --force "$CURRENTDIR/megaglest_g3dviewer.6" $RELEASEDIR/megaglest_g3dviewer.6
echo "Exporting files in data/glest_game ..."
# svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR/megaglest.ico
# svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR/g3dviewer.ico
# svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR/editor.ico
# svn export --force "$CURRENTDIR/start_megaglest" $RELEASEDIR/start_megaglest
# svn export --force "$CURRENTDIR/start_megaglest_g3dviewer" $RELEASEDIR/start_megaglest_g3dviewer
# svn export --force "$CURRENTDIR/start_megaglest_mapeditor" $RELEASEDIR/start_megaglest_mapeditor
# svn export --force "$CURRENTDIR/setupBuildDeps.sh" $RELEASEDIR/setupBuildDeps.sh
# svn export --force "$CURRENTDIR/../../CMakeLists.txt" $RELEASEDIR/CMakeLists.txt
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.ico | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ g3dviewer.ico | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ editor.ico | tar x
git archive --remote ${REPODIR} HEAD:mk/shared/ megaglest.ico | tar x
git archive --remote ${REPODIR} HEAD:mk/shared/ g3dviewer.ico | tar x
git archive --remote ${REPODIR} HEAD:mk/shared/ editor.ico | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ start_megaglest | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ start_megaglest_g3dviewer | tar x
git archive --remote ${REPODIR} HEAD:mk/linux/ start_megaglest_mapeditor | tar x
@ -99,14 +69,13 @@ rm -rf "$RELEASEDIR/source/shared_lib/sources/libircclient/"
rm -rf "$RELEASEDIR/source/shared_lib/include/libircclient/"
rm -rf "$RELEASEDIR/source/shared_lib/sources/platform/miniupnpc/"
rm -rf "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc/"
# rm -rf "$RELEASEDIR/source/shared_lib/sources/streflop/"
# rm -rf "$RELEASEDIR/source/shared_lib/include/streflop/"
rm -rf "$RELEASEDIR/source/masterserver/flags/"
# END
cd ${CURRENTDIR}
echo "Creating $PACKAGE"
[[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/$RELEASENAME-$VERSION" "megaglest-$VERSION"
[[ -f "$RELEASEDIR_ROOT/$PACKAGE" ]] && rm "$RELEASEDIR_ROOT/$PACKAGE"
tar cJf "$RELEASEDIR_ROOT/$PACKAGE" -C "$RELEASEDIR_ROOT/$RELEASENAME-$VERSION" "megaglest-$VERSION"
ls -la $RELEASEDIR_ROOT/$PACKAGE
ls -la release/$PACKAGE

23
mk/linux/mojosetup/megaglest-installer/make.sh
View File

@ -29,6 +29,7 @@ REPODIR="$CURRENTDIR/../../../../"
megaglest_project_root=../../../../
megaglest_data_path=${megaglest_project_root}${megaglest_release_folder}/data/glest_game/
megaglest_linux_path=${megaglest_project_root}${megaglest_release_folder}/mk/linux/
megaglest_shared_path=${megaglest_project_root}${megaglest_release_folder}/mk/shared/
megaglest_linux_masterserverpath=${megaglest_project_root}${megaglest_release_folder}/source/masterserver/
megaglest_linux_toolspath=${megaglest_project_root}${megaglest_release_folder}/source/tools/
@ -183,20 +184,17 @@ if [ $REPACKONLY -eq 0 ]; then
cp "$CURRENTDIR/$megaglest_linux_path/megaglest" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_linux_path/glest.ini" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/megaglest.bmp" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/glestkeys.ini" $INSTALLDATADIR
# cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_configurator" $INSTALLDATADIR
# cp "$CURRENTDIR/$megaglest_linux_path/megaglest_configurator" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_shared_path/glestkeys.ini" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_mapeditor" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/megaglest_editor" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_g3dviewer" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/megaglest_g3dviewer" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_linux_path/servers.ini" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_shared_path/servers.ini" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/makedeps_folder.sh" $INSTALL_ROOTDIR
# Now copy all blender related files
echo Copying blender modelling MegaGlest files...
#svn export --force "$CURRENTDIR/${megaglest_linux_toolspath}/glexemel/" "${INSTALLDATADIR}blender/"
mkdir -p "${INSTALLDATADIR}blender/"
cd "${INSTALLDATADIR}blender/"
git archive --remote ${REPODIR} HEAD:source/tools/glexemel | tar x
@ -206,51 +204,43 @@ if [ $REPACKONLY -eq 0 ]; then
# Now copy all glest data
echo Copying live MegaGlest data files...
cp "$CURRENTDIR/$megaglest_linux_path/megaglest.ico" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_shared_path/megaglest.ico" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/megaglest-uninstall.ico" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/g3dviewer.ico" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_linux_path/editor.ico" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_shared_path/g3dviewer.ico" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_shared_path/editor.ico" ${INSTALLDATADIR}
mkdir -p "$INSTALLDATADIR/data/"
# svn export --force "$CURRENTDIR/$megaglest_data_path/data/" "$INSTALLDATADIR/data/"
cd "${INSTALLDATADIR}/data/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:data | tar x
cd "$CURRENTDIR"
mkdir -p "$INSTALLDATADIR/docs/"
# svn export --force "$CURRENTDIR/$megaglest_data_path/docs/" "$INSTALLDATADIR/docs/"
# svn export --force "${megaglest_project_root}${megaglest_release_folder}/docs/" "$INSTALLDATADIR/docs/"
cd "${INSTALLDATADIR}/docs/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:docs | tar x
git archive --remote ${REPODIR} HEAD:docs | tar x
cd "$CURRENTDIR"
mkdir -p "$INSTALLDATADIR/maps/"
# svn export --force "$CURRENTDIR/$megaglest_data_path/maps/" "$INSTALLDATADIR/maps/"
cd "${INSTALLDATADIR}/maps/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:maps | tar x
cd "$CURRENTDIR"
mkdir -p "$INSTALLDATADIR/scenarios/"
# svn export --force "$CURRENTDIR/$megaglest_data_path/scenarios/" "$INSTALLDATADIR/scenarios/"
cd "${INSTALLDATADIR}/scenarios/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:scenarios | tar x
cd "$CURRENTDIR"
mkdir -p "$INSTALLDATADIR/techs/"
# svn export --force "$CURRENTDIR/$megaglest_data_path/techs/" "$INSTALLDATADIR/techs/"
cd "${INSTALLDATADIR}/techs/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:techs | tar x
cd "$CURRENTDIR"
mkdir -p "$INSTALLDATADIR/tilesets/"
# svn export --force "$CURRENTDIR/$megaglest_data_path/tilesets/" "$INSTALLDATADIR/tilesets/"
cd "${INSTALLDATADIR}/tilesets/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:tilesets | tar x
cd "$CURRENTDIR"
mkdir -p "$INSTALLDATADIR/tutorials/"
# svn export --force "$CURRENTDIR/$megaglest_data_path/tutorials/" "$INSTALLDATADIR/tutorials/"
cd "${INSTALLDATADIR}/tutorials/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:tutorials | tar x
cd "$CURRENTDIR"
@ -259,7 +249,6 @@ if [ $REPACKONLY -eq 0 ]; then
echo Copying live MegaGlest country logo files...
mkdir -p "${INSTALLDATADIR}/data/core/misc_textures/flags/"
# svn export --force "$CURRENTDIR/$megaglest_linux_masterserverpath/flags/" "${INSTALLDATADIR}data/core/misc_textures/flags/"
cd "${INSTALLDATADIR}/data/core/misc_textures/flags/"
git archive --remote ${REPODIR} HEAD:source/masterserver/flags | tar x
cd "$CURRENTDIR"

2
mk/windoze/CopySharedBinarySetup.bat
View File

@ -1,5 +1,5 @@
@echo off
copy ..\shared\*.* ..\..\data\glest_game\
copy glest.ini ..\..\data\glest_game\
if not "%1" == "nopause" pause

14
mk/windoze/Installer/MegaGlestInstaller.nsi
View File

@ -10,10 +10,10 @@ Name "${APNAME} ${APVER}"
SetCompressor /FINAL /SOLID lzma
SetCompressorDictSize 64
OutFile "${APNAME}-Installer-${APVER}_i386_win32.exe"
Icon "..\megaglest.ico"
UninstallIcon "..\megaglest.ico"
!define MUI_ICON "..\megaglest.ico"
!define MUI_UNICON "..\megaglest.ico"
Icon "..\..\shared\megaglest.ico"
UninstallIcon "..\..\shared\megaglest.ico"
!define MUI_ICON "..\..\shared\megaglest.ico"
!define MUI_UNICON "..\..\shared\megaglest.ico"
InstallDir "$PROGRAMFILES\${APNAME}"
ShowInstDetails show
BGGradient 0xDF9437 0xffffff
@ -216,10 +216,10 @@ Section "${APNAME} (required)"
File "..\..\..\data\glest_game\megaglest_g3dviewer.exe"
File "..\..\..\data\glest_game\7z.exe"
File "..\..\..\data\glest_game\7z.dll"
File "..\..\..\mk\windoze\megaglest.ico"
File "..\..\..\mk\shared\megaglest.ico"
File "..\..\..\mk\windoze\glest.ini"
File "..\..\..\mk\windoze\glestkeys.ini"
File "..\..\..\mk\windoze\servers.ini"
File "..\..\..\mk\shared\glestkeys.ini"
File "..\..\..\mk\shared\servers.ini"
File "..\..\..\data\glest_game\openal32.dll"
File "..\..\..\mk\windoze\NetworkThrottleFix.reg"

1
mk/windoze/build-mg-2010.bat
View File

@ -37,6 +37,7 @@ goto processBuildStageA
:processBuildStageA
call CopyWindowsRuntimeDlls_2010.bat nopause
call CopySharedBinarySetup.bat nopause
rem setup the Visual Studio 2010 environment
ECHO --------------------------------

1
mk/windoze/build-mg-2012.bat
View File

@ -44,6 +44,7 @@ goto processBuildStageA
:processBuildStageA
call CopyWindowsRuntimeDlls_2012.bat nopause
call CopySharedBinarySetup.bat nopause
rem setup the Visual Studio 2010 environment
ECHO --------------------------------

2
mk/windoze/g3d_viewer.rc
View File

@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "megaglest_g3dviewer.ico"
IDI_ICON1 ICON DISCARDABLE "..\shared\g3dviewer.ico"

2
mk/windoze/glest.rc
View File

@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "megaglest.ico"
IDI_ICON1 ICON DISCARDABLE "..\shared\megaglest.ico"

2
mk/windoze/glest_editor.rc
View File

@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "megaglest_editor.ico"
IDI_ICON1 ICON DISCARDABLE "..\shared\editor.ico"

4
mk/windoze/make-binary-archive.bat
View File

@ -62,8 +62,8 @@ set custom_sevenZ_params=
if not "%SEVENZ_MG_COMPRESS_PARAMS%." == "." set custom_sevenZ_params=%SEVENZ_MG_COMPRESS_PARAMS%
echo custom_sevenZ_params [%custom_sevenZ_params%] ...
if "%mg_arch%" == "%mg_WIN32_ARCH%" 7z a -mmt -mx=9 %custom_sevenZ_params% -ms=on -mhc=on "%PACKAGE%" megaglest.exe megaglest_g3dviewer.exe megaglest_editor.exe libvlc.dll libvlccore.dll lua plugins 7z.exe 7z.dll xml2g.exe openal32.dll g2xml.exe glest.ini glestkeys.ini servers.ini
if "%mg_arch%" == "%mg_WIN64_ARCH%" 7z a -mmt -mx=9 %custom_sevenZ_params% -ms=on -mhc=on "%PACKAGE%" megaglest.exe megaglest_g3dviewer.exe megaglest_editor.exe 7z.exe 7z.dll xml2g.exe openal64.dll g2xml.exe glest.ini glestkeys.ini servers.ini
if "%mg_arch%" == "%mg_WIN32_ARCH%" 7z a -mmt -mx=9 %custom_sevenZ_params% -ms=on -mhc=on "%PACKAGE%" megaglest.exe megaglest_g3dviewer.exe megaglest_editor.exe libvlc.dll libvlccore.dll lua plugins 7z.exe 7z.dll xml2g.exe openal32.dll g2xml.exe glest.ini ..\shared\glestkeys.ini ..\shared\servers.ini
if "%mg_arch%" == "%mg_WIN64_ARCH%" 7z a -mmt -mx=9 %custom_sevenZ_params% -ms=on -mhc=on "%PACKAGE%" megaglest.exe megaglest_g3dviewer.exe megaglest_editor.exe 7z.exe 7z.dll xml2g.exe openal64.dll g2xml.exe glest.ini ..\shared\glestkeys.ini ..\shared\servers.ini
dir "%PACKAGE%"
cd /d "%~dp0"

11
mk/windoze/make-data-archive.bat
View File

@ -46,7 +46,6 @@ rem copy data
echo Copying data ...
mkdir %RELEASEDIR%\data\
cd /d %RELEASEDIR%\data\
rem svn export --force ..\..\data\glest_game\data %RELEASEDIR%\data\
echo GIT ARCHIVE data ...
git archive --remote %REPODIR%\data\glest_game\ HEAD:data | tar -x
cd /d "%~dp0"
@ -54,20 +53,17 @@ rem pause
mkdir %RELEASEDIR%\docs\
cd /d %RELEASEDIR%\docs\
rem svn export --force ..\..\data\glest_game\docs %RELEASEDIR%\docs\
echo GIT ARCHIVE docs ...
git archive --remote %REPODIR%/data/glest_game/ HEAD:docs | tar -x
cd /d "%~dp0"
cd /d %RELEASEDIR%\docs\
rem svn export --force ..\..\data\glest_game\docs\CHANGELOG.txt %RELEASEDIR%\docs\CHANGELOG.txt
echo GIT ARCHIVE CHANGELOG.txt ...
git archive --remote %REPODIR% HEAD:docs/ CHANGELOG.txt | tar -x
cd /d "%~dp0"
rem pause
cd /d %RELEASEDIR%\docs\
rem svn export --force ..\..\data\glest_game\docs\README.txt %RELEASEDIR%\docs\README.txt
echo GIT ARCHIVE README.txt ...
git archive --remote %REPODIR% HEAD:docs/ README.txt | tar -x
cd /d "%~dp0"
@ -75,35 +71,30 @@ rem pause
mkdir %RELEASEDIR%\maps\
cd /d %RELEASEDIR%\maps\
rem svn export --force ..\..\data\glest_game\maps %RELEASEDIR%\maps\
echo GIT ARCHIVE maps ...
git archive --remote %REPODIR%/data/glest_game/ HEAD:maps | tar -x
cd /d "%~dp0"
mkdir %RELEASEDIR%\scenarios\
cd /d %RELEASEDIR%\scenarios\
rem svn export --force ..\..\data\glest_game\scenarios %RELEASEDIR%\scenarios\
echo GIT ARCHIVE scenarios ...
git archive --remote %REPODIR%/data/glest_game/ HEAD:scenarios | tar -x
cd /d "%~dp0"
mkdir %RELEASEDIR%\techs\
cd /d %RELEASEDIR%\techs\
rem svn export --force ..\..\data\glest_game\techs %RELEASEDIR%\techs\
echo GIT ARCHIVE techs ...
git archive --remote %REPODIR%/data/glest_game/ HEAD:techs | tar -x
cd /d "%~dp0"
mkdir %RELEASEDIR%\tilesets\
cd /d %RELEASEDIR%\tilesets\
rem svn export --force ..\..\data\glest_game\tilesets %RELEASEDIR%\tilesets\
echo GIT ARCHIVE tilesets ...
git archive --remote %REPODIR%/data/glest_game/ HEAD:tilesets | tar -x
cd /d "%~dp0"
mkdir %RELEASEDIR%\tutorials\
cd /d %RELEASEDIR%\tutorials\
rem svn export --force ..\..\data\glest_game\tutorials %RELEASEDIR%\tutorials\
echo GIT ARCHIVE tutorials ...
git archive --remote %REPODIR%/data/glest_game/ HEAD:tutorials | tar -x
cd /d "%~dp0"
@ -111,7 +102,6 @@ cd /d "%~dp0"
rem special export for flag images
mkdir %RELEASEDIR%\data\core\misc_textures\flags\
cd /d %RELEASEDIR%\data\core\misc_textures\flags\
rem svn export --force ..\..\source\masterserver\flags %RELEASEDIR%\data\core\misc_textures\flags\
echo GIT ARCHIVE flags ...
git archive --remote %REPODIR% HEAD:source/masterserver/flags | tar -x
cd /d "%~dp0"
@ -139,3 +129,4 @@ cd /d "%~dp0"
rem pause execution so we can see the output before the batch file exits
if not "%1" == "nopause" pause

5
source/g3d_viewer/CMakeLists.txt
View File

@ -194,14 +194,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
# Installation of the program config and image files
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/g3dviewer.ico"
"${PROJECT_SOURCE_DIR}/mk/shared/g3dviewer.ico"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop file
SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/mk/linux/megaglest_g3dviewer.desktop)
IF(NOT EXISTS ${MG_DESKTOP_FILE})
SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/megaglest_g3dviewer.desktop)
ENDIF()
INSTALL(FILES
"${MG_DESKTOP_FILE}"

51
source/glest_game/CMakeLists.txt
View File

@ -300,12 +300,12 @@ IF(BUILD_MEGAGLEST)
IF(WIN32)
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/windoze/glest.ini"
"${PROJECT_SOURCE_DIR}/mk/windoze/glestkeys.ini"
"${PROJECT_SOURCE_DIR}/mk/shared/glestkeys.ini"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
ELSE()
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
"${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
"${PROJECT_SOURCE_DIR}/mk/shared/glestkeys.ini"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
ENDIF()
@ -314,40 +314,21 @@ IF(BUILD_MEGAGLEST)
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
OPTIONAL REGEX "/.git" EXCLUDE)
# Check if we are running from an GIT folder structure or tarballs
#IF(EXISTS "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop")
MESSAGE(STATUS "**Source package detected git folder structure.")
MESSAGE(STATUS "**Source package detected git folder structure.")
# Installation of the program desktop file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop"
DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
# Installation of the program desktop file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop"
DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
# Installation of the program desktop icon file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
"${PROJECT_SOURCE_DIR}/mk/linux/editor.ico"
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
"${PROJECT_SOURCE_DIR}/mk/linux/g3dviewer.ico"
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
#ELSE()
# Installation of the program desktop file
# INSTALL(FILES
# "${PROJECT_SOURCE_DIR}/megaglest.desktop"
# DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
# Installation of the program desktop icon file
# INSTALL(FILES
# "${PROJECT_SOURCE_DIR}/megaglest.png"
# "${PROJECT_SOURCE_DIR}/megaglest.xpm"
# "${PROJECT_SOURCE_DIR}/megaglest.bmp"
# "${PROJECT_SOURCE_DIR}/editor.ico"
# "${PROJECT_SOURCE_DIR}/glest.ico"
# "${PROJECT_SOURCE_DIR}/g3dviewer.ico"
# DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
#ENDIF()
# Installation of the program desktop icon file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
"${PROJECT_SOURCE_DIR}/mk/shared/editor.ico"
"${PROJECT_SOURCE_DIR}/mk/shared/glest.ico"
"${PROJECT_SOURCE_DIR}/mk/shared/g3dviewer.ico"
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
ENDIF()
ENDIF()

2
source/glest_game/facilities/game_util.cpp
View File

@ -27,7 +27,7 @@ using namespace Shared::Platform;
namespace Glest { namespace Game {
const char *mailString = " http://bugs.megaglest.org";
const string glestVersionString = "v3.9.1";
const string glestVersionString = "v3.9.3-dev";
#if defined(GITVERSION)
const string GIT_RawRev = string(GITVERSION);
const string GIT_Rev = string("Rev: ") + string(GITVERSION);

5
source/glest_map_editor/CMakeLists.txt
View File

@ -190,14 +190,11 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
# Installation of the program config and image files
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/editor.ico"
"${PROJECT_SOURCE_DIR}/mk/shared/editor.ico"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop file
SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/mk/linux/megaglest_editor.desktop)
IF(NOT EXISTS ${MG_DESKTOP_FILE})
SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/megaglest_editor.desktop)
ENDIF()
INSTALL(FILES
"${MG_DESKTOP_FILE}"