aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-25 16:26:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move some files and disable on client file kh_shard & .ref

Browse source
This commit is contained in:
Jerome Sagnole 2017-08-29 23:08:14 +02:00
parent 17c3e4513c
commit 9e9a730b4b
11 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
dist/docker/builder/squish-limit.patch → dist/docker/builder/common/squish-limit.patch vendored
View file

2
dist/docker/builder/debian/jessie/i686/Dockerfile vendored
View file

@ -42,7 +42,7 @@ RUN apt-get install -y wget
RUN mkdir -p /opt/src RUN mkdir -p /opt/src
RUN cd /opt/src; wget -c https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libsquish/squish-1.11.zip RUN cd /opt/src; wget -c https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libsquish/squish-1.11.zip
RUN cd /opt/src; unzip squish-1.11.zip RUN cd /opt/src; unzip squish-1.11.zip
COPY dist/docker/builder/squish-limit.patch /opt/squish-limit.patch COPY dist/docker/builder/common/squish-limit.patch /opt/squish-limit.patch
RUN cd /opt/src/squish-1.11; patch -i /opt/squish-limit.patch RUN cd /opt/src/squish-1.11; patch -i /opt/squish-limit.patch
RUN cd /opt/src/squish-1.11; make RUN cd /opt/src/squish-1.11; make
RUN cd /opt/src/squish-1.11; make install RUN cd /opt/src/squish-1.11; make install

6
dist/docker/builder/debian/jessie/i686/build.sh vendored
View file

@ -17,8 +17,8 @@ declare DOCKEROPTS=""
declare DIRBUILD="" declare DIRBUILD=""
declare CLEANDOCKER=0 declare CLEANDOCKER=0
declare IMAGEDOCKER="builder_khanat_jessie_i686" declare IMAGEDOCKER="builder_khanat_debian_jessie_i686"
declare LOCALBUILDDIR="build_linux32" declare LOCALBUILDDIR="build/$IMAGEDOCKER"
declare LOCALSRC="debian/jessie/i686" declare LOCALSRC="debian/jessie/i686"
@ -211,7 +211,7 @@ then
-v $rootdir/code:/opt/code \ -v $rootdir/code:/opt/code \
${DOCKEROPTS} \ ${DOCKEROPTS} \
${IMAGEDOCKER} \ ${IMAGEDOCKER} \
/opt/dist/docker/builder/${LOCALSRC}/build-under-docker.sh "/opt/code/${LOCALBUILDDIR}/" || exit 2 /opt/dist/docker/builder/${LOCALSRC}/build-under-docker.sh "/opt/code/${LOCALBUILDDIR}" || exit 2
fi fi
if [[ $CLEANDOCKER -ne 0 ]] if [[ $CLEANDOCKER -ne 0 ]]

2
dist/docker/builder/debian/jessie/x86_64/Dockerfile vendored
View file

@ -42,7 +42,7 @@ RUN cd /opt/src/cpptest && ./autogen.sh && ./configure && make && make install
RUN mkdir -p /opt/src RUN mkdir -p /opt/src
RUN cd /opt/src; wget -c https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libsquish/squish-1.11.zip RUN cd /opt/src; wget -c https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libsquish/squish-1.11.zip
RUN cd /opt/src; unzip squish-1.11.zip RUN cd /opt/src; unzip squish-1.11.zip
COPY dist/docker/builder/squish-limit.patch /opt/squish-limit.patch COPY dist/docker/builder/common/squish-limit.patch /opt/squish-limit.patch
RUN cd /opt/src/squish-1.11; patch -i /opt/squish-limit.patch RUN cd /opt/src/squish-1.11; patch -i /opt/squish-limit.patch
RUN cd /opt/src/squish-1.11; make RUN cd /opt/src/squish-1.11; make
RUN cd /opt/src/squish-1.11; make install RUN cd /opt/src/squish-1.11; make install

2
dist/docker/builder/debian/jessie/x86_64/build-under-docker.sh vendored
View file

@ -30,7 +30,7 @@ fi
echo "$(date "+%Y/%m/%d %H:%M:%S") BUILD START" >> $LOGFILE echo "$(date "+%Y/%m/%d %H:%M:%S") BUILD START" >> $LOGFILE
cd ${DIRBUILD}; cmake -DWITH_NEL=ON -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON ${CMAKEOPTS} .. 1>>$LOGFILE 2>&1 || exit 2 cd ${DIRBUILD}; cmake -DWITH_NEL=ON -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON ${CMAKEOPTS} ../.. 1>>$LOGFILE 2>&1 || exit 2
cd ${DIRBUILD}; make $MAKEOPTS 1>>$LOGFILE 2>&1 || exit 2 cd ${DIRBUILD}; make $MAKEOPTS 1>>$LOGFILE 2>&1 || exit 2

6
dist/docker/builder/debian/jessie/x86_64/build.sh vendored
View file

@ -17,8 +17,8 @@ declare DOCKEROPTS=""
declare DIRBUILD="" declare DIRBUILD=""
declare CLEANDOCKER=0 declare CLEANDOCKER=0
declare IMAGEDOCKER="builder_khanat_jessie_x86_64" declare IMAGEDOCKER="builder_khanat_debian_jessie_x86_64"
declare LOCALBUILDDIR="build_linux64" declare LOCALBUILDDIR="build/$IMAGEDOCKER"
declare LOCALSRC="debian/jessie/x86_64" declare LOCALSRC="debian/jessie/x86_64"
@ -217,7 +217,7 @@ then
-v $rootdir/code:/opt/code \ -v $rootdir/code:/opt/code \
${DOCKEROPTS} \ ${DOCKEROPTS} \
${IMAGEDOCKER} \ ${IMAGEDOCKER} \
/opt/dist/docker/builder/${LOCALSRC}/build-under-docker.sh "/opt/code/${LOCALBUILDDIR}/" || exit 2 /opt/dist/docker/builder/${LOCALSRC}/build-under-docker.sh "/opt/code/${LOCALBUILDDIR}" || exit 2
fi fi
if [[ $CLEANDOCKER -ne 0 ]] if [[ $CLEANDOCKER -ne 0 ]]

0
dist/docker/server/debian/init-basic.sh → dist/docker/server/debian/common/init-basic.sh vendored
View file

25
dist/docker/server/debian/init-khanat.sh → dist/docker/server/debian/common/init-khanat.sh vendored
View file

@ -384,10 +384,10 @@ do
cd $dir/..; bnp_make -p $(basename $dir) || exit 2 cd $dir/..; bnp_make -p $(basename $dir) || exit 2
done done
for dir in $PATCH_HOME/patch_service/dataserver/data/kh_shard/* #for dir in $PATCH_HOME/patch_service/dataserver/data/kh_shard/*
do #do
cd $dir/..; bnp_make -p $(basename $dir) || exit 2 # cd $dir/..; bnp_make -p $(basename $dir) || exit 2
done #done
for dir in $PATCH_HOME/patch_service/dataserver/data/ryz/* for dir in $PATCH_HOME/patch_service/dataserver/data/ryz/*
do do
@ -420,10 +420,10 @@ do
mv "$file" $PATCH_CLIENT_SYSTEM/patch_game/bnp/ || exit 2 mv "$file" $PATCH_CLIENT_SYSTEM/patch_game/bnp/ || exit 2
done done
for file in $PATCH_HOME/patch_service/dataserver/data/kh_shard/*.bnp #for file in $PATCH_HOME/patch_service/dataserver/data/kh_shard/*.bnp
do #do
mv "$file" $PATCH_CLIENT_SYSTEM/patch_game/bnp/ || exit 2 # mv "$file" $PATCH_CLIENT_SYSTEM/patch_game/bnp/ || exit 2
done #done
for file in $PATCH_HOME/patch_service/dataserver/data/ryz/*.bnp for file in $PATCH_HOME/patch_service/dataserver/data/ryz/*.bnp
do do
@ -449,11 +449,10 @@ sed -i -r 's/_NextVersionFile type="STRING" value=""/_NextVersionFile type="STRI
# search all ref files # search all ref files
ADDREF="" ADDREF=""
for file in /home/gameserver/patch_service/patch_game/bnp/*.ref #for file in /home/gameserver/patch_service/patch_game/bnp/*.ref
do #do
ADDREF="$ADDREF"'<_Files type=\"STRING\" value=\"'$(basename $file)'\"/>' # ADDREF="$ADDREF"'<_Files type=\"STRING\" value=\"'$(basename $file)'\"/>'
done #done
#echo $ADDREF
# Remove other _Category (keep 1st) and add ref file # Remove other _Category (keep 1st) and add ref file
cp patch_game/ryzom.xml patch_game/ryzom.xml.ref || exit 2 cp patch_game/ryzom.xml patch_game/ryzom.xml.ref || exit 2

9
dist/docker/server/debian/jessie/x86_64/Dockerfile vendored
View file

@ -23,16 +23,9 @@ RUN useradd -G sudo,www-data -c /home -d /home/gameserver -c "Khanat account GAM
RUN useradd -G sudo,www-data -c /home -d /home/compil -c "Khanat account" -m -p '$6$nxHX/3u.$azS0.eldpfKqxqOLDjgZj8.hPOLC64arXDTUVX0fs7RZvRBX/pNqPzDR89ccP5XkEE/daOyaD3wVtDGDUND5b/' -s /bin/bash -U compil RUN useradd -G sudo,www-data -c /home -d /home/compil -c "Khanat account" -m -p '$6$nxHX/3u.$azS0.eldpfKqxqOLDjgZj8.hPOLC64arXDTUVX0fs7RZvRBX/pNqPzDR89ccP5XkEE/daOyaD3wVtDGDUND5b/' -s /bin/bash -U compil
COPY dist/docker/server/debian/common/init-basic.sh /opt/
COPY dist/docker/server/debian/init-basic.sh /opt/
#COPY code/build_linux64/ryzomcore*.tar.gz /opt/.
#COPY code/build_linux64/ryzom-ressources.tar.gz /opt/.
#COPY khanat-ressources.tar.gz /opt/
#COPY dist/docker/server/debian/init-khanat.sh /opt/
RUN /opt/init-basic.sh RUN /opt/init-basic.sh
#RUN /opt/init-khanat.sh

2
dist/docker/server/debian/jessie/x86_64/Dockerfile.khanat vendored
View file

@ -12,7 +12,7 @@ MAINTAINER AleaJactaEst
ENV HOSTNAME khanat_server ENV HOSTNAME khanat_server
COPY todelete.sh /opt/khanat_config.sh COPY todelete.sh /opt/khanat_config.sh
COPY dist/docker/server/debian/init-khanat.sh /opt/ COPY dist/docker/server/debian/common/init-khanat.sh /opt/
COPY ryzomcore.tar.gz /opt/ COPY ryzomcore.tar.gz /opt/
COPY ryzom-ressources.tar.gz /opt/ COPY ryzom-ressources.tar.gz /opt/
COPY khanat-ressources.tar.gz /opt/ COPY khanat-ressources.tar.gz /opt/

10
dist/docker/server/debian/jessie/x86_64/server.sh vendored
View file

@ -23,7 +23,7 @@ declare -i KHANAT_CLIENT_VERSION=1
declare IMAGEGENERICSERVER="server_generic_debian_jessie_x86_64" declare IMAGEGENERICSERVER="server_generic_debian_jessie_x86_64"
declare IMAGEKHANATSERVER="server_khanat_debian_jessie_x86_64" declare IMAGEKHANATSERVER="server_khanat_debian_jessie_x86_64"
declare LOCALBUILDDIR="build_linux64" declare LOCALBUILDDIR="build/builder_khanat_debian_jessie_x86_64"
usage() usage()
{ {
@ -82,6 +82,8 @@ function msg_error()
# MAIN # MAIN
# #
msg_info "START"
calldir="$(dirname $0)" calldir="$(dirname $0)"
basedir=$(cd $calldir; pwd) basedir=$(cd $calldir; pwd)
rootdir="$(dirname $(dirname $(dirname $(dirname $(dirname $(dirname ${basedir}))))))" rootdir="$(dirname $(dirname $(dirname $(dirname $(dirname $(dirname ${basedir}))))))"
@ -214,8 +216,14 @@ then
KHANATSERVER=1 KHANATSERVER=1
fi fi
if [[ -f ${rootdir}/ryzomcore.tar.gz ]]
then
sumsrc=$(md5sum ${rootdir}/code/${LOCALBUILDDIR}/ryzomcore-0.12.0..tar.gz | awk '{print $1}') sumsrc=$(md5sum ${rootdir}/code/${LOCALBUILDDIR}/ryzomcore-0.12.0..tar.gz | awk '{print $1}')
sumdst=$(md5sum ${rootdir}/ryzomcore.tar.gz | awk '{print $1}') sumdst=$(md5sum ${rootdir}/ryzomcore.tar.gz | awk '{print $1}')
else
sumsrc=1
sumdsr=2
fi
msg_debug "ryzomcore checksum src:$sumsrc dst:$sumdst" msg_debug "ryzomcore checksum src:$sumsrc dst:$sumdst"
if [[ "$sumsrc" != "$sumdst" ]] if [[ "$sumsrc" != "$sumdst" ]]
then then