implemented appdata 2/2

CMakeLists.txt

@@ -406,61 +406,39 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
         MESSAGE(WARNING ">> CLANG is NOT currently compatible as it does not support the following essential GCC compiler settings: -frounding-math -fsignaling-nans")
 ENDIF()
 
+IF(NOT DEFINED CPACK_GENERATOR)
+	SET(CPACK_GENERATOR "DEB")
+ENDIF()
 # CPack configuration shared accross platforms
 SET(CPACK_PACKAGE_NAME ${PKG_NAME})
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MegaGlest")
+IF(EXISTS "${PROJECT_SOURCE_DIR}/data/glest_game/others/megaglest-long-description.txt.in")
+	FILE(READ "${PROJECT_SOURCE_DIR}/data/glest_game/others/megaglest-long-description.txt.in" MEGAGLEST_LONG_DESCRIPTION)
+	SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${MEGAGLEST_LONG_DESCRIPTION}")
+ELSE()
+	SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MegaGlest")
+ENDIF()
 SET(CPACK_PACKAGE_VENDOR "megaglest.org")
 #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 "megaglest")
+SET(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 SET(CPACK_PACKAGE_VERSION "${MEGAGLEST_VERSION}")
 SET(CPACK_PACKAGE_VERSION_MAJOR "${VER_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${VER_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${VER_PATCH}")
 
-
+IF("${CPACK_GENERATOR}" STREQUAL "DEB")
-# Debian specific generator options
-IF(NOT DEFINED CPACK_GENERATOR)
-	SET(CPACK_GENERATOR "DEB")
 	SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Mark Vejvoda") #required
-	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "
+	SET(CPACK_DEBIAN_PACKAGE_SECTION "games")
-	 libcurl4-gnutls-dev | libcurl4-nss-dev,
+	SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-	 libfontconfig1-dev,
+	SET(CPACK_DEBIAN_PACKAGE_SUGGESTS "p7zip-full")
-	 libftgl-dev,
+ENDIF()
-	 libglew-dev,
+IF("${CPACK_GENERATOR}" STREQUAL "NSIS")
-	 libircclient-dev,
-	 libjpeg-dev,
-	 liblua5.1-0-dev,
-	 libminiupnpc-dev,
-	 libogg-dev,
-	 libopenal-dev,
-	 libpng12-dev,
-	 libsdl1.2-dev,
-	 libvlc-dev,
-	 libvorbis-dev,
-	 libwxgtk2.9-dev,
-	 libxerces-c2-dev,
-	 libxml2-dev,
-	 libz-dev,
-	 libfribidi-dev")
-	# FIXME ^ cpack configuration should be fixed and tested
-
-	#find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
-	#if(DPKG_PROGRAM)
-	#  execute_process(
-	#    COMMAND ${DPKG_PROGRAM} --print-architecture
-	#    OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
-	#    OUTPUT_STRIP_TRAILING_WHITESPACE
-	#  )
-	#endif(DPKG_PROGRAM)
-ENDIF(NOT DEFINED CPACK_GENERATOR)
-
-IF(CPACK_GENERATOR STREQUAL "NSIS")
 	SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest")
 	SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/glest.ico")
 	SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/megaglest.ico")
 	SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org")
-ENDIF(CPACK_GENERATOR STREQUAL "NSIS")
+ENDIF()
 
 INCLUDE(CPack)
 

mk/linux/make-binary-archive.sh

@@ -25,6 +25,7 @@ architecture=`uname -m  | tr '[A-Z]' '[a-z]'`
 RELEASEDIR_ROOT="$CURRENTDIR/../../../release/"
 PROJDIR="$CURRENTDIR/"
 REPODIR="$CURRENTDIR/../../"
+REPO_DATADIR="$REPODIR/data/glest_game"
 if [ -d "$REPODIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then
     cd "$REPODIR"
     if [ "$SOURCE_BRANCH" = "" ]; then SOURCE_BRANCH="$(git branch | awk -F '* ' '/^* / {print $2}')"; fi
@@ -76,10 +77,12 @@ fi
 cd $PROJDIR
 echo "copying binaries ..."
 cp -r lib/* "$RELEASEDIR/lib"
-cp {../shared/,}*.ico {../shared/,}*.ini "$RELEASEDIR/"
+cp ../shared/*.ico {../shared/,}*.ini "$RELEASEDIR/"
 if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm -f "$RELEASEDIR/glest-dev.ini"; fi
+cd $REPO_DATADIR/others/icons
 cp *.bmp *.png *.xpm "$RELEASEDIR/"
-if [ "$1" != "--installer" ]; then cp *.desktop "$RELEASEDIR/"; fi
+if [ "$1" != "--installer" ]; then cd $REPO_DATADIR/others/desktop; cp *.desktop "$RELEASEDIR/"; fi
+cd $PROJDIR
 cp megaglest megaglest_editor megaglest_g3dviewer start_megaglest \
 	start_megaglest_mapeditor start_megaglest_g3dviewer \
 	start_megaglest_gameserver "$RELEASEDIR/"

mk/linux/megaglest.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=Game;StrategyGame;
-Comment=A real time strategy game.
-Name=MegaGlest
-Icon=megaglest
-Exec=megaglest
-Terminal=false
-Type=Application
-Keywords=realtime;strategy;game;
-

mk/linux/megaglest_editor.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=Game;StrategyGame;
-Comment=Map Editor
-Name=MegaGlest Map Editor
-Icon=megaglest
-Exec=megaglest_editor
-Terminal=false
-Type=Application
-Keywords=map;editor;
-

mk/linux/megaglest_g3dviewer.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=Game;StrategyGame;
-Comment=G3d Model Viewer
-Name=MegaGlest Model Viewer
-Icon=megaglest
-Exec=megaglest_g3dviewer
-Terminal=false
-Type=Application
-Keywords=model;viewer;
-

mk/linux/tools-for-standalone-client/installer/make.sh

@@ -147,6 +147,7 @@ if [ $REPACKONLY -eq 0 ]; then
 	cp -r * "$CURRENTDIR/$INSTALLDATADIR"
 
 	cd "$CURRENTDIR"
+	cp megaglest-uninstall.ico "$CURRENTDIR/$INSTALLDATADIR"
 fi
 
 if [ ! -d data/docs ]; then

source/g3d_viewer/CMakeLists.txt

@@ -204,21 +204,5 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
 	        INSTALL(FILES 
 	          "${PROJECT_SOURCE_DIR}/mk/shared/g3dviewer.ico"
 	          DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
-
-			IF(UNIX AND NOT APPLE)
-				# Installation of the program desktop file
-				SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/mk/linux/megaglest_g3dviewer.desktop)
-
-				INSTALL(FILES
-					"${MG_DESKTOP_FILE}"
-					DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
-
-				IF(NOT BUILD_MEGAGLEST)
-					INSTALL(FILES
-						"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
-						"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
-						DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-				ENDIF()
-			ENDIF()
         ENDIF()
 ENDIF()

source/glest_game/CMakeLists.txt

@@ -306,7 +306,7 @@ IF(BUILD_MEGAGLEST)
 		          DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
 	        ENDIF()
 
-		IF(NOT WIN32)
+		IF(UNIX)
 			INSTALL(FILES
 				"${PROJECT_SOURCE_DIR}/mk/linux/start_megaglest_gameserver"
 				DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
@@ -339,38 +339,12 @@ IF(BUILD_MEGAGLEST)
 			ENDIF()
 		ENDIF()
 
-		# Installation of data files from outside normal data folder
-		#INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/source/masterserver/flags" 
-		#  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
-		#  OPTIONAL REGEX "/.git" EXCLUDE)
-
-	        #MESSAGE(STATUS "**Source package detected git folder structure.")
-
-		IF(NOT APPLE)
-			# Installation of the program desktop file
-			INSTALL(FILES
-				"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop"
-				DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
-		ENDIF()
-
-		# Installation of the program desktop icon file
 		INSTALL(FILES
 			"${PROJECT_SOURCE_DIR}/mk/shared/megaglest.ico"
-			DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+			DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
-		IF(UNIX AND NOT APPLE)
+		IF(UNIX AND APPLE AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
 			INSTALL(FILES
-				"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
+				"${PROJECT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns"
-				"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
-				DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-		ELSEIF(UNIX AND APPLE)
-			IF(NOT WANT_SINGLE_INSTALL_DIRECTORY)
-				INSTALL(FILES
-					"${PROJECT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns"
-					DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-			ENDIF()
-		ELSE()
-			INSTALL(FILES
-				"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
 				DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
 		ENDIF()
 	ENDIF()

source/glest_map_editor/CMakeLists.txt

@@ -194,21 +194,5 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
 	        INSTALL(FILES 
                   "${PROJECT_SOURCE_DIR}/mk/shared/editor.ico"
 	          DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
-
-			IF(UNIX AND NOT APPLE)
-				# Installation of the program desktop file
-				SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/mk/linux/megaglest_editor.desktop)
-
-				INSTALL(FILES
-					"${MG_DESKTOP_FILE}"
-					DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
-
-				IF(NOT BUILD_MEGAGLEST)
-					INSTALL(FILES
-						"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
-						"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
-						DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-				ENDIF()
-			ENDIF()
         ENDIF()
 ENDIF()