diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh index 69a48bc0..85ea0cd9 100755 --- a/mk/linux/make-binary-archive.sh +++ b/mk/linux/make-binary-archive.sh @@ -54,26 +54,29 @@ fi cd $PROJDIR echo "copying binaries ..." cp -r lib/* "$RELEASEDIR/lib" -cp {../shared/,}*.ico "$RELEASEDIR/" -cp *.bmp "$RELEASEDIR/" -cp *.png "$RELEASEDIR/" -cp *.xpm "$RELEASEDIR/" -cp {../shared/,}*.ini "$RELEASEDIR/" -if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm "$RELEASEDIR/glest-dev.ini"; fi -cp megaglest "$RELEASEDIR/" -cp megaglest_editor "$RELEASEDIR/" -cp megaglest_g3dviewer "$RELEASEDIR/" -cp start_megaglest "$RELEASEDIR/" -cp start_megaglest_mapeditor "$RELEASEDIR/" -cp start_megaglest_g3dviewer "$RELEASEDIR/" -cp start_megaglest_gameserver "$RELEASEDIR/" +cp {../shared/,}*.ico {../shared/,}*.ini "$RELEASEDIR/" +if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm -f "$RELEASEDIR/glest-dev.ini"; fi +cp *.bmp *.png *.xpm *.desktop "$RELEASEDIR/" +cp megaglest megaglest_editor megaglest_g3dviewer start_megaglest \ + start_megaglest_mapeditor start_megaglest_g3dviewer \ + start_megaglest_gameserver "$RELEASEDIR/" + +cd "$CURRENTDIR/tools-for-standalone-client" +cp megaglest-configure-desktop.sh "$RELEASEDIR/" +if [ "$(echo "$VERSION" | grep -v '\-dev')" != "" ]; then + ./prepare-mini-update.sh --only_script; sleep 0.5s + cp megaglest-mini-update.sh "$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" cd $CURRENTDIR -[[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE" +[[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm -f "${RELEASEDIR_ROOT}/$PACKAGE" cd $RELEASEDIR tar -cf - * | xz > ../$PACKAGE cd $CURRENTDIR ls -la ${RELEASEDIR_ROOT}/$PACKAGE - diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh index e1d9eb85..2164cc38 100755 --- a/mk/linux/mojosetup/megaglest-installer/make.sh +++ b/mk/linux/mojosetup/megaglest-installer/make.sh @@ -192,14 +192,19 @@ if [ $REPACKONLY -eq 0 ]; then cp "$CURRENTDIR/$megaglest_shared_path/servers.ini" $INSTALLDATADIR 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 echo Copying blender modelling MegaGlest files... mkdir -p "${INSTALLDATADIR}blender/" - cd "${INSTALLDATADIR}blender/" - git archive --remote ${REPODIR} HEAD:source/tools/glexemel | tar x - cd "$CURRENTDIR" - + cp "$CURRENTDIR/$megaglest_linux_toolspath/glexemel/"*.py "${INSTALLDATADIR}blender/" + cd "$CURRENTDIR" # Now copy all glest data 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 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 cd data copyGlestDeptsCmd="${INSTALL_ROOTDIR}makedeps_folder.sh megaglest" $copyGlestDeptsCmd + if [ -e "${INSTALL_ROOTDIR}makedeps_folder.sh" ]; then rm -f "${INSTALL_ROOTDIR}makedeps_folder.sh"; fi - cd "$CURRENTDIR" - cd data - LIBVLC_DIR_CHECK=$( ldd megaglest | grep "libvlc\." | sort -u | awk '{print $3}' ) - if [ "$LIBVLC_DIR_CHECK" != '' ]; then - LIBVLC_DIR=$( dirname $LIBVLC_DIR_CHECK ) - fi + # If this part -V- is required then should be moved to 'makedeps_folder.sh' script + #cd "$CURRENTDIR" + #cd data + #LIBVLC_DIR_CHECK=$( ldd megaglest | grep "libvlc\." | sort -u | awk '{print $3}' ) + #if [ "$LIBVLC_DIR_CHECK" != '' ]; then + # LIBVLC_DIR=$( dirname $LIBVLC_DIR_CHECK ) + #fi - echo LibVLC installed in [$LIBVLC_DIR] copying to lib/ - if [ "$LIBVLC_DIR" != '' ]; then - cp -r $LIBVLC_DIR/vlc lib/ - #exit 1 - fi + #echo LibVLC installed in [$LIBVLC_DIR] copying to lib/ + #if [ "$LIBVLC_DIR" != '' ]; then + # cp -r $LIBVLC_DIR/vlc lib/ + # #exit 1 + #fi cd .. fi @@ -365,11 +363,12 @@ cd ../megaglest-installer # Compress the main data archive cd 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 shopt -s extglob rm -rf !(docs|$megaglest_archivefilename_data) cd .. +mv -f $megaglest_archivefilename_data data/ cp -R data/* image/data/ cp meta/* image/meta/