implemented new scripts into release scripts-tools; fixed content of blender directory
This commit is contained in:
parent
5495bd1ba8
commit
969b3d897b
|
@ -54,26 +54,29 @@ fi
|
||||||
cd $PROJDIR
|
cd $PROJDIR
|
||||||
echo "copying binaries ..."
|
echo "copying binaries ..."
|
||||||
cp -r lib/* "$RELEASEDIR/lib"
|
cp -r lib/* "$RELEASEDIR/lib"
|
||||||
cp {../shared/,}*.ico "$RELEASEDIR/"
|
cp {../shared/,}*.ico {../shared/,}*.ini "$RELEASEDIR/"
|
||||||
cp *.bmp "$RELEASEDIR/"
|
if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm -f "$RELEASEDIR/glest-dev.ini"; fi
|
||||||
cp *.png "$RELEASEDIR/"
|
cp *.bmp *.png *.xpm *.desktop "$RELEASEDIR/"
|
||||||
cp *.xpm "$RELEASEDIR/"
|
cp megaglest megaglest_editor megaglest_g3dviewer start_megaglest \
|
||||||
cp {../shared/,}*.ini "$RELEASEDIR/"
|
start_megaglest_mapeditor start_megaglest_g3dviewer \
|
||||||
if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm "$RELEASEDIR/glest-dev.ini"; fi
|
start_megaglest_gameserver "$RELEASEDIR/"
|
||||||
cp megaglest "$RELEASEDIR/"
|
|
||||||
cp megaglest_editor "$RELEASEDIR/"
|
cd "$CURRENTDIR/tools-for-standalone-client"
|
||||||
cp megaglest_g3dviewer "$RELEASEDIR/"
|
cp megaglest-configure-desktop.sh "$RELEASEDIR/"
|
||||||
cp start_megaglest "$RELEASEDIR/"
|
if [ "$(echo "$VERSION" | grep -v '\-dev')" != "" ]; then
|
||||||
cp start_megaglest_mapeditor "$RELEASEDIR/"
|
./prepare-mini-update.sh --only_script; sleep 0.5s
|
||||||
cp start_megaglest_g3dviewer "$RELEASEDIR/"
|
cp megaglest-mini-update.sh "$RELEASEDIR/"
|
||||||
cp start_megaglest_gameserver "$RELEASEDIR/"
|
if [ -e "megaglest-mini-update.sh" ]; then rm -f "megaglest-mini-update.sh"; fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$RELEASEDIR/blender/"
|
||||||
|
cp "$CURRENTDIR/../../source/tools/glexemel/"*.py "$RELEASEDIR/blender/"
|
||||||
|
|
||||||
echo "creating $PACKAGE"
|
echo "creating $PACKAGE"
|
||||||
cd $CURRENTDIR
|
cd $CURRENTDIR
|
||||||
[[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE"
|
[[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm -f "${RELEASEDIR_ROOT}/$PACKAGE"
|
||||||
cd $RELEASEDIR
|
cd $RELEASEDIR
|
||||||
tar -cf - * | xz > ../$PACKAGE
|
tar -cf - * | xz > ../$PACKAGE
|
||||||
cd $CURRENTDIR
|
cd $CURRENTDIR
|
||||||
|
|
||||||
ls -la ${RELEASEDIR_ROOT}/$PACKAGE
|
ls -la ${RELEASEDIR_ROOT}/$PACKAGE
|
||||||
|
|
||||||
|
|
|
@ -192,15 +192,20 @@ if [ $REPACKONLY -eq 0 ]; then
|
||||||
cp "$CURRENTDIR/$megaglest_shared_path/servers.ini" $INSTALLDATADIR
|
cp "$CURRENTDIR/$megaglest_shared_path/servers.ini" $INSTALLDATADIR
|
||||||
cp "$CURRENTDIR/$megaglest_linux_path/makedeps_folder.sh" $INSTALL_ROOTDIR
|
cp "$CURRENTDIR/$megaglest_linux_path/makedeps_folder.sh" $INSTALL_ROOTDIR
|
||||||
|
|
||||||
|
if [ "$(echo "$VERSION" | grep -v '\-dev')" != "" ]; then
|
||||||
|
cd "$CURRENTDIR/$megaglest_linux_path/tools-for-standalone-client"
|
||||||
|
./prepare-mini-update.sh --only_script; sleep 0.5s
|
||||||
|
cp megaglest-mini-update.sh $INSTALLDATADIR
|
||||||
|
if [ -e "megaglest-mini-update.sh" ]; then rm -f "megaglest-mini-update.sh"; fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Now copy all blender related files
|
# Now copy all blender related files
|
||||||
echo Copying blender modelling MegaGlest files...
|
echo Copying blender modelling MegaGlest files...
|
||||||
|
|
||||||
mkdir -p "${INSTALLDATADIR}blender/"
|
mkdir -p "${INSTALLDATADIR}blender/"
|
||||||
cd "${INSTALLDATADIR}blender/"
|
cp "$CURRENTDIR/$megaglest_linux_toolspath/glexemel/"*.py "${INSTALLDATADIR}blender/"
|
||||||
git archive --remote ${REPODIR} HEAD:source/tools/glexemel | tar x
|
|
||||||
cd "$CURRENTDIR"
|
cd "$CURRENTDIR"
|
||||||
|
|
||||||
|
|
||||||
# Now copy all glest data
|
# Now copy all glest data
|
||||||
echo Copying live MegaGlest data files...
|
echo Copying live MegaGlest data files...
|
||||||
|
|
||||||
|
@ -245,32 +250,25 @@ if [ $REPACKONLY -eq 0 ]; then
|
||||||
git archive --remote ${REPODIR}/data/glest_game/ HEAD:tutorials | tar x
|
git archive --remote ${REPODIR}/data/glest_game/ HEAD:tutorials | tar x
|
||||||
cd "$CURRENTDIR"
|
cd "$CURRENTDIR"
|
||||||
|
|
||||||
# Now copy all megaglest data
|
|
||||||
echo Copying live MegaGlest country logo files...
|
|
||||||
|
|
||||||
mkdir -p "${INSTALLDATADIR}/data/core/misc_textures/flags/"
|
|
||||||
cd "${INSTALLDATADIR}/data/core/misc_textures/flags/"
|
|
||||||
git archive --remote ${REPODIR}/data/glest_game/data/core/misc_textures HEAD:flags | tar x
|
|
||||||
cd "$CURRENTDIR"
|
|
||||||
|
|
||||||
|
|
||||||
# Copy shared lib dependencies for megaglest
|
# Copy shared lib dependencies for megaglest
|
||||||
cd data
|
cd data
|
||||||
copyGlestDeptsCmd="${INSTALL_ROOTDIR}makedeps_folder.sh megaglest"
|
copyGlestDeptsCmd="${INSTALL_ROOTDIR}makedeps_folder.sh megaglest"
|
||||||
$copyGlestDeptsCmd
|
$copyGlestDeptsCmd
|
||||||
|
if [ -e "${INSTALL_ROOTDIR}makedeps_folder.sh" ]; then rm -f "${INSTALL_ROOTDIR}makedeps_folder.sh"; fi
|
||||||
|
|
||||||
cd "$CURRENTDIR"
|
# If this part -V- is required then should be moved to 'makedeps_folder.sh' script
|
||||||
cd data
|
#cd "$CURRENTDIR"
|
||||||
LIBVLC_DIR_CHECK=$( ldd megaglest | grep "libvlc\." | sort -u | awk '{print $3}' )
|
#cd data
|
||||||
if [ "$LIBVLC_DIR_CHECK" != '' ]; then
|
#LIBVLC_DIR_CHECK=$( ldd megaglest | grep "libvlc\." | sort -u | awk '{print $3}' )
|
||||||
LIBVLC_DIR=$( dirname $LIBVLC_DIR_CHECK )
|
#if [ "$LIBVLC_DIR_CHECK" != '' ]; then
|
||||||
fi
|
# LIBVLC_DIR=$( dirname $LIBVLC_DIR_CHECK )
|
||||||
|
#fi
|
||||||
|
|
||||||
echo LibVLC installed in [$LIBVLC_DIR] copying to lib/
|
#echo LibVLC installed in [$LIBVLC_DIR] copying to lib/
|
||||||
if [ "$LIBVLC_DIR" != '' ]; then
|
#if [ "$LIBVLC_DIR" != '' ]; then
|
||||||
cp -r $LIBVLC_DIR/vlc lib/
|
# cp -r $LIBVLC_DIR/vlc lib/
|
||||||
#exit 1
|
# #exit 1
|
||||||
fi
|
#fi
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
|
@ -365,11 +363,12 @@ cd ../megaglest-installer
|
||||||
# Compress the main data archive
|
# Compress the main data archive
|
||||||
cd data
|
cd data
|
||||||
#${megaglest_archiver_app_data} ${megaglest_archivefilename_data}
|
#${megaglest_archiver_app_data} ${megaglest_archivefilename_data}
|
||||||
tar -cf - * | xz > $megaglest_archivefilename_data
|
tar -cf - * | xz > ../$megaglest_archivefilename_data
|
||||||
# now remove everything except for the docs folder and the data archive
|
# now remove everything except for the docs folder and the data archive
|
||||||
shopt -s extglob
|
shopt -s extglob
|
||||||
rm -rf !(docs|$megaglest_archivefilename_data)
|
rm -rf !(docs|$megaglest_archivefilename_data)
|
||||||
cd ..
|
cd ..
|
||||||
|
mv -f $megaglest_archivefilename_data data/
|
||||||
|
|
||||||
cp -R data/* image/data/
|
cp -R data/* image/data/
|
||||||
cp meta/* image/meta/
|
cp meta/* image/meta/
|
||||||
|
|
Loading…
Reference in New Issue