diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | Mana.icns (renamed from The Mana World.icns) | bin | 65136 -> 65136 bytes | |||
| -rw-r--r-- | README.cmake | 14 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/icons/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | data/icons/Makefile.am | 8 | ||||
| -rw-r--r-- | data/icons/Mana.icns (renamed from data/icons/The Mana World.icns) | bin | 65136 -> 65136 bytes | |||
| -rw-r--r-- | data/icons/mana.ico (renamed from data/icons/tmw.ico) | bin | 22382 -> 22382 bytes | |||
| -rw-r--r-- | data/icons/mana.png (renamed from data/icons/tmw.png) | bin | 18176 -> 18176 bytes | |||
| -rw-r--r-- | data/icons/mana.xpm (renamed from data/icons/tmw.xpm) | 0 | ||||
| -rw-r--r-- | mana.cbp (renamed from tmw.cbp) | 0 | ||||
| -rw-r--r-- | mana.desktop (renamed from tmw.desktop) | 7 | ||||
| -rw-r--r-- | mana.menu (renamed from tmw.menu) | 0 | ||||
| -rw-r--r-- | packaging/debian/mana-data.install | 5 | ||||
| -rw-r--r-- | packaging/debian/mana.desktop (renamed from packaging/debian/tmw.desktop) | 5 | ||||
| -rw-r--r-- | packaging/debian/mana.docs (renamed from packaging/debian/tmw.docs) | 0 | ||||
| -rw-r--r-- | packaging/debian/mana.install | 5 | ||||
| -rw-r--r-- | packaging/debian/mana.sgml (renamed from packaging/debian/tmw.sgml) | 6 | ||||
| -rw-r--r-- | packaging/debian/tmw-data.install | 5 | ||||
| -rw-r--r-- | packaging/debian/tmw.install | 5 | ||||
| -rw-r--r-- | packaging/windows/setup.nsi | 66 |
22 files changed, 73 insertions, 71 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 11d20a0a..4d9238d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(TMW) +PROJECT(MANA) SET(VERSION 0.0.29.1) @@ -17,7 +17,7 @@ IF (WIN32) SET(PKG_BINDIR ".") SET(LOCALEDIR ".") ELSE (WIN32) - SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tmw) + SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana) SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) ENDIF (WIN32) @@ -29,4 +29,4 @@ IF (GETTEXT_FOUND AND ENABLE_NLS) ADD_SUBDIRECTORY(po) ENDIF() -INSTALL(FILES tmw.desktop DESTINATION share/applications) +INSTALL(FILES mana.desktop DESTINATION share/applications) diff --git a/Makefile.am b/Makefile.am index e8cec1f2..de06657f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,12 +3,12 @@ SUBDIRS = data docs po src desktopdir = $(datarootdir)/applications -desktop_DATA = tmw.desktop +desktop_DATA = mana.desktop # Extra files to include EXTRA_DIST = $(desktop_DATA) \ - tmw.cbp \ - tmw.menu + mana.cbp \ + mana.menu # Autopoint m4 stuff ACLOCAL_AMFLAGS = -I m4 diff --git a/The Mana World.icns b/Mana.icns Binary files differindex 7230a099..7230a099 100644 --- a/The Mana World.icns +++ b/Mana.icns diff --git a/README.cmake b/README.cmake index 5796a5c8..d703ecb9 100644 --- a/README.cmake +++ b/README.cmake @@ -1,5 +1,5 @@ This readme explains the most common parameters to CMake needed for -building tmw. +building mana. Basic syntax ------------ @@ -25,13 +25,13 @@ How do I... - Add additional include search directories? CMAKE_INCLUDE_PATH=/include/path -For example, to build tmw to install in /opt/tmw, with libraries in -/build/tmw/lib, and SDL-headers in /build/tmw/include/SDL you'd use +For example, to build mana to install in /opt/mana, with libraries in +/build/mana/lib, and SDL-headers in /build/mana/include/SDL you'd use the following command: -cmake -D CMAKE_PREFIX_PATH=/build/tmw \ - -D CMAKE_INCLUDE_PATH=/build/tmw/include/SDL \ - -D CMAKE_INSTALL_PREFIX=/opt/tmw . +cmake -D CMAKE_PREFIX_PATH=/build/mana \ + -D CMAKE_INCLUDE_PATH=/build/mana/include/SDL \ + -D CMAKE_INSTALL_PREFIX=/opt/mana . Crosscompiling using CMake @@ -48,7 +48,7 @@ SET(CMAKE_SYSTEM_NAME Windows) SET(CMAKE_C_COMPILER i386-mingw32-gcc) SET(CMAKE_CXX_COMPILER i386-mingw32-g++) # here is the target environment located -SET(CMAKE_FIND_ROOT_PATH /build/mingw32 /build/tmw-libs ) +SET(CMAKE_FIND_ROOT_PATH /build/mingw32 /build/mana-libs ) # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search # programs in the host environment diff --git a/data/Makefile.am b/data/Makefile.am index 62672207..c8afe4a5 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS = fonts graphics help icons -tmwdatadir = $(pkgdatadir)/data +manadatadir = $(pkgdatadir)/data diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt index e50c7ab9..59ffe676 100644 --- a/data/icons/CMakeLists.txt +++ b/data/icons/CMakeLists.txt @@ -1,7 +1,7 @@ SET(FILES - tmw.png + mana.png ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons) -INSTALL(FILES "tmw.png" DESTINATION share/pixmaps) +INSTALL(FILES "mana.png" DESTINATION share/pixmaps) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 71442a50..ec9b438d 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,15 +1,15 @@ iconsdir = $(pkgdatadir)/data/icons -icons_DATA = tmw.png \ - tmw.xpm +icons_DATA = mana.png \ + mana.xpm install-data-local: $(mkinstalldirs) $(DESTDIR)$(datarootdir)/pixmaps - $(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datarootdir)/pixmaps/tmw.png + $(INSTALL) $(srcdir)/mana.png $(DESTDIR)$(datarootdir)/pixmaps/mana.png uninstall-local: - rm -f $(DESTDIR)$(datarootdir)/pixmaps/tmw.png + rm -f $(DESTDIR)$(datarootdir)/pixmaps/mana.png EXTRA_DIST = \ $(icons_DATA) diff --git a/data/icons/The Mana World.icns b/data/icons/Mana.icns Binary files differindex 7230a099..7230a099 100644 --- a/data/icons/The Mana World.icns +++ b/data/icons/Mana.icns diff --git a/data/icons/tmw.ico b/data/icons/mana.ico Binary files differindex 61d559a3..61d559a3 100644 --- a/data/icons/tmw.ico +++ b/data/icons/mana.ico diff --git a/data/icons/tmw.png b/data/icons/mana.png Binary files differindex 93e6c9ae..93e6c9ae 100644 --- a/data/icons/tmw.png +++ b/data/icons/mana.png diff --git a/data/icons/tmw.xpm b/data/icons/mana.xpm index 06ec2865..06ec2865 100644 --- a/data/icons/tmw.xpm +++ b/data/icons/mana.xpm diff --git a/tmw.desktop b/mana.desktop index 49d8a59a..a046ea2d 100644 --- a/tmw.desktop +++ b/mana.desktop @@ -1,6 +1,7 @@ + [Desktop Entry] Version=1.0 -Name=The Mana World +Name=Mana Name[fr]=Le Monde de Mana Name[sv]=Manavärlden Comment=An on-line fantasy role playing game @@ -9,9 +10,9 @@ 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=tmw +Exec=mana StartupNotify=false Terminal=false Type=Application -Icon=tmw +Icon=mana Categories=Application;Game; diff --git a/packaging/debian/mana-data.install b/packaging/debian/mana-data.install new file mode 100644 index 00000000..82a37bb3 --- /dev/null +++ b/packaging/debian/mana-data.install @@ -0,0 +1,5 @@ +data/graphics/gui/*.png usr/share/games/mana/data/graphics/gui +data/graphics/images/*.png usr/share/games/mana/data/graphics/images +data/graphics/images/ambient/*.png usr/share/games/mana/data/graphics/images/ambient +data/graphics/tiles/*.png usr/share/games/mana/data/graphics/tiles +data/help/*.txt usr/share/games/mana/data/help diff --git a/packaging/debian/tmw.desktop b/packaging/debian/mana.desktop index f094f668..e97e4553 100644 --- a/packaging/debian/tmw.desktop +++ b/packaging/debian/mana.desktop @@ -1,6 +1,7 @@ + [Desktop Entry] Version=1.0 -Name=The Mana World +Name=Mana Name[fr]=Le Monde de Mana Comment=An online fantasy role playing game Comment[fr]=Un jeu en ligne dans un univers fantastique @@ -11,5 +12,5 @@ Exec=tmw StartupNotify=false Terminal=false Type=Game -Icon=tmw.png +Icon=mana.png Categories=Game diff --git a/packaging/debian/tmw.docs b/packaging/debian/mana.docs index d622a527..d622a527 100644 --- a/packaging/debian/tmw.docs +++ b/packaging/debian/mana.docs diff --git a/packaging/debian/mana.install b/packaging/debian/mana.install new file mode 100644 index 00000000..861709e9 --- /dev/null +++ b/packaging/debian/mana.install @@ -0,0 +1,5 @@ +debian/mana.desktop usr/share/applications +debian/mana.xpm usr/share/pixmaps +data/icons/mana.png usr/share/icons +docs/mana.6 usr/share/man/man6 +src/mana usr/games diff --git a/packaging/debian/tmw.sgml b/packaging/debian/mana.sgml index 0ed18199..257c948d 100644 --- a/packaging/debian/tmw.sgml +++ b/packaging/debian/mana.sgml @@ -26,8 +26,8 @@ manpage.1: manpage.sgml <!ENTITY dhsection "<manvolnum>6</manvolnum>"> <!ENTITY dhemail "<email>bertram@cegetel.net</email>"> <!ENTITY dhusername "FERREIRA Yohann"> - <!ENTITY dhucpackage "<refentrytitle>TMW</refentrytitle>"> - <!ENTITY dhpackage "tmw"> + <!ENTITY dhucpackage "<refentrytitle>Mana</refentrytitle>"> + <!ENTITY dhpackage "mana"> <!ENTITY debian "<productname>Debian</productname>"> <!ENTITY gnu "<acronym>GNU</acronym>"> @@ -57,7 +57,7 @@ manpage.1: manpage.sgml <refnamediv> <refname>&dhpackage;</refname> - <refpurpose>tmw is the abreviation of The Mana World : A Fantasy Online Game</refpurpose> + <refpurpose>Mana is the abreviation of The Mana World : A Fantasy Online Game</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> diff --git a/packaging/debian/tmw-data.install b/packaging/debian/tmw-data.install deleted file mode 100644 index c9f6cb7b..00000000 --- a/packaging/debian/tmw-data.install +++ /dev/null @@ -1,5 +0,0 @@ -data/graphics/gui/*.png usr/share/games/tmw/data/graphics/gui -data/graphics/images/*.png usr/share/games/tmw/data/graphics/images -data/graphics/images/ambient/*.png usr/share/games/tmw/data/graphics/images/ambient -data/graphics/tiles/*.png usr/share/games/tmw/data/graphics/tiles -data/help/*.txt usr/share/games/tmw/data/help diff --git a/packaging/debian/tmw.install b/packaging/debian/tmw.install deleted file mode 100644 index 037ccf54..00000000 --- a/packaging/debian/tmw.install +++ /dev/null @@ -1,5 +0,0 @@ -debian/tmw.desktop usr/share/applications -debian/tmw.xpm usr/share/pixmaps -data/icons/tmw.png usr/share/icons -docs/tmw.6 usr/share/man/man6 -src/tmw usr/games diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index a9c433c9..ee0dd8bd 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -5,14 +5,14 @@ SetCompressor /SOLID lzma !define SRCDIR "..\.." ;--- (and without !defines ) --- -!System "upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d ${SRCDIR}\tmw.exe" +!System "upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d ${SRCDIR}\mana.exe" ; HM NIS Edit helper defines -!define PRODUCT_NAME "The Mana World" +!define PRODUCT_NAME "Mana" !define PRODUCT_VERSION "0.0.29.1" -!define PRODUCT_PUBLISHER "The Mana World Development Team" -!define PRODUCT_WEB_SITE "http://themanaworld.org" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\tmw.exe" +!define PRODUCT_PUBLISHER "Mana Development Team" +!define PRODUCT_WEB_SITE "http://manasource.org" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\mana.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" @@ -22,14 +22,14 @@ SetCompressor /SOLID lzma ; MUI Settings !define MUI_ABORTWARNING ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico" -!define MUI_ICON "${SRCDIR}\data\icons\tmw.ico" +!define MUI_ICON "${SRCDIR}\data\icons\mana.ico" ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico" -!define MUI_UNICON "${SRCDIR}\data\icons\tmw.ico" +!define MUI_UNICON "${SRCDIR}\data\icons\mana.ico" ;Language Selection Dialog Settings ;Remember the installer language !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" -!define MUI_LANGDLL_REGISTRY_KEY "Software\The Mana World" +!define MUI_LANGDLL_REGISTRY_KEY "Software\Mana" !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" !define MUI_WELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp" @@ -49,16 +49,16 @@ SetCompressor /SOLID lzma !insertmacro MUI_PAGE_INSTFILES ; Finish page !define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_RUN_FUNCTION RunTMW +!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 TMW website for the latest news, FAQs and support" +!define MUI_FINISHPAGE_LINK "Visit Mana website for the latest news, FAQs and support" !define MUI_FINISHPAGE_LINK_LOCATION "http://themanaworld.org" !insertmacro MUI_PAGE_FINISH -Function RunTMW +Function RunMana SetOutPath $INSTDIR -Exec "$INSTDIR\tmw.exe" +Exec "$INSTDIR\mana.exe" FunctionEnd Function changeFinishImage @@ -130,8 +130,8 @@ ReserveFile "setup_finish.bmp" ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "tmw-${PRODUCT_VERSION}-win32.exe" -InstallDir "$PROGRAMFILES\The Mana World" +OutFile "mana-${PRODUCT_VERSION}-win32.exe" +InstallDir "$PROGRAMFILES\Mana" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show @@ -146,9 +146,9 @@ Section "Core files (required)" SecCore SectionIn RO SetOutPath "$INSTDIR" SetOverwrite ifnewer - CreateDirectory "$SMPROGRAMS\The Mana World" - CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World.lnk" "$INSTDIR\tmw.exe" - CreateShortCut "$DESKTOP\The Mana World.lnk" "$INSTDIR\tmw.exe" + CreateDirectory "$SMPROGRAMS\Mana" + CreateShortCut "$SMPROGRAMS\Mana\Mana.lnk" "$INSTDIR\mana.exe" + CreateShortCut "$DESKTOP\Mana.lnk" "$INSTDIR\mana.exe" CreateDirectory "$INSTDIR\data" CreateDirectory "$INSTDIR\data\fonts" CreateDirectory "$INSTDIR\data\graphics" @@ -161,7 +161,7 @@ Section "Core files (required)" SecCore SetOverwrite ifnewer SetOutPath "$INSTDIR" - File "${SRCDIR}\tmw.exe" + File "${SRCDIR}\mana.exe" File "${SRCDIR}\*.dll" File "${SRCDIR}\AUTHORS" File "${SRCDIR}\COPYING" @@ -177,7 +177,7 @@ Section "Core files (required)" SecCore SetOutPath "$INSTDIR\data\help" File "${SRCDIR}\data\help\*.txt" SetOutPath "$INSTDIR\data\icons\" - File "${SRCDIR}\data\icons\tmw.ico" + File "${SRCDIR}\data\icons\mana.ico" SetOutPath "$INSTDIR\docs" File "${SRCDIR}\docs\FAQ.txt" SectionEnd @@ -208,18 +208,18 @@ SectionEnd Section -AdditionalIcons WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" - CreateShortCut "$SMPROGRAMS\The Mana World\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" - CreateShortCut "$SMPROGRAMS\The Mana World\Readme.lnk" "notepad.exe" "$INSTDIR\README" - CreateShortCut "$SMPROGRAMS\The Mana World\FAQ.lnk" "$INSTDIR\docs\FAQ.txt" - CreateShortCut "$SMPROGRAMS\The Mana World\Uninstall.lnk" "$INSTDIR\uninst.exe" + CreateShortCut "$SMPROGRAMS\Mana\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" + CreateShortCut "$SMPROGRAMS\Mana\Readme.lnk" "notepad.exe" "$INSTDIR\README" + CreateShortCut "$SMPROGRAMS\Mana\FAQ.lnk" "$INSTDIR\docs\FAQ.txt" + CreateShortCut "$SMPROGRAMS\Mana\Uninstall.lnk" "$INSTDIR\uninst.exe" SectionEnd Section -Post WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\tmw.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\mana.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\tmw.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\mana.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}" @@ -230,18 +230,18 @@ Function un.onInit FunctionEnd Section Uninstall - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\The Mana World" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mana" Delete "$INSTDIR\*.*" - Delete "$SMPROGRAMS\The Mana World\Uninstall.lnk" - Delete "$DESKTOP\The Mana World.lnk" - Delete "$SMPROGRAMS\The Mana World\The Mana World.lnk" - Delete "$SMPROGRAMS\The Mana World\Website.lnk" - Delete "$SMPROGRAMS\The Mana World\Readme.lnk" - Delete "$SMPROGRAMS\The Mana World\FAQ.lnk" + Delete "$SMPROGRAMS\Mana\Uninstall.lnk" + Delete "$DESKTOP\Mana.lnk" + Delete "$SMPROGRAMS\Mana\Mana.lnk" + Delete "$SMPROGRAMS\Mana\Website.lnk" + Delete "$SMPROGRAMS\Mana\Readme.lnk" + Delete "$SMPROGRAMS\Mana\FAQ.lnk" - RMDir "$SMPROGRAMS\The Mana World" + RMDir "$SMPROGRAMS\Mana" RMDir /r "$INSTDIR\data" RMDir /r "$INSTDIR\docs" |
