diff options
111 files changed, 462 insertions, 505 deletions
diff --git a/.gitignore b/.gitignore index 475678e7a..8d6650329 100644 --- a/.gitignore +++ b/.gitignore @@ -57,7 +57,7 @@ install_manifest.txt *.gcno .dirstamp po/stamp-po -src/manaplus +src/manaverse src/manaplustests src/manaplustests.log src/manaplustests.trs @@ -128,9 +128,9 @@ GSYMS GTAGS # tarballs generated by make dist -manaplus-*.tar.gz -manaplus-*.tar.bz2 -manaplus-*.tar.xz +manaverse-*.tar.gz +manaverse-*.tar.bz2 +manaverse-*.tar.xz # generated for nsis build translations/* @@ -155,8 +155,8 @@ gmon.out .DS_Store /Xcode -/manaplus.depend -/manaplus.layout +/manaverse.depend +/manaverse.layout #english po /po/en.po @@ -169,8 +169,8 @@ cmake-build-* .vscode # Nintendo Switch port -src/manaplus.nacp -src/manaplus.nro +src/manaverse.nacp +src/manaverse.nro src/resources/image/image.h.gch # linters diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f858b2808..88e6a170c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -236,38 +236,6 @@ gcc-10_default: tags: - docker -# This and the next job do not work any more: -# access denied pulling the specified image -.mxe_gcc6_shared_32: - only: - - branches@manaplus/manaplus - stage: prebuild - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32 - script: - - ls /mxe - - ./tools/ci/jobs/mxe_gcc6.sh - <<: *job-push - variables: - PACKAGES: bash - CROSS: i686-w64-mingw32.shared - tags: - - docker - -.mxe_gcc6_shared_64: - only: - - branches@manaplus/manaplus - stage: prebuild - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64 - script: - - ls /mxe - - ./tools/ci/jobs/mxe_gcc6.sh - <<: *job-push - variables: - PACKAGES: bash - CROSS: x86_64-w64-mingw32.shared - tags: - - docker - docker-windows-builder: stage: prebuild trigger: @@ -277,7 +245,6 @@ docker-windows-builder: MP_BRANCH: $CI_COMMIT_REF_NAME MP_REPOSITORY: $CI_PROJECT_URL - gcc-5_sdl2: stage: prebuild only: @@ -641,7 +608,7 @@ triggers: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc10.sh - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaverse - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: @@ -664,7 +631,7 @@ triggers: - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - - ldd ./src/manaplus | grep "libasan" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -686,7 +653,7 @@ triggers: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - - ldd ./src/manaplus | grep "libasan" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -711,7 +678,7 @@ triggers: - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - - ldd ./src/manaplus | grep "libasan" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -735,7 +702,7 @@ triggers: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - - ldd ./src/manaplus | grep "libasan" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL diff --git a/Android.mk b/Android.mk index 640b9260b..d57c989cb 100644 --- a/Android.mk +++ b/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := manaplus +LOCAL_MODULE := manaverse ROOT_PATH := $(LOCAL_PATH)/.. SDL_PATH := ../SDL diff --git a/CMakeLists.txt b/CMakeLists.txt index c5dd2987d..616c38d4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) CMAKE_POLICY(VERSION 2.8.12) -PROJECT(MANAPLUS) +PROJECT(MANAVERSE) IF (NOT VERSION) SET(VERSION 1.0.0) @@ -42,7 +42,7 @@ ELSE (WIN32) IF (NOT OSX AND NOT BEOS) OPTION(USE_X11 "Use X11 Clipboard functionality" ON) ENDIF () - SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/manaplus) + SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/manaverse) SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) ENDIF (WIN32) @@ -55,24 +55,24 @@ IF (GETTEXT_FOUND AND ENABLE_NLS) ENDIF() If(UNIX) - INSTALL(FILES manaplus.desktop DESTINATION share/applications) + INSTALL(FILES manaverse.desktop DESTINATION share/applications) INSTALL(FILES manaplustest.desktop DESTINATION share/applications) - INSTALL(FILES manaplus.appdata.xml DESTINATION share/appdata) + INSTALL(FILES manaverse.appdata.xml DESTINATION share/appdata) ENDIF() -SET(CPACK_PACKAGE_NAME "manaplus") +SET(CPACK_PACKAGE_NAME "manaverse") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaVerse") SET(CPACK_PACKAGE_VENDOR "ManaVerse Development Team") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaPlus") +SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaVerse") SET(CPACK_PACKAGE_VERSION_MAJOR ${VER_MAJOR}) SET(CPACK_PACKAGE_VERSION_MINOR ${VER_MINOR}) SET(CPACK_PACKAGE_VERSION_PATCH ${VER_RELEASE}) IF(WIN32) - SET(CPACK_NSIS_DISPLAY_NAME "ManaPlus") - SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus.ico") + SET(CPACK_NSIS_DISPLAY_NAME "ManaVerse") + SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaverse.ico") SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp") SET(CPACK_NSIS_URL_INFO_ABOUT "https://manaverse.germantmw.de") ENDIF() diff --git a/Makefile.am b/Makefile.am index 70c6981be..edc2ef1f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,12 +3,12 @@ SUBDIRS = data docs po src desktopdir = $(datarootdir)/applications -desktop_DATA = manaplus.desktop \ +desktop_DATA = manaverse.desktop \ manaplustest.desktop appdatadir = $(datarootdir)/metainfo -appdata_DATA = manaplus.metainfo.xml +appdata_DATA = manaverse.metainfo.xml # Extra files to include EXTRA_DIST = $(desktop_DATA) \ @@ -19,8 +19,8 @@ EXTRA_DIST = $(desktop_DATA) \ CMake/Modules/FindLibIntl.cmake \ CMake/Modules/FindSDL_gfx.cmake \ Android.mk \ - manaplus.menu \ - manaplus.spec \ + manaverse.menu \ + manaverse.spec \ AUTHORS \ ChangeLog \ INSTALL \ diff --git a/build/makegprof b/build/makegprof index 967238b8e..b04a33a46 100755 --- a/build/makegprof +++ b/build/makegprof @@ -1,7 +1,7 @@ #!/bin/sh mv ../run/gmon.out . -gprof ../run/bin/manaplus >gprof.txt -gprof --inline-file-names ../run/bin/manaplus >gprofi.txt +gprof ../run/bin/manaverse >gprof.txt +gprof --inline-file-names ../run/bin/manaverse >gprofi.txt gprof2dot.py <gprof.txt >gprof.dot dot -Tpng -o gprof.png <gprof.dot diff --git a/build/update-creator.sh b/build/update-creator.sh index f3fc9e28c..7a2b6a750 100755 --- a/build/update-creator.sh +++ b/build/update-creator.sh @@ -7,5 +7,5 @@ find -name \*.cpp \ -o -name \*.am \ -o -name \*.txt \ -o -name \*.xml \ - -o -name \*.manaplus \ - | sort > manaplus.files + -o -name \*.mana \ + | sort > manaverse.files diff --git a/configure.ac b/configure.ac index dc041d8c9..2fba01ee8 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT([ManaPlus], [1.0], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaVerse], [1.0], [jak1@themanaworld.org], [manaverse]) AM_INIT_AUTOMAKE([1.9]) AC_LANG_CPLUSPLUS @@ -379,7 +379,7 @@ if test "x$with_internalsdlgfx" = "xno"; then AC_CHECK_HEADERS(SDL2_rotozoom.h, ,) else with_internalsdlgfx=yes - AC_DEFINE(USE_INTERNALSDLGFX, 1, [Defines if ManaPlus should use internal sdlgfx2]) + AC_DEFINE(USE_INTERNALSDLGFX, 1, [Defines if ManaVerse should use internal sdlgfx2]) fi AM_CONDITIONAL(USE_INTERNALSDLGFX, test "x$with_internalsdlgfx" = xyes) @@ -888,7 +888,7 @@ AC_CHECK_HEADERS([execinfo.h], AM_CONDITIONAL(HAVE_EXECINFO, test "x$have_execinfo" = xyes) AC_CONFIG_FILES([ -manaplus.spec +manaverse.spec Makefile PKGBUILD src/Makefile diff --git a/data/graphics/sprites/CMakeLists.txt b/data/graphics/sprites/CMakeLists.txt index bc5d7d70c..4fb08d5cb 100644 --- a/data/graphics/sprites/CMakeLists.txt +++ b/data/graphics/sprites/CMakeLists.txt @@ -6,9 +6,9 @@ SET(FILES chatemotes.png error.png error.xml - manaplus_emotions.png - manaplus_emote.xml - manaplus_emotes.xml + manaverse_emotions.png + manaverse_emote.xml + manaverse_emotes.xml test.xml ) diff --git a/data/graphics/sprites/Makefile.am b/data/graphics/sprites/Makefile.am index 8001e7016..3c3ad7887 100644 --- a/data/graphics/sprites/Makefile.am +++ b/data/graphics/sprites/Makefile.am @@ -8,9 +8,9 @@ sprites_DATA = \ chatemotes.png \ error.png \ error.xml \ - manaplus_emotions.png\ - manaplus_emote.xml \ - manaplus_emotes.xml \ + manaverse_emotions.png\ + manaverse_emote.xml \ + manaverse_emotes.xml \ test.xml EXTRA_DIST = \ diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml deleted file mode 100644 index 8daf57630..000000000 --- a/data/graphics/sprites/manaplus_emotes.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<emotes> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule selector="//emote/sprite/@name" translate="yes"/> - <its:translateRule selector="//*" translate="no"/> - </its:rules> - - <emote id="100"><sprite name="Kitty" variant="0">manaplus_emote.xml</sprite></emote> - <emote id="101"><sprite name="xD" variant="1">manaplus_emote.xml</sprite></emote> - <emote id="102"><sprite name="^.^" variant="2">manaplus_emote.xml</sprite></emote> - <emote id="103"><sprite name="Heart eye" variant="3">manaplus_emote.xml</sprite></emote> - <emote id="104"><sprite name="Gold eye" variant="4">manaplus_emote.xml</sprite></emote> - <emote id="105"><sprite name="Sleepy" variant="5">manaplus_emote.xml</sprite></emote> - <emote id="106"><sprite name="u.u" variant="6">manaplus_emote.xml</sprite></emote> - <emote id="107"><sprite name="-.-'" variant="7">manaplus_emote.xml</sprite></emote> - <emote id="108"><sprite name="Surprised" variant="8">manaplus_emote.xml</sprite></emote> - <emote id="109"><sprite name="Dead" variant="9">manaplus_emote.xml</sprite></emote> - <emote id="110"><sprite name="Look away" variant="10">manaplus_emote.xml</sprite></emote> - <emote id="111"><sprite name="Sad" variant="11">manaplus_emote.xml</sprite></emote> - <emote id="112"><sprite name="Palmhead" variant="12">manaplus_emote.xml</sprite></emote> - <emote id="113"><sprite name="Evil" variant="13">manaplus_emote.xml</sprite></emote> - <emote id="114"><sprite name="Angry" variant="14">manaplus_emote.xml</sprite></emote> - <emote id="115"><sprite name="Purple Sad" variant="15">manaplus_emote.xml</sprite></emote> - <emote id="116"><sprite name="Insult Buble" variant="16">manaplus_emote.xml</sprite></emote> - <emote id="117"><sprite name="Heart" variant="17">manaplus_emote.xml</sprite></emote> - <emote id="118"><sprite name="Emote" variant="18">manaplus_emote.xml</sprite></emote> - <emote id="119"><sprite name="Pumpkin" variant="19">manaplus_emote.xml</sprite></emote> - <emote id="120"><sprite name="Evil" variant="20">manaplus_emote.xml</sprite></emote> - <emote id="121"><sprite name="Epic" variant="21">manaplus_emote.xml</sprite></emote> - <emote id="122"><sprite name="Bad geek" variant="22">manaplus_emote.xml</sprite></emote> - <emote id="123"><sprite name="Mimi" variant="23">manaplus_emote.xml</sprite></emote> - <emote id="124"><sprite name="Alien" variant="24">manaplus_emote.xml</sprite></emote> - <emote id="125"><sprite name="Troll" variant="25">manaplus_emote.xml</sprite></emote> - <emote id="126"><sprite name="Metal" variant="26">manaplus_emote.xml</sprite></emote> - <emote id="127"><sprite name="Crying" variant="27">manaplus_emote.xml</sprite></emote> -</emotes> diff --git a/data/graphics/sprites/manaplus_emote.xml b/data/graphics/sprites/manaverse_emote.xml index 7c5c48046..857436201 100644 --- a/data/graphics/sprites/manaplus_emote.xml +++ b/data/graphics/sprites/manaverse_emote.xml @@ -2,7 +2,7 @@ <!-- Author : Reid, 4144 Copyright (C) 2011-2012 Manaplus --> <sprite variants="28" variant_offset="1"> - <imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" /> + <imageset name="base" src="graphics/sprites/manaverse_emotions.png" width="30" height="32" /> <action name="stand" imageset="base"> <animation direction="default"> diff --git a/data/graphics/sprites/manaverse_emotes.xml b/data/graphics/sprites/manaverse_emotes.xml new file mode 100644 index 000000000..e951379d5 --- /dev/null +++ b/data/graphics/sprites/manaverse_emotes.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<emotes> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//emote/sprite/@name" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + + <emote id="100"><sprite name="Kitty" variant="0">manaverse_emote.xml</sprite></emote> + <emote id="101"><sprite name="xD" variant="1">manaverse_emote.xml</sprite></emote> + <emote id="102"><sprite name="^.^" variant="2">manaverse_emote.xml</sprite></emote> + <emote id="103"><sprite name="Heart eye" variant="3">manaverse_emote.xml</sprite></emote> + <emote id="104"><sprite name="Gold eye" variant="4">manaverse_emote.xml</sprite></emote> + <emote id="105"><sprite name="Sleepy" variant="5">manaverse_emote.xml</sprite></emote> + <emote id="106"><sprite name="u.u" variant="6">manaverse_emote.xml</sprite></emote> + <emote id="107"><sprite name="-.-'" variant="7">manaverse_emote.xml</sprite></emote> + <emote id="108"><sprite name="Surprised" variant="8">manaverse_emote.xml</sprite></emote> + <emote id="109"><sprite name="Dead" variant="9">manaverse_emote.xml</sprite></emote> + <emote id="110"><sprite name="Look away" variant="10">manaverse_emote.xml</sprite></emote> + <emote id="111"><sprite name="Sad" variant="11">manaverse_emote.xml</sprite></emote> + <emote id="112"><sprite name="Palmhead" variant="12">manaverse_emote.xml</sprite></emote> + <emote id="113"><sprite name="Evil" variant="13">manaverse_emote.xml</sprite></emote> + <emote id="114"><sprite name="Angry" variant="14">manaverse_emote.xml</sprite></emote> + <emote id="115"><sprite name="Purple Sad" variant="15">manaverse_emote.xml</sprite></emote> + <emote id="116"><sprite name="Insult Buble" variant="16">manaverse_emote.xml</sprite></emote> + <emote id="117"><sprite name="Heart" variant="17">manaverse_emote.xml</sprite></emote> + <emote id="118"><sprite name="Emote" variant="18">manaverse_emote.xml</sprite></emote> + <emote id="119"><sprite name="Pumpkin" variant="19">manaverse_emote.xml</sprite></emote> + <emote id="120"><sprite name="Evil" variant="20">manaverse_emote.xml</sprite></emote> + <emote id="121"><sprite name="Epic" variant="21">manaverse_emote.xml</sprite></emote> + <emote id="122"><sprite name="Bad geek" variant="22">manaverse_emote.xml</sprite></emote> + <emote id="123"><sprite name="Mimi" variant="23">manaverse_emote.xml</sprite></emote> + <emote id="124"><sprite name="Alien" variant="24">manaverse_emote.xml</sprite></emote> + <emote id="125"><sprite name="Troll" variant="25">manaverse_emote.xml</sprite></emote> + <emote id="126"><sprite name="Metal" variant="26">manaverse_emote.xml</sprite></emote> + <emote id="127"><sprite name="Crying" variant="27">manaverse_emote.xml</sprite></emote> +</emotes> diff --git a/data/graphics/sprites/manaplus_emotions.png b/data/graphics/sprites/manaverse_emotions.png Binary files differindex c93262ba4..c93262ba4 100644 --- a/data/graphics/sprites/manaplus_emotions.png +++ b/data/graphics/sprites/manaverse_emotions.png diff --git a/data/graphics/sprites/test.xml b/data/graphics/sprites/test.xml index 7243254af..54944216e 100644 --- a/data/graphics/sprites/test.xml +++ b/data/graphics/sprites/test.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <sprite> - <imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" /> + <imageset name="base" src="graphics/sprites/manaverse_emotions.png" width="30" height="32" /> <action name="default" imageset="base"> <animation direction="default"> diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt index 2d5a0a899..0106dc8ef 100644 --- a/data/icons/CMakeLists.txt +++ b/data/icons/CMakeLists.txt @@ -1,7 +1,7 @@ SET(FILES - manaplus.svg + manaverse.svg ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons) -INSTALL(FILES "manaplus.svg" DESTINATION share/icons/hicolor/scalable/apps) +INSTALL(FILES "manaverse.svg" DESTINATION share/icons/hicolor/scalable/apps) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 37eb702fd..dab4f85c0 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,19 +1,19 @@ iconsdir = $(pkgdatadir)/data/icons -icons_DATA = manaplus.png \ - manaplus.svg \ - manaplus.icns \ - manaplus.ico \ - manaplus.hqx \ - manaplus.xpm +icons_DATA = manaverse.png \ + manaverse.svg \ + manaverse.icns \ + manaverse.ico \ + manaverse.hqx \ + manaverse.xpm install-data-local: $(mkinstalldirs) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps - $(INSTALL) $(srcdir)/manaplus.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaplus.svg + $(INSTALL) $(srcdir)/manaverse.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaverse.svg uninstall-local: - rm -f $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaplus.svg + rm -f $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaverse.svg EXTRA_DIST = \ $(icons_DATA) \ diff --git a/data/icons/manaplus.hqx b/data/icons/manaverse.hqx index 77b9e3b98..77b9e3b98 100644 --- a/data/icons/manaplus.hqx +++ b/data/icons/manaverse.hqx diff --git a/data/icons/manaplus.icns b/data/icons/manaverse.icns Binary files differindex 6556fccb1..6556fccb1 100644 --- a/data/icons/manaplus.icns +++ b/data/icons/manaverse.icns diff --git a/data/icons/manaplus.ico b/data/icons/manaverse.ico Binary files differindex bb2dea3b8..bb2dea3b8 100644 --- a/data/icons/manaplus.ico +++ b/data/icons/manaverse.ico diff --git a/data/icons/manaplus.png b/data/icons/manaverse.png Binary files differindex 423d1c6c2..423d1c6c2 100644 --- a/data/icons/manaplus.png +++ b/data/icons/manaverse.png diff --git a/data/icons/manaplus.svg b/data/icons/manaverse.svg index ea9564037..ea9564037 100644 --- a/data/icons/manaplus.svg +++ b/data/icons/manaverse.svg diff --git a/data/icons/manaplus.xpm b/data/icons/manaverse.xpm index c8480d214..80476fab4 100644 --- a/data/icons/manaplus.xpm +++ b/data/icons/manaverse.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * manaplus_xpm[] = { +static char * manaverse_xpm[] = { "32 32 3 1", " c None", ". c #001FC6", diff --git a/data/tmw/Makefile.am b/data/tmw/Makefile.am index f8135b488..bb02dd7bb 100644 --- a/data/tmw/Makefile.am +++ b/data/tmw/Makefile.am @@ -6,14 +6,14 @@ branding: mkdir -p "$(DESTDIR)$(datarootdir)/icons" mkdir -p "$(DESTDIR)$(desktopdir)" cp tmw.desktop "$(DESTDIR)$(desktopdir)" - cp tmw.manaplus "$(DESTDIR)$(pkgdatadir)/data/tmw" + cp tmw.manverse "$(DESTDIR)$(pkgdatadir)/data/tmw" cp icons/tmw-client.png "$(DESTDIR)$(pkgdatadir)/data/tmw/icons/tmw.png" cp icons/tmw-client.png "$(DESTDIR)$(datarootdir)/icons/tmw.png" cp -r images "$(DESTDIR)$(pkgdatadir)/data/tmw" EXTRA_DIST = tmw.desktop.in \ tmw.in \ - tmw.manaplus \ + tmw.mana \ icons/tmw-client.ico \ icons/tmw-client.png \ icons/tmw-client.xpm \ diff --git a/data/tmw/tmw.desktop.in b/data/tmw/tmw.desktop.in index 358877af0..5900f4d0d 100644 --- a/data/tmw/tmw.desktop.in +++ b/data/tmw/tmw.desktop.in @@ -8,7 +8,7 @@ Comment[de]=ein Online Fantasy Spiel Comment[it]=Un gioco fantasy online Comment[nl]=Een online role playing game Comment[sv]=Ett fantasyrollspel online -Exec=manaplus @datadir@/manaplus/data/tmw/tmw.manaplus +Exec=manaverse @datadir@/manaverse/data/tmw/tmw.mana StartupNotify=false Terminal=false Type=Application diff --git a/data/tmw/tmw.in b/data/tmw/tmw.in index d726db2c3..4e03b2b3f 100755 --- a/data/tmw/tmw.in +++ b/data/tmw/tmw.in @@ -1,2 +1,2 @@ #!/bin/sh -exec manaplus @datadir@/manaplus/data/tmw/tmw.manaplus "$@" +exec manaverse @datadir@/manaverse/data/tmw/tmw.mana "$@" diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.mana index c4b66237e..c4b66237e 100644 --- a/data/tmw/tmw.manaplus +++ b/data/tmw/tmw.mana diff --git a/docs/Makefile.am b/docs/Makefile.am index 91cfe1242..abfde8515 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,4 +1,4 @@ -man6_MANS = manaplus.6 \ +man6_MANS = manaverse.6 \ manaplustest.6 EXTRA_DIST = $(man6_MANS) \ @@ -8,4 +8,4 @@ EXTRA_DIST = $(man6_MANS) \ SOURCE/Doxyfile \ sounddev.txt \ clientupdates.txt \ - example.manaplus + example.mana diff --git a/docs/example.manaplus b/docs/example.mana index 2a580463f..93f8b1f42 100644 --- a/docs/example.manaplus +++ b/docs/example.mana @@ -9,9 +9,9 @@ filename / path as a command line parameter --> <configuration> - <option name="appName" value="ManaPlus"/> + <option name="appName" value="ManaVerse"/> <option name="appShort" value="mana"/> - <option name="appIcon" value="icons/manaplus"/> + <option name="appIcon" value="icons/manaverse"/> <option name="loginMusic" value="Magick - Real.ogg"/> <option name="onlineServerList" value="http://manasource.org/serverlist.xml"/> <option name="defaultServer" value="server.themanaworld.org"/> diff --git a/docs/manaplus.6 b/docs/manaverse.6 index 051d054e8..0b63653b6 100644 --- a/docs/manaplus.6 +++ b/docs/manaverse.6 @@ -1,13 +1,13 @@ -.TH "ManaPlus" "6" +.TH "ManaVerse" "6" .SH "NAME" -manaplus \- ManaPlus: A 2D MMORPG client +manaverse \- ManaVerse: A 2D MMORPG client .SH "SYNOPSIS" -\fBmanaplus\fR +\fBmanaverse\fR .SH "DESCRIPTION" This manual page documents the -\fBmanaplus\fR in-game +\fBmanaverse\fR in-game commands. -\fBmanaplus\fR is a great online game based upon the Seiken Densetsu Series. +\fBmanaverse\fR is a great online game based upon the Seiken Densetsu Series. It has its own universe and its own character management system which will give you the opportunity to play in a 2D heroic-fantasy world forever. .SH "BINARY PARAMETERS" diff --git a/manaplus.menu b/manaplus.menu deleted file mode 100644 index cc17fbeb0..000000000 --- a/manaplus.menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(manaplus):needs="X11" section="Games/Adventure"\ - title="ManaPlus"\ - description="ManaPlus is a 2D MMORPG client."\ - command="/usr/games/manaplus" icon="/usr/share/pixmaps/manaplus.xpm" diff --git a/manaplus.desktop b/manaverse.desktop index d225ab3b5..d8aa56e55 100644 --- a/manaplus.desktop +++ b/manaverse.desktop @@ -1,13 +1,13 @@ [Desktop Entry] Version=1.0 -Name=ManaPlus +Name=ManaVerse Comment=A 2D MMORPG client -Exec=manaplus +Exec=manaverse StartupNotify=false Terminal=false Type=Application -Icon=manaplus +Icon=manaverse Categories=Game;AdventureGame; Keywords=MMORPG;game;RPG;adventure;multiplayer;online; diff --git a/manaverse.menu b/manaverse.menu new file mode 100644 index 000000000..f71ab93df --- /dev/null +++ b/manaverse.menu @@ -0,0 +1,4 @@ +?package(manaverse):needs="X11" section="Games/Adventure"\ + title="ManaVerse"\ + description="ManaVerse is a 2D MMORPG client."\ + command="/usr/games/manaverse" icon="/usr/share/pixmaps/manaverse.xpm" diff --git a/manaplus.metainfo.xml b/manaverse.metainfo.xml index 1e5f5eead..c4ecf1ab0 100644 --- a/manaplus.metainfo.xml +++ b/manaverse.metainfo.xml @@ -1,24 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop-application"> - <id type="desktop">manaplus.desktop</id> + <id type="desktop">manaverse.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0</project_license> <name>The Mana Plus Client</name> <summary>Extended client for The Mana World and similar servers</summary> <description> <p> - ManaPlus is extended client for Evol Online, The Mana World and similar servers - based on eAthena fork. As a 2D style game, Evol Online aims to create a friendly - environment where people can escape reality and interact with others while enjoying - themselves through a fantasy style game. + ManaVerse is extended client for The Mana World and similar servers + based on eAthena fork. </p> <p> The Mana World (TMW) is a serious effort to create an innovative free and - open source MMORPG. TMW uses 2D graphics and aims to create a large and diverse + open source MMORPG. TMW uses 2.5D graphics and aims to create a large and diverse interactive world. </p> </description> - <url type="homepage">http://manaplus.org/</url> + <url type="homepage">https://manaverse.germantmw.de/</url> <screenshots> <screenshot type="default">http://manaplus.org/_media/manaplus_screenshot_8.png</screenshot> <screenshot>http://manaplus.org/_media/manaplus_screenshot_11.png</screenshot> diff --git a/manaplus.spec.in b/manaverse.spec.in index dee87106a..59b85ef41 100644 --- a/manaplus.spec.in +++ b/manaverse.spec.in @@ -1,11 +1,11 @@ -Name: manaplus +Name: manaverse Version: @PACKAGE_VERSION@ Release: 1 -Summary: A client for Evol Online and The Mana World: 2D MMORPG +Summary: A client for The Mana World: 2D MMORPG Group: Games/Other License: GPLv2+ -Url: http://manaplus.evolonline.org/ -Source0: http://download.evolonline.org/manaplus/download/%{version}/%{name}-%{version}.tar.bz2 +Url: https://manaverse.germantmw.de +Source0: https://git.themanaworld.org/mana/plus/-/tree/v%{version}/ BuildRoot: %{_topdir}/%{name}-%{version}-root BuildRequires: gcc-c++ @@ -21,17 +21,13 @@ BuildRequires: libxml2-devel BuildRequires: libpng-devel BuildRequires: gettext-devel -Provides: evolonline-client = %{version}-%{release} Provides: manaworld-client = %{version}-%{release} %description -ManaPlus is extended client for Evol Online, The Mana World and similar +ManaVerse is extended client for The Mana World and similar servers based on eAthena fork. -As a 2D style game, Evol Online aims to create a friendly environment where -people can escape reality and interact with others while enjoying themselves -through a fantasy style game. The Mana World (TMW) is a serious effort to create an innovative free and -open source MMORPG. TMW uses 2D graphics and aims to create a large and +open source MMORPG. TMW uses 2.5D graphics and aims to create a large and diverse interactive world. %prep diff --git a/nightly/buildlinux.sh b/nightly/buildlinux.sh index 24ef620a3..2c33bbae7 100755 --- a/nightly/buildlinux.sh +++ b/nightly/buildlinux.sh @@ -19,14 +19,14 @@ if [ "$result" != 0 ]; then exit $result fi -if [ -e src/manaplus ]; +if [ -e src/manaverse ]; then - strip src/manaplus + strip src/manaverse rm -rf $DSTDIR mkdir -p $DSTDIR cp -r data $DSTDIR mkdir -p $DSTDIR/bin - cp src/manaplus $DSTDIR/bin + cp src/manaverse $DSTDIR/bin cp nightly/runme.sh $DSTDIR cp "nightly/run tests.sh" $DSTDIR fi diff --git a/nightly/run tests.sh b/nightly/run tests.sh index f72450c58..64bcf1bfe 100755 --- a/nightly/run tests.sh +++ b/nightly/run tests.sh @@ -3,4 +3,4 @@ DIR=$(dirname "$(readlink -f "$0")") cd "$DIR" export LD_LIBRARY_PATH="$DIR"/libs/:$LD_LIBRARY_PATH -./bin/manaplus --tests +./bin/manaverse --tests diff --git a/nightly/runme.sh b/nightly/runme.sh index 5f3f4abe8..5f7ab625a 100755 --- a/nightly/runme.sh +++ b/nightly/runme.sh @@ -3,4 +3,4 @@ DIR=$(dirname "$(readlink -f $0)") cd "$DIR" export LD_LIBRARY_PATH="$DIR"/libs/:$LD_LIBRARY_PATH -./bin/manaplus +./bin/manaverse diff --git a/packaging/debian/control b/packaging/debian/control index 8cfc37f86..6f13a0e6d 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -1,4 +1,4 @@ -Source: manaplus +Source: manaverse Section: games Priority: optional Homepage: https://manaverse.germantmw.de/ @@ -21,11 +21,11 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint -Package: manaplus +Package: manaverse Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - manaplus-data (= ${source:Version}), + manaverse-data (= ${source:Version}), xsel, x11-utils, xdg-utils @@ -36,26 +36,26 @@ Description: Extended client for The Mana World serious effort to create an innovative free and open source MMORPG. TMW uses 2D graphics and aims to create a large and diverse interactive world. -Package: manaplus-dbg +Package: manaverse-dbg Section: debug Architecture: any Priority: extra Depends: ${misc:Depends}, - manaplus (= ${binary:Version}) + manaverse (= ${binary:Version}) Description: Extended client for The Mana World ManaVerse is an extended client for The Mana World, and similar servers based on a fork of eAthena. The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG. TMW uses 2D graphics and aims to create a large and diverse interactive world. . - This package provides debugging symbols for the manaplus package. + This package provides debugging symbols for the manaverse package. -Package: manaplus-data +Package: manaverse-data Architecture: all Depends: ${misc:Depends}, ttf-dejavu-core, fonts-liberation -Recommends: manaplus, +Recommends: manaverse, fonts-mplus, fonts-wqy-microhei Description: Extended client for The Mana World diff --git a/packaging/debian/copyright b/packaging/debian/copyright index 9ba604638..c9348f49b 100644 --- a/packaging/debian/copyright +++ b/packaging/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: manaplus -Source: http://download.evolonline.org/manaplus/download/ +Upstream-Name: manaverse +Source: https://manaverse.germantmw.de/ Files: * Copyright: 2004-2009 The Mana World Development Team diff --git a/packaging/debian/manaplus-data.install b/packaging/debian/manaplus-data.install index 186b1cf5a..88e9ad428 100644 --- a/packaging/debian/manaplus-data.install +++ b/packaging/debian/manaplus-data.install @@ -1,9 +1,9 @@ usr/share/locale -usr/share/manaplus/data/graphics -usr/share/manaplus/data/help -usr/share/manaplus/data/icons -usr/share/manaplus/data/themes -usr/share/manaplus/data/sfx -usr/share/manaplus/data/sfx/system -usr/share/manaplus/data/perserver -usr/share/manaplus/data/translations +usr/share/manaverse/data/graphics +usr/share/manaverse/data/help +usr/share/manaverse/data/icons +usr/share/manaverse/data/themes +usr/share/manaverse/data/sfx +usr/share/manaverse/data/sfx/system +usr/share/manaverse/data/perserver +usr/share/manaverse/data/translations diff --git a/packaging/debian/manaplus-data.links b/packaging/debian/manaplus-data.links index 0754ce07d..c6b3d78cb 100644 --- a/packaging/debian/manaplus-data.links +++ b/packaging/debian/manaplus-data.links @@ -1,11 +1,11 @@ -usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/manaplus/data/fonts/dejavusans.ttf -usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf usr/share/manaplus/data/fonts/dejavusans-bold.ttf -usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf usr/share/manaplus/data/fonts/dejavusansmono.ttf -usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf usr/share/manaplus/data/fonts/dejavusansmono-bold.ttf -usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf usr/share/manaplus/data/fonts/liberationsans-bold.ttf -usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf usr/share/manaplus/data/fonts/liberationsans.ttf -usr/share/fonts/truetype/liberation/LiberationMono-Bold.ttf usr/share/manaplus/data/fonts/liberationsansmono-bold.ttf -usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf usr/share/manaplus/data/fonts/liberationsansmono.ttf -usr/share/fonts/truetype/mplus/mplus-1p-bold.ttf usr/share/manaplus/data/fonts/mplus-1p-bold.ttf -usr/share/fonts/truetype/mplus/mplus-1p-regular.ttf usr/share/manaplus/data/fonts/mplus-1p-regular.ttf -usr/share/fonts/truetype/wqy/wqy-microhei.ttc usr/share/manaplus/data/fonts/wqy-microhei.ttf +usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/manaverse/data/fonts/dejavusans.ttf +usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf usr/share/manaverse/data/fonts/dejavusans-bold.ttf +usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf usr/share/manaverse/data/fonts/dejavusansmono.ttf +usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf usr/share/manaverse/data/fonts/dejavusansmono-bold.ttf +usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf usr/share/manaverse/data/fonts/liberationsans-bold.ttf +usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf usr/share/manaverse/data/fonts/liberationsans.ttf +usr/share/fonts/truetype/liberation/LiberationMono-Bold.ttf usr/share/manaverse/data/fonts/liberationsansmono-bold.ttf +usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf usr/share/manaverse/data/fonts/liberationsansmono.ttf +usr/share/fonts/truetype/mplus/mplus-1p-bold.ttf usr/share/manaverse/data/fonts/mplus-1p-bold.ttf +usr/share/fonts/truetype/mplus/mplus-1p-regular.ttf usr/share/manaverse/data/fonts/mplus-1p-regular.ttf +usr/share/fonts/truetype/wqy/wqy-microhei.ttc usr/share/manaverse/data/fonts/wqy-microhei.ttf diff --git a/packaging/debian/manaplus.install b/packaging/debian/manaplus.install index b6f7c99b6..0f040b1b5 100644 --- a/packaging/debian/manaplus.install +++ b/packaging/debian/manaplus.install @@ -1,4 +1,4 @@ -usr/share/applications/manaplus.desktop -usr/share/manaplus/data/icons/manaplus.png usr/share/pixmaps -usr/games/manaplus -data/icons/manaplus.xpm usr/share/pixmaps +usr/share/applications/manaverse.desktop +usr/share/manaverse/data/icons/manaverse.png usr/share/pixmaps +usr/games/manaverse +data/icons/manaverse.xpm usr/share/pixmaps diff --git a/packaging/debian/manaplus.lintian-overrides b/packaging/debian/manaplus.lintian-overrides index fb8da9244..e3f477b45 100644 --- a/packaging/debian/manaplus.lintian-overrides +++ b/packaging/debian/manaplus.lintian-overrides @@ -1,3 +1,3 @@ -manaplus: spelling-error-in-binary usr/games/manaplus dont don't -manaplus: spelling-error-in-binary usr/games/manaplus standart standard -manaplus: spelling-error-in-binary usr/games/manaplus spaw spawn +manaverse: spelling-error-in-binary usr/games/manaverse dont don't +manaverse: spelling-error-in-binary usr/games/manaverse standart standard +manaverse: spelling-error-in-binary usr/games/manaverse spaw spawn diff --git a/packaging/debian/manaplus.manpages b/packaging/debian/manaplus.manpages index dfa31fe89..b9d3a690f 100644 --- a/packaging/debian/manaplus.manpages +++ b/packaging/debian/manaplus.manpages @@ -1,2 +1,2 @@ -docs/manaplus.6 +docs/manaverse.6 docs/manaplustest.6 diff --git a/packaging/debian/manaplus.menu b/packaging/debian/manaplus.menu index df633b0e9..2af68d5df 100644 --- a/packaging/debian/manaplus.menu +++ b/packaging/debian/manaplus.menu @@ -1,5 +1,5 @@ -?package(manaplus):needs="X11" section="Games/Adventure" \ - title="ManaPlus" \ - longtitle="ManaPlus is a 2D MMORPG client." \ - command="/usr/games/manaplus" \ - icon="/usr/share/pixmaps/manaplus.xpm" +?package(manaverse):needs="X11" section="Games/Adventure" \ + title="ManaVerse" \ + longtitle="ManaVerse is a 2D MMORPG client." \ + command="/usr/games/manaverse" \ + icon="/usr/share/pixmaps/manaverse.xpm" diff --git a/packaging/debian/rules b/packaging/debian/rules index 7533b4c82..65c9caafe 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -9,12 +9,12 @@ override_dh_auto_configure: dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) override_dh_strip: - dh_strip -a --dbg-package=manaplus-dbg + dh_strip -a --dbg-package=manaverse-dbg override_dh_install: dh_install - rm -f $(CURDIR)/debian/manaplus-data/usr/share/manaplus/data/themes/jewelry/LICENSE.txt - rm -f $(CURDIR)/debian/manaplus-data/usr/share/manaplus/data/themes/golden-delicious/LICENSE.txt + rm -f $(CURDIR)/debian/manaverse-data/usr/share/manaverse/data/themes/jewelry/LICENSE.txt + rm -f $(CURDIR)/debian/manaverse-data/usr/share/manaverse/data/themes/golden-delicious/LICENSE.txt %: dh $@ --parallel --with autoreconf diff --git a/packaging/debian/source.lintian-overrides b/packaging/debian/source.lintian-overrides index 615c5ddde..86de4d849 100644 --- a/packaging/debian/source.lintian-overrides +++ b/packaging/debian/source.lintian-overrides @@ -1,2 +1,2 @@ -manaplus source: dep5-copyright-license-name-not-unique -manaplus source: missing-license-paragraph-in-dep5-copyright gpl-2 +manaverse source: dep5-copyright-license-name-not-unique +manaverse source: missing-license-paragraph-in-dep5-copyright gpl-2 diff --git a/packaging/nacl/ports/manaplus/build.sh b/packaging/nacl/ports/manaplus/build.sh index 19f97cabd..08d9b0a73 100755 --- a/packaging/nacl/ports/manaplus/build.sh +++ b/packaging/nacl/ports/manaplus/build.sh @@ -16,12 +16,12 @@ ConfigureStep() { SDL_CFLAGS=`$SDL_CONFIG --cflags` SDL_LIBS="-lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lSDL_net -lfreetype -ljpeg -lpng16 -lwebp -lvorbisfile -lvorbis -logg -lmikmod -lz -lbz2 -ltiff" export LIBS="-L${NACLPORTS_LIBDIR} ${SDL_LIBS} -lnacl_io -lpthread -lRegal -lm" - export MANAPLUSDIR="${START_DIR}/src" + export MANAVERSEDIR="${START_DIR}/src" # autoreconf -i ${SRC_DIR} - autoreconf -i ${MANAPLUSDIR} + autoreconf -i ${MANAVERSEDIR} # ${SRC_DIR}/configure - ${MANAPLUSDIR}/configure \ + ${MANAVERSEDIR}/configure \ --enable-naclbuild \ --disable-nls \ --with-opengl \ diff --git a/packaging/nacl/ports/manaplus/pkg_info b/packaging/nacl/ports/manaplus/pkg_info index 314dfb0b7..ed9fd19bd 100644 --- a/packaging/nacl/ports/manaplus/pkg_info +++ b/packaging/nacl/ports/manaplus/pkg_info @@ -1,6 +1,6 @@ -NAME=manaplus +NAME=manaverse VERSION=1 -#URL=https://gitlab.com/manaplus/manaplus.git@master +#URL=https://git.themanaworld.org/mana/plus LICENSE=GPL DEPENDS=(sdl sdl-gfx sdl-mixer sdl-ttf sdl-image sdl-net curl libxml2 libwebp zlib) SHA1=4178d0c709b34b811d1781fc6dc183ea4979c2b5 diff --git a/packaging/openSUSE Build Service/manaplus.spec b/packaging/openSUSE Build Service/manaplus.spec index 852f6422c..b624c5cf2 100644 --- a/packaging/openSUSE Build Service/manaplus.spec +++ b/packaging/openSUSE Build Service/manaplus.spec @@ -1,11 +1,11 @@ -Name: manaplus +Name: manaverse Version: 1.1.6.26 Release: 1 -Summary: A client for Evol Online and The Mana World: 2D MMORPG +Summary: A client for The Mana World: 2D MMORPG Group: Games/Other License: GPLv2+ -Url: http://manaplus.evolonline.org/ -Source0: http://download.evolonline.org/manaplus/download/%{version}/%{name}-%{version}.tar.bz2 +Url: https://manaverse.germantmw.de/ +Source0: https://git.themanaworld.org/mana/plus/-/tree/v%{version}/ BuildRoot: %{_topdir}/%{name}-%{version}-root BuildRequires: gcc-c++ @@ -21,15 +21,11 @@ BuildRequires: libxml2-devel BuildRequires: libpng-devel BuildRequires: gettext-devel -Provides: evolonline-client = %{version}-%{release} Provides: manaworld-client = %{version}-%{release} %description -ManaPlus is extended client for Evol Online, The Mana World and similar +ManaVerse is extended client for The Mana World and similar servers based on eAthena fork. -As a 2D style game, Evol Online aims to create a friendly environment where -people can escape reality and interact with others while enjoying themselves -through a fantasy style game. The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG. TMW uses 2D graphics and aims to create a large and diverse interactive world. diff --git a/packaging/switch/CMakeLists.txt.switch b/packaging/switch/CMakeLists.txt.switch index 4520122ec..99c4b7863 100644 --- a/packaging/switch/CMakeLists.txt.switch +++ b/packaging/switch/CMakeLists.txt.switch @@ -25,7 +25,7 @@ elseif (PLATFORM_SWITCH) set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available") endif () -project(ManaPlus) +project(ManaVerse) file(GLOB SOURCES src/*.cpp) set(SOURCES_DIRS src/being src/enums/being src/fs src/gui src/input @@ -39,9 +39,9 @@ endforeach (DIR) set(INCLUDES src src/sdl2gfx) -set(FLAGS -DPACKAGE_NAME=\"ManaPlus\" -DPACKAGE_TARNAME=\"manaplus\" -DPACKAGE_VERSION=\"1.9.3.23\" - -DPACKAGE_STRING=\"ManaPlus\ 1.9.3.23\" -DPACKAGE_BUGREPORT=\"akaras@inbox.ru\" -DPACKAGE_URL=\"\" - -DPACKAGE=\"manaplus\" -DVERSION=\"1.9.3.23\" -DTIME_WITH_SYS_TIME=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 +set(FLAGS -DPACKAGE_NAME=\"ManaVerse\" -DPACKAGE_TARNAME=\"manaverse\" -DPACKAGE_VERSION=\"1.0\" + -DPACKAGE_STRING=\"ManaVerse\ 1.0\" -DPACKAGE_BUGREPORT=\"jak1@themanaworld.org\" -DPACKAGE_URL=\"\" + -DPACKAGE=\"manaverse\" -DVERSION=\"1.0\" -DTIME_WITH_SYS_TIME=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKET_H=1 -DSELECT_TYPE_ARG1=int -DSELECT_TYPE_ARG234=\(fd_set\ \\*\) -DSELECT_TYPE_ARG5=\(struct\ timeval\ \\*\) @@ -108,5 +108,5 @@ if (PLATFORM_SWITCH) add_custom_target(${PROJECT_NAME}.nro DEPENDS ${PROJECT_NAME} COMMAND ${DEVKITPRO}/tools/bin/nacptool --create "${PROJECT_NAME}" "cpasjuste" "1.9.3.23" ${PROJECT_NAME}.nacp - COMMAND ${DEVKITPRO}/tools/bin/elf2nro ${PROJECT_NAME} ${PROJECT_NAME}.nro --icon=${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus-switch.jpeg --nacp=${PROJECT_NAME}.nacp) + COMMAND ${DEVKITPRO}/tools/bin/elf2nro ${PROJECT_NAME} ${PROJECT_NAME}.nro --icon=${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaverse-switch.jpeg --nacp=${PROJECT_NAME}.nacp) endif () diff --git a/packaging/windows/make-translations.sh b/packaging/windows/make-translations.sh index 1d4132397..de8fff283 100755 --- a/packaging/windows/make-translations.sh +++ b/packaging/windows/make-translations.sh @@ -2,5 +2,5 @@ for i in `grep -v ^# ../../po/LINGUAS`; do mkdir -p ../../translations/$i/LC_MESSAGES - msgfmt -c -o ../../translations/$i/LC_MESSAGES/manaplus.mo ../../po/$i.po + msgfmt -c -o ../../translations/$i/LC_MESSAGES/manaverse.mo ../../po/$i.po done diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index f5ca57644..f7bf573ba 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -3,8 +3,8 @@ ; like the old install script. ; ; DLLDIR - directory containing required dlls -; EXEDIR - directory containing manaplus.exe -; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe +; EXEDIR - directory containing manaverse.exe +; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaverse.exe ; PRODUCT_VERSION - software version ; UPX - upx binary name ; @@ -46,20 +46,20 @@ RequestExecutionLevel admin !endif ;--- (and without !defines ) --- -!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe" +!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaverse.exe" !define MULTIUSER_INSTALLMODE_COMMANDLINE !define MULTIUSER_EXECUTIONLEVEL "admin" !include "MultiUser.nsh" ; HM NIS Edit helper defines -!define PRODUCT_NAME "ManaPlus" +!define PRODUCT_NAME "ManaVerse" !ifndef PRODUCT_VERSION !define PRODUCT_VERSION "1.1" !endif -!define PRODUCT_PUBLISHER "ManaPlus Development Team" -!define PRODUCT_WEB_SITE "http://manaplus.evolonline.org/" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaplus.exe" +!define PRODUCT_PUBLISHER "ManaVerse Development Team" +!define PRODUCT_WEB_SITE "http://manaverse.germantmw.de" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaverse.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "SHCTX" @@ -71,9 +71,9 @@ RequestExecutionLevel admin ; MUI Settings !define MUI_ABORTWARNING ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico" -!define MUI_ICON "${SRCDIR}\data\icons\manaplus.ico" +!define MUI_ICON "${SRCDIR}\data\icons\manaverse.ico" ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico" -!define MUI_UNICON "${SRCDIR}\data\icons\manaplus.ico" +!define MUI_UNICON "${SRCDIR}\data\icons\manaverse.ico" ;Language Selection Dialog Settings ;Remember the installer language @@ -101,13 +101,13 @@ RequestExecutionLevel admin !define MUI_FINISHPAGE_RUN_FUNCTION RunMana !define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""' !define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage -!define MUI_FINISHPAGE_LINK "Visit ManaPlus website for the latest news, FAQs and support" -!define MUI_FINISHPAGE_LINK_LOCATION "http://manaplus.evolonline.org/" +!define MUI_FINISHPAGE_LINK "Visit ManaVerse website for the latest news, FAQs and support" +!define MUI_FINISHPAGE_LINK_LOCATION "http://manaverse.germantmw.de/" !insertmacro MUI_PAGE_FINISH Function RunMana SetOutPath $INSTDIR -Exec "$INSTDIR\manaplus.exe" +Exec "$INSTDIR\manaverse.exe" FunctionEnd Function changeFinishImage @@ -179,7 +179,7 @@ ReserveFile "setup_finish.bmp" ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "manaplus-${PRODUCT_VERSION}-win${BITS}.exe" +OutFile "manaverse-${PRODUCT_VERSION}-win${BITS}.exe" InstallDir "$PROGRAMFILES\Mana" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show @@ -259,7 +259,7 @@ Section "Core files (required)" SecCore SetOverwrite ifnewer SetOutPath "$INSTDIR" - File "${EXEDIR}\manaplus.exe" + File "${EXEDIR}\manaverse.exe" File "${DLLDIR}\SDL.dll" File "${DLLDIR}\SDL_image.dll" ; File "${DLLDIR}\SDL_mixer.dll" @@ -341,7 +341,7 @@ Section "Core files (required)" SecCore SetOutPath "$INSTDIR\data\help\idx" File "${SRCDIR}\data\help\idx\*.idx" SetOutPath "$INSTDIR\data\icons\" - File "${SRCDIR}\data\icons\manaplus.ico" + File "${SRCDIR}\data\icons\manaverse.ico" SetOutPath "$INSTDIR\data\music" File "${SRCDIR}\data\music\*.ogg" SetOutPath "$INSTDIR\data\perserver\default\" @@ -355,14 +355,14 @@ Section "Create Shortcuts" SecShortcuts SetOutPath "$INSTDIR" SetOverwrite ifnewer CreateDirectory "$SMPROGRAMS\Mana" - CreateShortCut "$SMPROGRAMS\Mana\ManaPlus.lnk" "$INSTDIR\manaplus.exe" - CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" "$INSTDIR\manaplus.exe" --no-opengl - CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" "$INSTDIR\manaplus.exe" --safemode - CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests - CreateShortCut "$DESKTOP\ManaPlus.lnk" "$INSTDIR\manaplus.exe" - CreateShortCut "$DESKTOP\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests - - ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings" + CreateShortCut "$SMPROGRAMS\Mana\ManaVerse.lnk" "$INSTDIR\manaverse.exe" + CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk" "$INSTDIR\manaverse.exe" --no-opengl + CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk" "$INSTDIR\manaverse.exe" --safemode + CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests + CreateShortCut "$DESKTOP\ManaVerse.lnk" "$INSTDIR\manaverse.exe" + CreateShortCut "$DESKTOP\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests + + ${registerExtension} "$INSTDIR\manaverse.exe" ".mana" "ManaVerse brandings" SectionEnd Section /o "Portable" SecPortable @@ -377,19 +377,19 @@ Section /o "Debugger" SecDebug File "${DLLDIR}\libexpat-1.dll" File "${DLLDIR}\libreadline6.dll" File "${DLLDIR}\libtermcap.dll" - File "${EXEDIR}\manaplusd.exe" + File "${EXEDIR}\manaversed.exe" ${If} ${SectionIsSelected} ${SecShortcuts} - CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" - CreateShortCut "$DESKTOP\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" + CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaversed.exe"' "$INSTDIR\manaversed.exe" + CreateShortCut "$DESKTOP\ManaVerse (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaversed.exe"' "$INSTDIR\manaversed.exe" ${EndIf} SectionEnd Section /o "Profiler" SecProfiler SetOutPath "$INSTDIR" - File "${EXEDIR}\manaplusp.exe" + File "${EXEDIR}\manaversep.exe" ${If} ${SectionIsSelected} ${SecShortcuts} - CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe" - CreateShortCut "$DESKTOP\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe" + CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (profiler).lnk" "$INSTDIR\manaversep.exe" + CreateShortCut "$DESKTOP\ManaVerse (profiler).lnk" "$INSTDIR\manaversep.exe" ${EndIf} SectionEnd @@ -408,7 +408,6 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files." !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Create game shortcuts and register extensions." !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)" - !insertmacro MUI_DESCRIPTION_TEXT ${SecEvol} "Create shortcuts for Evol Online." !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English." !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to detect stability issues." !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiler} "Install profiler build to detect perfomance issues." @@ -426,10 +425,10 @@ SectionEnd Section -Post WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe" + WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaverse.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaverse.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" @@ -446,21 +445,19 @@ Section Uninstall Delete "$INSTDIR\*.*" Delete "$SMPROGRAMS\Mana\Uninstall.lnk" - Delete "$DESKTOP\ManaPlus.lnk" - Delete "$DESKTOP\ManaPlus (debug).lnk" - Delete "$DESKTOP\ManaPlus (profiler).lnk" - Delete "$DESKTOP\ManaPlus (tests).lnk" - Delete "$SMPROGRAMS\Mana\ManaPlus.lnk" - Delete "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" - Delete "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk" - Delete "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" - Delete "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" - Delete "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" + Delete "$DESKTOP\ManaVerse.lnk" + Delete "$DESKTOP\ManaVerse (debug).lnk" + Delete "$DESKTOP\ManaVerse (profiler).lnk" + Delete "$DESKTOP\ManaVerse (tests).lnk" + Delete "$SMPROGRAMS\Mana\ManaVerse.lnk" + Delete "$SMPROGRAMS\Mana\ManaVerse (debug).lnk" + Delete "$SMPROGRAMS\Mana\ManaVerse (profiler).lnk" + Delete "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk" + Delete "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk" + Delete "$SMPROGRAMS\Mana\ManaVerse (tests).lnk" Delete "$SMPROGRAMS\Mana\Website.lnk" Delete "$SMPROGRAMS\Mana\Readme.lnk" Delete "$SMPROGRAMS\Mana\FAQ.lnk" - Delete "$SMPROGRAMS\Mana\EvolOnline.lnk" - Delete "$DESKTOP\EvolOnline.lnk" RMDir "$SMPROGRAMS\Mana" @@ -472,6 +469,6 @@ Section Uninstall DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}" - ${unregisterExtension} ".manaplus" "ManaPlus brandings" + ${unregisterExtension} ".mana" "ManaVerse brandings" SetAutoClose true SectionEnd diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 068757ac1..ef28b5be6 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -4,7 +4,7 @@ FIND_PACKAGE(Gettext REQUIRED) # we need our own version because the upstream one contains # a call to msgmerge (updating po files) which can't be # disabled -MACRO(MANAPLUS_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg) +MACRO(MANAVERSE_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg) # make it a real variable, so we can modify it here SET(_firstPoFile "${_firstPoFileArg}") @@ -38,12 +38,12 @@ MACRO(MANAPLUS_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg) ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles}) ENDMACRO() -MACRO(MANAPLUS_GETTEXT_UPDATE_PO _potFile _languages) +MACRO(MANAVERSE_GETTEXT_UPDATE_PO _potFile _languages) GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE) ADD_CUSTOM_TARGET( update-pot - COMMAND xgettext --files-from=translatable-files --directory=. --output=${_potFile} -d manaplus --keyword=_ --keyword=N_ + COMMAND xgettext --files-from=translatable-files --directory=. --output=${_potFile} -d manaverse --keyword=_ --keyword=N_ ) ADD_CUSTOM_TARGET( @@ -78,5 +78,5 @@ ENDFOREACH() ADD_CUSTOM_TARGET(update-po) -MANAPLUS_GETTEXT_CREATE_TRANSLATIONS(manaplus.pot ALL ${POFILES}) -MANAPLUS_GETTEXT_UPDATE_PO(manaplus.pot "${languages}") +MANAVERSE_GETTEXT_CREATE_TRANSLATIONS(manaverse.pot ALL ${POFILES}) +MANAVERSE_GETTEXT_UPDATE_PO(manaverse.pot "${languages}") diff --git a/po/Makevars b/po/Makevars index 2cd1a43b5..588deb93f 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,7 +1,7 @@ # Makefile variables for PO directory in any package using GNU gettext. # Usually the message domain is the same as the package name. -DOMAIN = manaplus +DOMAIN = manaverse # These two variables depend on the location of this directory. subdir = po @@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # or entity, or to disclaim their copyright. The empty string stands for # the public domain; in this case the translators are expected to disclaim # their copyright. -COPYRIGHT_HOLDER = The ManaPlus Developers +COPYRIGHT_HOLDER = The ManaVerse Developers # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: diff --git a/po/manaplus.pot b/po/manaverse.pot index f4256aca5..f4256aca5 100644 --- a/po/manaplus.pot +++ b/po/manaverse.pot @@ -1,3 +1,3 @@ cd run -./bin/manaplus $* +./bin/manaverse $* cd .. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f5a22e0f..59d3416fb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2215,18 +2215,18 @@ IF (WIN32) ${SRCS} fs/specialfolder.cpp fs/specialfolder.h - manaplus.rc + manaverse.rc ) SET(DYE_CMD_SRCS ${DYE_CMD_SRCS} fs/specialfolder.cpp fs/specialfolder.h - manaplus.rc + manaverse.rc ) ENDIF () -#SET (PROGRAMS manaplus dyecmd) -SET (PROGRAMS manaplus) +#SET (PROGRAMS manaverse dyecmd) +SET (PROGRAMS manaverse) IF (ENABLE_TMWA) SET(SRCS ${SRCS} ${SRCS_TMWA}) @@ -2234,7 +2234,7 @@ ELSE() SET(SRCS ${SRCS}) ENDIF(ENABLE_TMWA) -ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_EVOL}) +ADD_EXECUTABLE(manaverse WIN32 ${SRCS} ${SRCS_EVOL}) #ADD_EXECUTABLE(dyecmd WIN32 ${DYE_CMD_SRCS}) IF (USE_SDL2) @@ -2255,7 +2255,7 @@ ELSE() ${SDLTTF_LIBRARY}) ENDIF (USE_SDL2) -TARGET_LINK_LIBRARIES(manaplus +TARGET_LINK_LIBRARIES(manaverse ${X11_LIBRARIES} ${SDL_LIBS} ${PNG_LIBRARIES} @@ -2265,7 +2265,7 @@ TARGET_LINK_LIBRARIES(manaplus ${OPENGL_LIBRARIES} ${LIBINTL_LIBRARIES} ${EXTRA_LIBRARIES}) -INSTALL(TARGETS manaplus RUNTIME DESTINATION ${PKG_BINDIR}) +INSTALL(TARGETS manaverse RUNTIME DESTINATION ${PKG_BINDIR}) #TARGET_LINK_LIBRARIES(dyecmd # ${SDLGFX_LIBRARIES} @@ -2286,9 +2286,9 @@ INSTALL(TARGETS manaplus RUNTIME DESTINATION ${PKG_BINDIR}) IF (CMAKE_SYSTEM_NAME STREQUAL SunOS) # we expect the SMCgtxt package to be present on Solaris; # the Solaris gettext is not API-compatible to GNU gettext - SET_TARGET_PROPERTIES(manaplus PROPERTIES LINK_FLAGS "-L/usr/local/lib") + SET_TARGET_PROPERTIES(manaverse PROPERTIES LINK_FLAGS "-L/usr/local/lib") # SET_TARGET_PROPERTIES(dyecmd PROPERTIES LINK_FLAGS "-L/usr/local/lib") ENDIF() -SET_TARGET_PROPERTIES(manaplus PROPERTIES COMPILE_FLAGS "${FLAGS}") +SET_TARGET_PROPERTIES(manaverse PROPERTIES COMPILE_FLAGS "${FLAGS}") #SET_TARGET_PROPERTIES(dyecmd PROPERTIES COMPILE_FLAGS "${DYE_FLAGS}") diff --git a/src/Makefile.am b/src/Makefile.am index f11d310e4..afd68ff9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,9 +9,9 @@ AUTOMAKE_OPTIONS = subdir-objects if ENABLE_GAMECLIENT if ENABLE_DYECMD -bin_PROGRAMS = manaplus dyecmd +bin_PROGRAMS = manaverse dyecmd else -bin_PROGRAMS = manaplus +bin_PROGRAMS = manaverse endif else if ENABLE_DYECMD @@ -52,97 +52,97 @@ dyecmd_CXXFLAGS = -std=c++11 \ -DPKG_DATADIR=\""$(pkgdatadir)/"\" \ -DLOCALEDIR=\""$(localedir)"\" \ -Wall -manaplus_CXXFLAGS = -std=c++11 \ +manaverse_CXXFLAGS = -std=c++11 \ -DPKG_DATADIR=\""$(pkgdatadir)/"\" \ -DLOCALEDIR=\""$(localedir)"\" \ -Wall if ENABLE_WERROR -manaplus_CXXFLAGS += -Werror +manaverse_CXXFLAGS += -Werror dyecmd_CXXFLAGS += -Werror endif if ENABLE_GLIBCDEBUG # _LIBCPP_DEBUG=1 probably giving false positives and it's hard to debug # disabled for now -manaplus_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=0 +manaverse_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=0 dyecmd_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=0 endif if ENABLE_COMMANDLINEPASSWORD -manaplus_CXXFLAGS += -DENABLE_COMMANDLINEPASSWORD +manaverse_CXXFLAGS += -DENABLE_COMMANDLINEPASSWORD endif if USE_X11 -manaplus_CXXFLAGS += -DUSE_X11 +manaverse_CXXFLAGS += -DUSE_X11 dyecmd_CXXFLAGS += -DUSE_X11 endif if ENABLE_ASSERTS -manaplus_CXXFLAGS += -DENABLE_ASSERTS +manaverse_CXXFLAGS += -DENABLE_ASSERTS dyecmd_CXXFLAGS += -DENABLE_ASSERTS if HAVE_RDYNAMIC -manaplus_LDFLAGS = -rdynamic +manaverse_LDFLAGS = -rdynamic dyecmd_LDFLAGS = -rdynamic endif endif if HAVE_EXECINFO -manaplus_CXXFLAGS += -DHAVE_EXECINFO +manaverse_CXXFLAGS += -DHAVE_EXECINFO dyecmd_CXXFLAGS += -DHAVE_EXECINFO endif if HAVE_GLEXT -manaplus_CXXFLAGS += -DHAVE_GLEXT +manaverse_CXXFLAGS += -DHAVE_GLEXT dyecmd_CXXFLAGS += -DHAVE_GLEXT endif if ENABLE_PUGIXML -manaplus_CXXFLAGS += -DENABLE_PUGIXML +manaverse_CXXFLAGS += -DENABLE_PUGIXML dyecmd_CXXFLAGS += -DENABLE_PUGIXML endif if ENABLE_LIBXML -manaplus_CXXFLAGS += -DENABLE_LIBXML +manaverse_CXXFLAGS += -DENABLE_LIBXML dyecmd_CXXFLAGS += -DENABLE_LIBXML endif if ENABLE_TINYXML2 -manaplus_CXXFLAGS += -DENABLE_TINYXML2 +manaverse_CXXFLAGS += -DENABLE_TINYXML2 dyecmd_CXXFLAGS += -DENABLE_TINYXML2 if USE_TINYXML_OLD -manaplus_CXXFLAGS += -DUSE_TINYXML_OLD +manaverse_CXXFLAGS += -DUSE_TINYXML_OLD dyecmd_CXXFLAGS += -DUSE_TINYXML_OLD endif endif if ENABLE_PORTABLE dyecmd_CXXFLAGS += -DENABLE_PORTABLE -manaplus_CXXFLAGS += -DENABLE_PORTABLE +manaverse_CXXFLAGS += -DENABLE_PORTABLE endif if ENABLE_CUSTOMNLS dyecmd_CXXFLAGS += -DENABLE_CUSTOMNLS -manaplus_CXXFLAGS += -DENABLE_CUSTOMNLS +manaverse_CXXFLAGS += -DENABLE_CUSTOMNLS endif if ENABLE_CHECKPLUGIN dyecmd_CXXFLAGS += -DENABLE_CHECKPLUGIN -fplugin=../build/checkplugin.so -fplugin-arg-checkplugin-command=detectnullpointers -manaplus_CXXFLAGS += -DENABLE_CHECKPLUGIN -fplugin=../build/checkplugin.so -fplugin-arg-checkplugin-command=detectnullpointers +manaverse_CXXFLAGS += -DENABLE_CHECKPLUGIN -fplugin=../build/checkplugin.so -fplugin-arg-checkplugin-command=detectnullpointers endif if USE_OPENGL dyecmd_CXXFLAGS += -DUSE_OPENGL -manaplus_CXXFLAGS += -DUSE_OPENGL +manaverse_CXXFLAGS += -DUSE_OPENGL endif if ENABLE_OPENGLERRORS dyecmd_CXXFLAGS += -DOPENGLERRORS -manaplus_CXXFLAGS += -DOPENGLERRORS +manaverse_CXXFLAGS += -DOPENGLERRORS endif if ENABLE_MEM_DEBUG dyecmd_CXXFLAGS += -DENABLE_MEM_DEBUG -DDEBUG_DUMP_LEAKS -manaplus_CXXFLAGS += -DENABLE_MEM_DEBUG -DDEBUG_DUMP_LEAKS +manaverse_CXXFLAGS += -DENABLE_MEM_DEBUG -DDEBUG_DUMP_LEAKS -manaplus_SOURCES = debug/nvwa/_nvwa.h \ +manaverse_SOURCES = debug/nvwa/_nvwa.h \ debug/nvwa/c++11.h \ debug/nvwa/debug_new.cpp \ debug/nvwa/debug_new.h \ @@ -155,15 +155,15 @@ dyecmd_SOURCES = debug/nvwa/_nvwa.h \ debug/nvwa/fast_mutex.h \ debug/nvwa/static_assert.h else -manaplus_SOURCES = +manaverse_SOURCES = dyecmd_SOURCES = endif if ENABLE_STLDEBUG dyecmd_CXXFLAGS += -DENABLE_STLDEBUG -manaplus_CXXFLAGS += -DENABLE_STLDEBUG +manaverse_CXXFLAGS += -DENABLE_STLDEBUG -manaplus_SOURCES += debug/mse/msemsevector.h \ +manaverse_SOURCES += debug/mse/msemsevector.h \ debug/mse/msemstdvector.h \ debug/mse/mseprimitives.h dyecmd_SOURCES += debug/mse/msemsevector.h \ @@ -172,20 +172,20 @@ dyecmd_SOURCES += debug/mse/msemsevector.h \ endif if MINGW -manaplus_SOURCES += manaplus.rc -dyecmd_SOURCES += manaplus.rc +manaverse_SOURCES += manaverse.rc +dyecmd_SOURCES += manaverse.rc endif dyecmd_CXXFLAGS += -DDYECMD dyecmd_SOURCES += progs/dyecmd/dyemain.cpp if USE_MUMBLE -manaplus_CXXFLAGS += -DUSE_MUMBLE +manaverse_CXXFLAGS += -DUSE_MUMBLE endif if ENABLE_CHECKS dyecmd_CXXFLAGS += -DENABLE_CHECKS -manaplus_CXXFLAGS += -DENABLE_CHECKS +manaverse_CXXFLAGS += -DENABLE_CHECKS endif BASE_SRC = @@ -193,14 +193,14 @@ BASE_SRC = if USE_SDL2 if USE_INTERNALSDLGFX dyecmd_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2 -manaplus_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2 +manaverse_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2 BASE_SRC += sdl2gfx/SDL2_framerate.cpp \ sdl2gfx/SDL2_framerate.h \ sdl2gfx/SDL2_rotozoom.cpp \ sdl2gfx/SDL2_rotozoom.h else dyecmd_CXXFLAGS += -DUSE_SDL2 -manaplus_CXXFLAGS += -DUSE_SDL2 +manaverse_CXXFLAGS += -DUSE_SDL2 endif endif @@ -1717,7 +1717,7 @@ SRC = ${BASE_SRC} \ progs/manaverse/gui/viewport.h if ENABLE_TMWA -manaplus_CXXFLAGS += -DTMWA_SUPPORT +manaverse_CXXFLAGS += -DTMWA_SUPPORT SRC += \ enums/magicschool.h \ gui/models/magicschoolmodel.h \ @@ -2129,10 +2129,10 @@ dyecmd_SOURCES += progs/dyecmd/gui/viewport.cpp \ progs/dyecmd/actions/windows.cpp if ENABLE_GAMECLIENT -manaplus_SOURCES += ${SRC} +manaverse_SOURCES += ${SRC} endif -manaplustests_CXXFLAGS += ${manaplus_CXXFLAGS} \ +manaplustests_CXXFLAGS += ${manaverse_CXXFLAGS} \ -DUNITTESTS manaplustests_LDFLAGS = if ENABLE_PUGIXML @@ -2255,7 +2255,7 @@ endif EXTRA_DIST = CMakeLists.txt \ winver.h.in \ - manaplus.rc \ + manaverse.rc \ SDLMain.m # set the include path found by configure diff --git a/src/commandline.cpp b/src/commandline.cpp index 982078635..951f2c655 100644 --- a/src/commandline.cpp +++ b/src/commandline.cpp @@ -42,16 +42,17 @@ static void printHelp() { std::cout << // TRANSLATORS: command line help - _("manaplus [options] [manaplus-file]") << + _("manaverse [options] [manaverse-file]") << std::endl << std::endl << // TRANSLATORS: command line help - _("[manaplus-file] : The manaplus file is an XML file (.manaplus)") << + _("[mana-file] : The mana file is an XML file " + "(.mana)") << std::endl << // TRANSLATORS: command line help _(" used to set custom parameters") << std::endl << // TRANSLATORS: command line help - _(" to the manaplus client.") << + _(" to the manaverse client.") << std::endl << std::endl << // TRANSLATORS: command line help _("Options:") << diff --git a/src/defaults.cpp b/src/defaults.cpp index eae83e1ab..4422f3158 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -492,7 +492,7 @@ void setBrandingDefaults(Configuration &cfg) AddDEF("wallpapersPath", ""); AddDEF("wallpapersFile", ""); AddDEF("appName", "ManaVerse"); - AddDEF("appIcon", "icons/manaplus"); + AddDEF("appIcon", "icons/manaverse"); AddDEF("loginMusic", "keprohm.ogg"); AddDEF("defaultServer", ""); AddDEF("defaultPort", DEFAULT_PORT); @@ -503,7 +503,7 @@ void setBrandingDefaults(Configuration &cfg) "https://tmw2.org/updates/serverlist.xml"); AddDEF("onlineServerFile", "serverlistplus.xml"); AddDEF("appShort", "mana"); - AddDEF("screenshots", "ManaPlus"); + AddDEF("screenshots", "ManaVerse"); AddDEF("defaultUpdateHost", ""); AddDEF("helpPath", ""); AddDEF("tagsPath", ""); diff --git a/src/dirs.cpp b/src/dirs.cpp index e564fe035..ebb86c13e 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -71,7 +71,7 @@ PRAGMA48(GCC diagnostic pop) #include "debug.h" #if defined __native_client__ -#define _nacl_dir std::string("/persistent/manaplus") +#define _nacl_dir std::string("/persistent/manaverse") #endif // defined __native_client__ #ifdef ANDROID @@ -117,7 +117,7 @@ void extractAssets() FILE *const file = fopen(fileName.c_str(), "w"); for (int f = 0; f < 100; f ++) { - std::string part = strprintf("manaplus-data.zip%u%u", + std::string part = strprintf("manaverse-data.zip%u%u", CAST_U32(f / 10), CAST_U32(f % 10)); logger->log("testing asset: " + part); @@ -141,7 +141,7 @@ void extractAssets() const std::string fileName2 = pathJoin(getenv("APPDIR"), "locale.zip"); FILE *const file2 = fopen(fileName2.c_str(), "w"); - SDL_RWops *const rw = SDL_RWFromFile("manaplus-locale.zip", "r"); + SDL_RWops *const rw = SDL_RWFromFile("manaverse-locale.zip", "r"); if (rw) { const int size = SDL_RWsize(rw); @@ -250,7 +250,7 @@ void Dirs::mountDataDir() { std::string path = settings.options.brandingPath; - // Strip blah.manaplus from the path + // Strip *.mana from the path const int loc = CAST_S32(path.find_last_of('/')); if (loc > 0) @@ -344,19 +344,19 @@ void Dirs::initLocalDataDir() // Use Application Directory instead of .mana settings.localDataDir = pathJoin(VirtFs::getUserDir(), "Library/Application Support", - branding.getValue("appName", "ManaPlus")); + branding.getValue("appName", "ManaVerse")); #elif defined __HAIKU__ settings.localDataDir = pathJoin(VirtFs::getUserDir(), - "config/cache/Mana"); + "config/cache/ManaVerse"); #elif defined WIN32 settings.localDataDir = getSpecialFolderLocation(CSIDL_LOCAL_APPDATA); if (settings.localDataDir.empty()) settings.localDataDir = VirtFs::getUserDir(); settings.localDataDir = pathJoin(settings.localDataDir, - "Mana"); + "ManaVerse"); #elif defined __ANDROID__ settings.localDataDir = pathJoin(getSdStoragePath(), - branding.getValue("appShort", "ManaPlus"), + branding.getValue("appShort", "ManaVerse"), "local"); #elif defined __native_client__ settings.localDataDir = pathJoin(_nacl_dir, "local"); @@ -365,7 +365,7 @@ void Dirs::initLocalDataDir() #else // __APPLE__ settings.localDataDir = pathJoin(VirtFs::getUserDir(), - ".local/share/mana"); + ".local/share/manaverse"); #endif // __APPLE__ } @@ -401,11 +401,11 @@ void Dirs::initConfigDir() { #ifdef __APPLE__ settings.configDir = pathJoin(settings.localDataDir, - branding.getValue("appShort", "mana")); + branding.getValue("appShort", "manaverse")); #elif defined __HAIKU__ settings.configDir = pathJoin(VirtFs::getUserDir(), - "config/settings/Mana", - branding.getValue("appName", "ManaPlus")); + "config/settings/ManaVerse", + branding.getValue("appName", "ManaVerse")); #elif defined WIN32 settings.configDir = getSpecialFolderLocation(CSIDL_APPDATA); if (settings.configDir.empty()) @@ -416,11 +416,11 @@ void Dirs::initConfigDir() { settings.configDir = pathJoin(settings.configDir, "mana", - branding.getValue("appShort", "mana")); + branding.getValue("appShort", "manaverse")); } #elif defined __ANDROID__ settings.configDir = pathJoin(getSdStoragePath(), - branding.getValue("appShort", "ManaPlus"), + branding.getValue("appShort", "ManaVerse"), "config"); #elif defined __native_client__ settings.configDir = pathJoin(_nacl_dir, "config"); @@ -430,7 +430,7 @@ void Dirs::initConfigDir() settings.configDir = pathJoin(VirtFs::getUserDir(), ".config/mana", - branding.getValue("appShort", "mana")); + branding.getValue("appShort", "manaverse")); #endif // __APPLE__ logger->log("Generating config dir: " + settings.configDir); @@ -580,7 +580,7 @@ void Dirs::initScreenshotDir() if (config.getBoolValue("useScreenshotDirectorySuffix")) { const std::string configScreenshotSuffix = - branding.getValue("screenshots", "ManaPlus"); + branding.getValue("screenshots", "ManaVerse"); if (!configScreenshotSuffix.empty()) { diff --git a/src/fs/files.cpp b/src/fs/files.cpp index 1dcbb9962..9cd3bfb0e 100644 --- a/src/fs/files.cpp +++ b/src/fs/files.cpp @@ -60,7 +60,7 @@ void Files::extractLocale() const std::string dir = pathJoin("locale", *i); if (VirtFs::isDirectory(dir)) { - const std::string moFile = dir + "/LC_MESSAGES/manaplus.mo"; + const std::string moFile = dir + "/LC_MESSAGES/manaverse.mo"; if (VirtFs::exists((moFile))) { const std::string localFile = pathJoin(localDir, moFile); diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp index 76dba99f3..5388438c8 100644 --- a/src/fs/paths.cpp +++ b/src/fs/paths.cpp @@ -172,13 +172,13 @@ std::string removeLast(const std::string &str) #ifdef WIN32 std::string getSelfName() { - return "manaplus.exe"; + return "manaverse.exe"; } #elif defined(__APPLE__) std::string getSelfName() { - return "manaplus.exe"; + return "manaverse.exe"; } #elif defined __linux__ || defined __linux diff --git a/src/game.cpp b/src/game.cpp index 8b8706a03..30251db98 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -587,13 +587,13 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot, if (serverName.empty()) { screenShortStr = strprintf("%s_Screenshot_%s_", - branding.getValue("appName", "ManaPlus").c_str(), + branding.getValue("appName", "ManaVerse").c_str(), buffer); } else { screenShortStr = strprintf("%s_Screenshot_%s_%s_", - branding.getValue("appName", "ManaPlus").c_str(), + branding.getValue("appName", "ManaVerse").c_str(), serverName.c_str(), buffer); } diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index bbfd33db7..b72e9b783 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -418,7 +418,7 @@ void WindowManager::newChatMessage() void WindowManager::setIcon() { #if !defined(ANDROID) && !defined(__SWITCH__) - std::string iconFile = branding.getValue("appIcon", "icons/manaplus"); + std::string iconFile = branding.getValue("appIcon", "icons/manaverse"); #ifdef WIN32 iconFile.append(".ico"); #else // WIN32 diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 2ed01f4f3..d20c1aca0 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -1079,7 +1079,7 @@ void UpdaterWindow::loadMods(const std::string &dir, if (file.group.empty()) continue; std::string name = file.name; - if (strStartWith(name, "manaplus_")) + if (strStartWith(name, "manaverse_")) { const std::set<std::string>::const_iterator it = modsList.find(file.group); diff --git a/src/logger.cpp b/src/logger.cpp index ee95a85fe..f36d8cacd 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -51,14 +51,14 @@ #if defined(__ANDROID__) #include <android/log.h> #ifdef SPECIAL_LOGGING -#define SPECIALLOG(x) __android_log_print(ANDROID_LOG_INFO, "manaplus", x); +#define SPECIALLOG(x) __android_log_print(ANDROID_LOG_INFO, "manaverse", x); #define DSPECIALLOG(x) __android_log_print(ANDROID_LOG_VERBOSE, \ - "manaplus", x); + "manaverse", x); #else // SPECIAL_LOGGING #define SPECIALLOG(x) if (mDebugLog) \ - __android_log_print(ANDROID_LOG_INFO, "manaplus", x); + __android_log_print(ANDROID_LOG_INFO, "manaverse", x); #define DSPECIALLOG(x) if (mDebugLog) \ - __android_log_print(ANDROID_LOG_VERBOSE, "manaplus", x); + __android_log_print(ANDROID_LOG_VERBOSE, "manaverse", x); #endif // SPECIAL_LOGGING #elif defined __native_client__ #ifdef SPECIAL_LOGGING diff --git a/src/main.h b/src/main.h index 9b8d108a7..b08f1fcd7 100644 --- a/src/main.h +++ b/src/main.h @@ -158,10 +158,10 @@ #define SIMD_NAME "" #endif // SIMD_SUPPORTED -#define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \ -"; %s; " SDL_NAME ", " XML_NAME SIMD_NAME ", %s; 4144 v" SMALL_VERSION ")" +#define PACKAGE_EXTENDED_VERSION "ManaVerse (" PACKAGE_OS \ +"; %s; " SDL_NAME ", " XML_NAME SIMD_NAME ", %s; jak1 v" SMALL_VERSION ")" -#define FULL_VERSION "ManaPlus " SMALL_VERSION " " PACKAGE_OS ", " \ +#define FULL_VERSION "ManaVerse " SMALL_VERSION " " PACKAGE_OS ", " \ SDL_NAME ", " XML_NAME SIMD_NAME #ifdef ANDROID diff --git a/src/manaplus.rc b/src/manaplus.rc deleted file mode 100644 index b9b0d9e57..000000000 --- a/src/manaplus.rc +++ /dev/null @@ -1,24 +0,0 @@ -#include <windows.h> // include for version info constants - -#include "winver.h" - -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico" -tmw ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/tmw/icons/tmw-client.ico" - -1 VERSIONINFO -FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD -PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD -//FILETYPE VFT_APP -{ - BLOCK "StringFileInfo" { - BLOCK "040904E4" { - VALUE "CompanyName", "The ManaPlus Development Team" - VALUE "FileVersion", PACKAGE_VERSION "4144" - VALUE "FileDescription", "ManaPlus" - VALUE "LegalCopyright", "2004-2014 (C)" - VALUE "OriginalFilename", "manaplus.exe" - VALUE "ProductName", "ManaPlus MMORPG Client" - VALUE "ProductVersion", PACKAGE_VERSION "4144" - } - } -} diff --git a/src/manaverse.rc b/src/manaverse.rc new file mode 100644 index 000000000..57de91dbb --- /dev/null +++ b/src/manaverse.rc @@ -0,0 +1,24 @@ +#include <windows.h> // include for version info constants + +#include "winver.h" + +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaverse.ico" +tmw ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/tmw/icons/tmw-client.ico" + +1 VERSIONINFO +FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD +PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD +//FILETYPE VFT_APP +{ + BLOCK "StringFileInfo" { + BLOCK "040904E4" { + VALUE "CompanyName", "The ManaVerse Development Team" + VALUE "FileVersion", PACKAGE_VERSION "jak1" + VALUE "FileDescription", "ManaVerse" + VALUE "LegalCopyright", "2020-2023 (C)" + VALUE "OriginalFilename", "manaverse.exe" + VALUE "ProductName", "ManaVerse MMORPG Client" + VALUE "ProductVersion", PACKAGE_VERSION "jak1" + } + } +} diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 6785b9516..c997c1338 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -68,7 +68,7 @@ void EmoteDB::load() // Only load client emotes if they're missing in server if (mLastEmote < 20) { - loadSpecialXmlFile("graphics/sprites/manaplus_emotes.xml", + loadSpecialXmlFile("graphics/sprites/manaverse_emotes.xml", SkipError_false); } @@ -158,7 +158,7 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName, if ((rootNode == nullptr) || !xmlNameEqual(rootNode, "emotes")) { logger->log1("Emote Database: Error while loading" - " manaplus_emotes.xml!"); + " manaverse_emotes.xml!"); return; } @@ -181,7 +181,7 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName, if (id == -1) { reportAlways("Emote Database: Emote with missing ID in " - "manaplus_emotes.xml!") + "manaverse_emotes.xml!") continue; } const int altId = XML::getProperty(emoteNode, "altid", -1); diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index a385abbea..39b9b6fda 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -416,9 +416,9 @@ int TestLauncher::testInternal() Image *img[4]; img[0] = Theme::getImageFromTheme( - "graphics/sprites/manaplus_emotions.png"); + "graphics/sprites/manaverse_emotions.png"); img[1] = Theme::getImageFromTheme( - "graphics/sprites/manaplus_emotions.png"); + "graphics/sprites/manaverse_emotions.png"); img[2] = Theme::getImageFromTheme("graphics/sprites/arrow_left.png"); img[3] = Theme::getImageFromTheme("graphics/sprites/arrow_right.png"); int idx = 0; diff --git a/src/unittests/utils/xmlutils.cc b/src/unittests/utils/xmlutils.cc index 1028a99e0..64ca7e41f 100644 --- a/src/unittests/utils/xmlutils.cc +++ b/src/unittests/utils/xmlutils.cc @@ -141,7 +141,7 @@ TEST_CASE("xmlutils readXmlStringMap 1", "") std::map<std::string, std::string> arr; - readXmlStringMap("graphics/sprites/manaplus_emotes.xml", + readXmlStringMap("graphics/sprites/manaverse_emotes.xml", "emotes", "emote", "sprite", diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp index 33b366ad1..61a413866 100644 --- a/src/utils/gettexthelper.cpp +++ b/src/utils/gettexthelper.cpp @@ -108,7 +108,7 @@ void GettextHelper::initLang() #else // ENABLE_PORTABLE #ifdef __APPLE__ bindTextDomain((std::string(VirtFs::getBaseDir()) - .append("ManaPlus.app/Contents/Resources/locale/")).c_str()); + .append("ManaVerse.app/Contents/Resources/locale/")).c_str()); #else // __APPLE__ bindTextDomain(LOCALEDIR); @@ -130,8 +130,8 @@ void GettextHelper::initLang() else logger->log("locale empty"); } - bind_textdomain_codeset("manaplus", "UTF-8"); - textdomain("manaplus"); + bind_textdomain_codeset("manaverse", "UTF-8"); + textdomain("manaverse"); #elif defined(ENABLE_CUSTOMNLS) mainTranslator = new PoDict("en"); setLangEnv(); @@ -141,7 +141,7 @@ void GettextHelper::initLang() #ifdef ENABLE_NLS void GettextHelper::bindTextDomain(const char *const path) { - const char *const dir = bindtextdomain("manaplus", path); + const char *const dir = bindtextdomain("manaverse", path); if (dir) logger->log("bindtextdomain: %s", dir); else diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index e75ef4857..49cadaf63 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -61,7 +61,7 @@ void TranslationManager::loadDictionaryLang() void TranslationManager::loadGettextLang() { delete mainTranslator; - mainTranslator = loadLang(getLang(), "manaplus/", nullptr); + mainTranslator = loadLang(getLang(), "manaverse/", nullptr); } #endif // ENABLE_CUSTOMNLS diff --git a/tools/ci/branches/.gitlab-ci_header.yml b/tools/ci/branches/.gitlab-ci_header.yml index faeae1416..122e1d3d7 100644 --- a/tools/ci/branches/.gitlab-ci_header.yml +++ b/tools/ci/branches/.gitlab-ci_header.yml @@ -12,7 +12,7 @@ before_script: - ":; ${DOCKERRETRY} ${PMUPDATE} >logs/apt.log" - ":; ${DOCKERRETRY} ${PMINSTALL} ${PACKAGES} >>logs/apt.log" - ":; ./tools/ci/scripts/clonesrc.sh" - - ":; cd manaplus" + - ":; cd manaverse" image: debian:unstable diff --git a/tools/ci/branches/ci_checks/.gitlab-ci.yml b/tools/ci/branches/ci_checks/.gitlab-ci.yml index 57aa9ac1d..3864a34d8 100644 --- a/tools/ci/branches/ci_checks/.gitlab-ci.yml +++ b/tools/ci/branches/ci_checks/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml index ebc9c99e1..e2b326ea7 100644 --- a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_fedora/.gitlab-ci.yml b/tools/ci/branches/ci_fedora/.gitlab-ci.yml index d6a8c7b44..25a434113 100644 --- a/tools/ci/branches/ci_fedora/.gitlab-ci.yml +++ b/tools/ci/branches/ci_fedora/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml index 91d5117f4..d59a664dd 100644 --- a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc10/.gitlab-ci.yml b/tools/ci/branches/ci_gcc10/.gitlab-ci.yml index 9acfd5a02..f5c71e33d 100644 --- a/tools/ci/branches/ci_gcc10/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc10/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml index 57ef7311e..084601a79 100644 --- a/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc3/.gitlab-ci.yml b/tools/ci/branches/ci_gcc3/.gitlab-ci.yml index 82b58be9b..958775269 100644 --- a/tools/ci/branches/ci_gcc3/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc3/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -22,7 +22,7 @@ gcc-3_sdl1: - ./tools/ci/jobs/gcc3.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc3_sdl1 + image: registry.gitlab.com/manaverse/images:gentoo_gcc3_sdl1 <<: *job-push variables: PMUPDATE: "echo" @@ -36,7 +36,7 @@ gcc-3_sdl2: - ./tools/ci/jobs/gcc3.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc3_sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc3_sdl2 <<: *job-push variables: PMUPDATE: "echo" diff --git a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml index 5bb100707..cb4324d93 100644 --- a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml @@ -94,7 +94,8 @@ gentoo_gcc-4.9_tests: stage: build script: - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-gameclient - image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl1 + image: registry.gitlab.com/manaverse/images:gentoo_gcc49_sdl1 +>>>>>>> 8f19f7358 (Rename the program from ManaPlus to ManaVerse.) <<: *job-push variables: PMUPDATE: "echo" @@ -108,7 +109,8 @@ gentoo_gcc-4.9_tests_sdl2: stage: build script: - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-gameclient --with-sdl2 - image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc49_sdl2 +>>>>>>> 8f19f7358 (Rename the program from ManaPlus to ManaVerse.) <<: *job-push variables: PMUPDATE: "echo" diff --git a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml index c657d6e08..f61d3385d 100644 --- a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml @@ -37,7 +37,7 @@ gcc-4.1_sdl1: - ./tools/ci/jobs/gcc41.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl1 + image: registry.gitlab.com/manaverse/images:gentoo_gcc41_sdl1 <<: *job-push variables: PMUPDATE: "echo" @@ -53,7 +53,7 @@ gcc-4.1_sdl2: - ./tools/ci/jobs/gcc41.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc41_sdl2 <<: *job-push variables: PMUPDATE: "echo" @@ -69,7 +69,7 @@ gcc-4.3_sdl1: - ./tools/ci/jobs/gcc43.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl1 + image: registry.gitlab.com/manaverse/images:gentoo_gcc43_sdl1 <<: *job-push variables: PMUPDATE: "echo" @@ -85,7 +85,7 @@ gcc-4.3_sdl2: - ./tools/ci/jobs/gcc43.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc43_sdl2 <<: *job-push variables: PMUPDATE: "echo" diff --git a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml index 4173c2060..8b8a2a0fa 100644 --- a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml index 298300ff0..2e202b946 100644 --- a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml index c7b82a9aa..b313e5fa8 100644 --- a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml index 7586df0ae..e5ec598a0 100644 --- a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml index f3504aef3..e13ffb391 100644 --- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml index 29aaee53a..c4ab85379 100644 --- a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml index a39b9ebc5..ef62ea310 100644 --- a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc9/.gitlab-ci.yml b/tools/ci/branches/ci_gcc9/.gitlab-ci.yml index ff98223ed..1e0f4e672 100644 --- a/tools/ci/branches/ci_gcc9/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc9/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml index 401ba0ae0..7c08e549d 100644 --- a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml index 1952a8ec1..d5ad41856 100644 --- a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml +++ b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml index 27ecc3655..66c25fc0f 100644 --- a/tools/ci/branches/ci_main1/.gitlab-ci.yml +++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -89,7 +89,7 @@ gcc-gentoo_sdl1: script: - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc_sdl1 + image: registry.gitlab.com/manaverse/images:gentoo_gcc_sdl1 <<: *job-push variables: LOGFILE: gcc.log @@ -106,7 +106,7 @@ gcc-gentoo_sdl2: script: - ./tools/ci/jobs/any_compiler.sh --with-sdl2 --enable-werror - ./tools/ci/scripts/runtests.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc_sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc_sdl2 <<: *job-push variables: LOGFILE: gcc.log diff --git a/tools/ci/branches/ci_mse/.gitlab-ci.yml b/tools/ci/branches/ci_mse/.gitlab-ci.yml index 3f347f003..3552cc66c 100644 --- a/tools/ci/branches/ci_mse/.gitlab-ci.yml +++ b/tools/ci/branches/ci_mse/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_mxe/.gitlab-ci.yml b/tools/ci/branches/ci_mxe/.gitlab-ci.yml index a0d64cdcf..768054c94 100644 --- a/tools/ci/branches/ci_mxe/.gitlab-ci.yml +++ b/tools/ci/branches/ci_mxe/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -15,7 +15,7 @@ stages: artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -32,7 +32,7 @@ mxe_gcc6_shared_32_testsbin: when: always expire_in: 1 week dependencies: [] - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32 + image: registry.gitlab.com/manaverse/mxe:gcc6_shared_32 variables: PACKAGES: bash CROSS: i686-w64-mingw32.shared @@ -51,7 +51,7 @@ mxe_gcc6_shared_64_testsbin: when: always expire_in: 1 week dependencies: [] - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64 + image: registry.gitlab.com/manaverse/mxe:gcc6_shared_64 variables: PACKAGES: bash CROSS: x86_64-w64-mingw32.shared diff --git a/tools/ci/branches/ci_site/.gitlab-ci.yml b/tools/ci/branches/ci_site/.gitlab-ci.yml index 66fbe53d4..704c92c9a 100644 --- a/tools/ci/branches/ci_site/.gitlab-ci.yml +++ b/tools/ci/branches/ci_site/.gitlab-ci.yml @@ -17,7 +17,7 @@ before_script: artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -26,7 +26,7 @@ before_script: artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -35,7 +35,7 @@ gcc-6_tests_gcov: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-gameclient <<: *job-push @@ -54,7 +54,7 @@ gcc-6_sdl2_tests_gcov: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-gameclient <<: *job-push variables: @@ -72,12 +72,12 @@ doxygen: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/doxygen.sh artifacts: paths: - - manaplus/doxygen + - manaverse/doxygen expire_in: 3 week when: always dependencies: [] @@ -93,11 +93,11 @@ gitstats: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/jobs/gitstats.sh artifacts: paths: - - manaplus/stats + - manaverse/stats expire_in: 3 week when: always dependencies: [] @@ -111,12 +111,12 @@ gitstatsh: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/jobs/gitstatsh.sh image: debian:buster artifacts: paths: - - manaplus/stats2 + - manaverse/stats2 expire_in: 3 week when: always dependencies: [] @@ -132,10 +132,10 @@ pages: stage: stats script: - rm -rf artifacts || true - - mv manaplus artifacts + - mv manaverse artifacts - ./tools/ci/scripts/clonesrc.sh - - mv artifacts/* manaplus/ - - cd manaplus + - mv artifacts/* manaverse/ + - cd manaverse - ./tools/ci/jobs/pages.sh dependencies: - doxygen diff --git a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml index ad0e743f8..17deae744 100644 --- a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml +++ b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/master/.gitlab-ci.yml b/tools/ci/branches/master/.gitlab-ci.yml index 7c560cfc4..d7c4e18bd 100644 --- a/tools/ci/branches/master/.gitlab-ci.yml +++ b/tools/ci/branches/master/.gitlab-ci.yml @@ -186,7 +186,7 @@ mxe_gcc6_shared_32: - ls /mxe - ./tools/ci/jobs/mxe_gcc6.sh <<: *job-push - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32 + image: registry.gitlab.com/manaverse/mxe:gcc6_shared_32 variables: PACKAGES: bash CROSS: i686-w64-mingw32.shared @@ -199,7 +199,7 @@ mxe_gcc6_shared_64: - ls /mxe - ./tools/ci/jobs/mxe_gcc6.sh <<: *job-push - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64 + image: registry.gitlab.com/manaverse/mxe:gcc6_shared_64 variables: PACKAGES: bash CROSS: x86_64-w64-mingw32.shared @@ -479,7 +479,7 @@ triggers: script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc10.sh - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaverse - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: @@ -502,7 +502,7 @@ triggers: - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - - ldd ./src/manaplus | grep "libasan" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -524,7 +524,7 @@ triggers: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - - ldd ./src/manaplus | grep "libasan" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -549,7 +549,7 @@ triggers: - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - - ldd ./src/manaplus | grep "libasan" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -573,7 +573,7 @@ triggers: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - - ldd ./src/manaplus | grep "libasan" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL diff --git a/tools/ci/jobs/gitstatsh.sh b/tools/ci/jobs/gitstatsh.sh index 376d31f43..e4f6dfbb9 100755 --- a/tools/ci/jobs/gitstatsh.sh +++ b/tools/ci/jobs/gitstatsh.sh @@ -13,7 +13,7 @@ check_error $? git log --stat --no-merges --summary --decorate=false >repo_log check_error $? cd gitstatsh/v1 -python main.py ManaPlus ../../repo_log +python main.py ManaVerse ../../repo_log check_error $? mv web ../../stats2 check_error $? diff --git a/tools/ci/jobs/xcode.sh b/tools/ci/jobs/xcode.sh index b07148b13..8649c6ba8 100755 --- a/tools/ci/jobs/xcode.sh +++ b/tools/ci/jobs/xcode.sh @@ -8,4 +8,4 @@ cd ../../Xcode || exit 1 ./build.sh || exit 1 ./pack.sh || exit 1 ls -la build || exit 1 -cp build/manaplus.dmg "${artifacts}/" || exit 1 +cp build/manaverse.dmg "${artifacts}/" || exit 1 diff --git a/tools/ci/scripts/clonesrc.sh b/tools/ci/scripts/clonesrc.sh index efb0596d3..60d231c9f 100755 --- a/tools/ci/scripts/clonesrc.sh +++ b/tools/ci/scripts/clonesrc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -rm -rf manaplus || true -./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://gitlab.com/manaplus/manaplus.git manaplus" || exit 1 -mkdir manaplus/logs || exit 1 +rm -rf manaverse || true +./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://git.themanaworld.org/mana/plus.git manaverse" || exit 1 +mkdir manaverse/logs || exit 1 diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh index cd716cf94..f994b13bb 100755 --- a/tools/ci/scripts/init.sh +++ b/tools/ci/scripts/init.sh @@ -248,7 +248,7 @@ function run_tarball { cd $1 echo "tar xf ../*.tar.xz" tar xf ../*.tar.xz - cd manaplus* + cd manaverse* } function run_mplint { diff --git a/tools/ci/scripts/rundyecmd.sh b/tools/ci/scripts/rundyecmd.sh index fc399f822..c6807d91a 100755 --- a/tools/ci/scripts/rundyecmd.sh +++ b/tools/ci/scripts/rundyecmd.sh @@ -2,8 +2,8 @@ function testdye { rm test1.png || true - echo ./src/dyecmd "data/icons/manaplus.png|$1" test1.png - ./src/dyecmd "data/icons/manaplus.png|$1" test1.png || exit 1 + echo ./src/dyecmd "data/icons/manaverse.png|$1" test1.png + ./src/dyecmd "data/icons/manaverse.png|$1" test1.png || exit 1 ls test1.png || exit 1 rm test1.png || true } diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh index 622e04da0..523bd4b41 100755 --- a/tools/ci/scripts/runtest.sh +++ b/tools/ci/scripts/runtest.sh @@ -6,19 +6,19 @@ function check_is_run { echo "Error: process look like crashed" cat logs/run.log echo "Run with gdb" - cp ./src/manaplus ./logs/ + cp ./src/manaverse ./logs/ cp -r core* ./logs/ sleep 10 COREFILE=$(find . -maxdepth 1 -name "core*" | head -n 1) if [[ -f "$COREFILE" ]]; then - gdb -c "$COREFILE" ./src/manaplus -ex "thread apply all bt" -ex "set pagination 0" -batch + gdb -c "$COREFILE" ./src/manaverse -ex "thread apply all bt" -ex "set pagination 0" -batch fi exit 1 fi } function check_assert { - grep -A 20 "Assert:" "${HOME}/.local/share/mana/manaverse.log" + grep -A 20 "Assert:" "${HOME}/.local/share/manaverse/manaverse.log" if [ "$?" == 0 ]; then echo "Assert found in log" exit 1 @@ -31,9 +31,9 @@ function wait_for_servers_list { echo "wait for servers list ${n}" check_is_run # check here - grep "Skipping servers list update" "${HOME}/.local/share/mana/manaverse.log" && return - grep "Servers list updated" "${HOME}/.local/share/mana/manaverse.log" && return - grep "Error: servers list updating error" "${HOME}/.local/share/mana/manaverse.log" + grep "Skipping servers list update" "${HOME}/.local/share/manaverse/manaverse.log" && return + grep "Servers list updated" "${HOME}/.local/share/manaverse/manaverse.log" && return + grep "Error: servers list updating error" "${HOME}/.local/share/manaverse/manaverse.log" if [ "$?" == 0 ]; then echo "Servers list downloading error" exit 1 @@ -50,9 +50,9 @@ function wait_for_servers_list { } function run { - ./src/manaplus --hide-cursor --enable-ipc --renderer=0 >logs/run.log 2>&1 & + ./src/manaverse --hide-cursor --enable-ipc --renderer=0 >logs/run.log 2>&1 & export PID=$! - echo "manaplus PID: ${PID}" + echo "manaverse PID: ${PID}" sleep 15 echo "pause after run" wait_for_servers_list @@ -95,16 +95,16 @@ function send_command { } function check_exists { - if [ ! -f "logs/home/Desktop/ManaPlus/$1" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$1" ]; then sleep 7 - if [ ! -f "logs/home/Desktop/ManaPlus/$1" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$1" ]; then echo "Error: image $1 not exists" exit 1 fi fi - if [ ! -f "logs/home/Desktop/ManaPlus/$2" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$2" ]; then sleep 7 - if [ ! -f "logs/home/Desktop/ManaPlus/$2" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$2" ]; then echo "Error: image $2 not exists" exit 1 fi @@ -113,7 +113,7 @@ function check_exists { function imagesdiff { check_exists "$1" "$2" - diff "logs/home/Desktop/ManaPlus/$1" "logs/home/Desktop/ManaPlus/$2" + diff "logs/home/Desktop/ManaVerse/$1" "logs/home/Desktop/ManaVerse/$2" if [ "$?" == 0 ]; then echo "Error: images '$1' and '$2' is same." exit 1 @@ -122,7 +122,7 @@ function imagesdiff { function imagessame { check_exists "$1" "$2" - diff "logs/home/Desktop/ManaPlus/$1" "logs/home/Desktop/ManaPlus/$2" + diff "logs/home/Desktop/ManaVerse/$1" "logs/home/Desktop/ManaVerse/$2" if [ "$?" != 0 ]; then echo "Error: images '$1' and '$2' is different." exit 1 @@ -233,7 +233,7 @@ imagesdiff new_server.png about.png send_command "/sendmousekey 500 20 1" send_command "/screenshot about.png" -# open about manaplus page +# open about manaverse page send_command "/sendmousekey 300 ${ABOUTYOFFSET} 1" send_command "/screenshot about2.png" imagesdiff about.png about2.png diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh index 1afe5815f..cf781ff1b 100755 --- a/tools/ci/scripts/runtests.sh +++ b/tools/ci/scripts/runtests.sh @@ -22,12 +22,12 @@ echo "clean config runs" n=0 while true; do echo "run test ${n}" - rm "${HOME}/.config/mana/mana/config.xml" - rm "/root/.config/mana/mana/config.xml" - rm "${HOME}/.config/mana/mana/serverlistplus.xml" - rm "/root/.config/mana/mana/serverlistplus.xml" - rm "${HOME}/.local/share/mana/manaverse.log" - rm "/root/.local/share/mana/manaverse.log" + rm "${HOME}/.config/mana/manaverse/config.xml" + rm "/root/.config/mana/manaverse/config.xml" + rm "${HOME}/.config/mana/manaverse/serverlistplus.xml" + rm "/root/.config/mana/manaverse/serverlistplus.xml" + rm "${HOME}/.local/share/manaverse/manaverse.log" + rm "/root/.local/share/manaverse/manaverse.log" ./tools/ci/scripts/runtest.sh if [ "$?" != 0 ]; then exit 1 @@ -45,8 +45,8 @@ echo "existing config runs" n=0 while true; do echo "run test ${n}" - rm "${HOME}/.local/share/mana/manaverse.log" - rm "/root/.local/share/mana/manaverse.log" + rm "${HOME}/.local/share/manaverse/manaverse.log" + rm "/root/.local/share/manaverse/manaverse.log" ./tools/ci/scripts/runtest.sh if [ "$?" != 0 ]; then exit 1 diff --git a/tools/doxygen/doxygen.conf b/tools/doxygen/doxygen.conf index 76ca1ea11..fcf2b170b 100644 --- a/tools/doxygen/doxygen.conf +++ b/tools/doxygen/doxygen.conf @@ -4,10 +4,10 @@ c# Doxyfile 1.8.8 # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = "ManaPlus" +PROJECT_NAME = "ManaVerse" PROJECT_NUMBER = PROJECT_BRIEF = -PROJECT_LOGO = data/icons/manaplus.png +PROJECT_LOGO = data/icons/manaverse.png OUTPUT_DIRECTORY = doxygen CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO |
