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

All paths to flags probably are fixed now. & Removed 2 old scripts related with svn.

This commit is contained in:
filux 2014-03-27 20:26:01 +01:00
parent fdd5eb52fe
commit 4a3875c114
9 changed files with 9 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mk/linux/formatTextFiles.sh
View File

@ -1,20 +0,0 @@
#!/bin/sh
# Use this script formats all text files to use consistent line endings
# ----------------------------------------------------------------------------
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
echo 'Requires tools from: sudo apt-get install tofrodos'
cd ../../
find -name "*\.cpp" -exec fromdos -d {} \;
find -name "*\.c" -exec fromdos -d {} \;
find -name "*\.h" -exec fromdos -d {} \;
find -name "*\.txt" -exec fromdos -d {} \;
find -name "*\.lng" -exec fromdos -d {} \;
find -name "*\.xml" -exec fromdos -d {} \;
find -name "*\.ini" -exec fromdos -d {} \;
find -name "*\.sh" -exec fromdos -d {} \;
find -name "*\.php" -exec fromdos -d {} \;
find -name "*\.sql" -exec fromdos -d {} \;
find -name "*\.pl" -exec fromdos -d {} \;

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

@ -64,7 +64,7 @@ git archive --remote ${REPODIR}/data/glest_game/ HEAD:tutorials | tar x
cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/data/core/misc_textures/flags/"
cd "$RELEASEDIR/data/core/misc_textures/flags/"
git archive --remote ${REPODIR} HEAD:source/masterserver/flags | tar x
git archive --remote ${REPODIR}/data/glest_game/data/core/misc_textures HEAD:flags | tar x
cd "$CURRENTDIR"
echo "creating data archive: $PACKAGE"

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

@ -35,7 +35,7 @@ git archive --remote ${REPODIR} HEAD:source/shared_lib/include/platform/miniupnp
mkdir -p "$RELEASEDIR/source/masterserver/flags/"
cd "$RELEASEDIR/source/masterserver/flags/"
git archive --remote ${REPODIR} HEAD:source/masterserver/flags | tar x
git archive --remote ${REPODIR}/data/glest_game/data/core/misc_textures HEAD:flags | tar x
mkdir -p "$RELEASEDIR/data/core/fonts/"
cd "$RELEASEDIR/data/core/fonts/"

2
mk/linux/makerelease.sh
View File

@ -69,7 +69,7 @@ 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/masterserver/flags/"
#rm -rf "$RELEASEDIR/source/masterserver/flags/"
# END
cd ${CURRENTDIR}

45
mk/linux/mg_setsvnprops.sh
View File

@ -1,45 +0,0 @@
#! /bin/sh
# Use this script to set data files svn properties quickly
# ----------------------------------------------------------------------------
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2013 Mark Vejvoda under GNU GPL v3.0+
CURRENTDIR="$(dirname $(readlink -f $0))"
# cpp /.c / .h files
find ${CURRENTDIR}/../../source/ -iname '*.cpp' -exec svn propset svn:mime-type text/plain '{}' \;
find ${CURRENTDIR}/../../source/ -iname '*.cpp' -exec svn propset svn:eol-style native '{}' \;
find ${CURRENTDIR}/../../source/ -iname '*.c' -exec svn propset svn:mime-type text/plain '{}' \;
find ${CURRENTDIR}/../../source/ -iname '*.c' -exec svn propset svn:eol-style native '{}' \;
find ${CURRENTDIR}/../../source/ -iname '*.h' -exec svn propset svn:mime-type text/plain '{}' \;
find ${CURRENTDIR}/../../source/ -iname '*.h' -exec svn propset svn:eol-style native '{}' \;
# LNG files
#find ${CURRENTDIR}/../../data/glest_game/ -name "*\.lng" -exec echo {} \;
find ${CURRENTDIR}/../../data/glest_game/ -iname '*.lng' -exec svn propset svn:mime-type text/plain '{}' \;
find ${CURRENTDIR}/../../data/glest_game/ -iname '*.lng' -exec svn propset svn:eol-style native '{}' \;
# XML files
find ${CURRENTDIR}/../../data/glest_game/ -iname '*.xml' -exec svn propset svn:mime-type application/xml '{}' \;
#find ${CURRENTDIR}/../../data/glest_game/ -iname '*.xml' -exec svn propset svn:eol-style native '{}' \;
# shell scripts
find ${CURRENTDIR}/ -iname '*.sh' -exec svn propset svn:mime-type text/plain '{}' \;
find ${CURRENTDIR}/ -iname '*.sh' -exec svn propset svn:eol-style native '{}' \;
# php scripts
find ${CURRENTDIR}/../../source/masterserver -iname '*.php' -exec svn propset svn:mime-type text/plain '{}' \;
find ${CURRENTDIR}/../../source/masterserver -iname '*.php' -exec svn propset svn:eol-style native '{}' \;
# sql scripts
find ${CURRENTDIR}/../../source/masterserver -iname '*.sql' -exec svn propset svn:mime-type text/plain '{}' \;
find ${CURRENTDIR}/../../source/masterserver -iname '*.sql' -exec svn propset svn:eol-style native '{}' \;
# javascript scripts
find ${CURRENTDIR}/../../source/masterserver -iname '*.js' -exec svn propset svn:mime-type text/plain '{}' \;
find ${CURRENTDIR}/../../source/masterserver -iname '*.js' -exec svn propset svn:eol-style native '{}' \;
# css scripts
find ${CURRENTDIR}/../../source/masterserver -iname '*.css' -exec svn propset svn:mime-type text/plain '{}' \;
find ${CURRENTDIR}/../../source/masterserver -iname '*.css' -exec svn propset svn:eol-style native '{}' \;

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

@ -250,7 +250,7 @@ if [ $REPACKONLY -eq 0 ]; then
mkdir -p "${INSTALLDATADIR}/data/core/misc_textures/flags/"
cd "${INSTALLDATADIR}/data/core/misc_textures/flags/"
git archive --remote ${REPODIR} HEAD:source/masterserver/flags | tar x
git archive --remote ${REPODIR}/data/glest_game/data/core/misc_textures HEAD:flags | tar x
cd "$CURRENTDIR"

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

@ -247,7 +247,7 @@ Section "${APNAME} (required)"
File /r /x .svn /x mydata "..\..\..\docs\*.*"
SetOutPath "$INSTDIR\data\core\misc_textures\flags"
File /r /x .svn /x mydata "..\..\..\source\masterserver\flags\*.*"
File /r /x .svn /x mydata "..\..\..\data\glest_game\data\core\misc_textures\flags\*.*"
SetOutPath $INSTDIR
; Write the installation path into the registry

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

@ -103,7 +103,7 @@ rem special export for flag images
mkdir %RELEASEDIR%\data\core\misc_textures\flags\
cd /d %RELEASEDIR%\data\core\misc_textures\flags\
echo GIT ARCHIVE flags ...
git archive --remote %REPODIR% HEAD:source/masterserver/flags | tar -x
git archive --remote %REPODIR%/data/glest_game/data/core/misc_textures HEAD:flags | tar -x
cd /d "%~dp0"

6
source/glest_game/CMakeLists.txt
View File

@ -313,9 +313,9 @@ IF(BUILD_MEGAGLEST)
ENDIF()
# Installation of data files from outside normal data folder
INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/source/masterserver/flags"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
OPTIONAL REGEX "/.git" EXCLUDE)
#INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/source/masterserver/flags"
# DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
# OPTIONAL REGEX "/.git" EXCLUDE)
MESSAGE(STATUS "**Source package detected git folder structure.")