0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Linux install / package support in CMakeLists. Fixed Linux start script.

Browse Source
This commit is contained in:
Andrew Okin
2013-02-12 12:49:13 -06:00
parent 397c0cb555
commit 4c5d19a62a
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@@ -200,9 +200,11 @@ SET(IMAGE_FORMAT_PLUGINS svg ico gif jpeg)
INCLUDE(GetPrerequisites) INCLUDE(GetPrerequisites)
# Includes DLL dependencies for the given file. Does not include installed system DLLs. Recursive.
MACRO(INCLUDE_DLL_DEPS DLL_FILE DEST) MACRO(INCLUDE_DLL_DEPS DLL_FILE DEST)
GET_PREREQUISITES(${DLL_FILE} DLL_PREREQS 1 1 "" "") GET_PREREQUISITES(${DLL_FILE} DLL_PREREQS 1 1 "" "")
MESSAGE(STATUS "Installing ${DLL_FILE} and its prerequisites.")
INSTALL(FILES ${DLL_FILE} DESTINATION ${DEST}) INSTALL(FILES ${DLL_FILE} DESTINATION ${DEST})
FOREACH(PREREQ ${DLL_PREREQS}) FOREACH(PREREQ ${DLL_PREREQS})
@@ -212,12 +214,19 @@ FOREACH(PREREQ ${DLL_PREREQS})
SET(PREREQ_ACTUAL "${Qt5_DIR}/bin/${PREREQ}") SET(PREREQ_ACTUAL "${Qt5_DIR}/bin/${PREREQ}")
ENDIF() ENDIF()
MESSAGE(STATUS "Adding install prerequisite: ${PREREQ_NAME}") MESSAGE(STATUS "Adding install prerequisite for ${DLL_FILE}: ${PREREQ_NAME}")
INSTALL(FILES ${PREREQ_ACTUAL} RENAME ${PREREQ_NAME} DESTINATION ${LIB_INSTALL_PREFIX}) INSTALL(FILES ${PREREQ_ACTUAL} RENAME ${PREREQ_NAME} DESTINATION ${LIB_INSTALL_PREFIX})
ENDFOREACH() ENDFOREACH()
ENDMACRO() ENDMACRO()
MACRO(INSTALL_SYMLINK_DEST LINK_FILENAME DEST)
GET_FILENAME_COMPONENT(DEST_NAME "${LINK_FILENAME}" NAME)
GET_FILENAME_COMPONENT(DEST_ACTUAL "${LINK_FILENAME}" REALPATH)
INSTALL(FILES "${DEST_ACTUAL}" RENAME "${DEST_NAME}" DESTINATION "${DEST}")
ENDMACRO()
IF(WIN32) IF(WIN32)
@@ -261,12 +270,14 @@ FOREACH(IMGFMT_PLUGIN ${IMAGE_FORMAT_PLUGINS})
INCLUDE_DLL_DEPS("${Qt5_DIR}/plugins/imageformats/libq${IMGFMT_PLUGIN}.so" imageformats) INCLUDE_DLL_DEPS("${Qt5_DIR}/plugins/imageformats/libq${IMGFMT_PLUGIN}.so" imageformats)
ENDFOREACH() ENDFOREACH()
# This stuff *should* be added automatically by the INCLUDE_DLL_DEPS macro. # This stuff *should* be added automatically by the INCLUDE_ALL_DLL_DEPS macro. Include them manually just in case.
# Install ICU libs. # Install ICU libs.
#SET(ICU_LIBS data i18n io le lx test tu uc) SET(ICU_LIBS data i18n io le lx test tu uc)
#FOREACH(ICU_LIB ${ICU_LIBS}) FOREACH(ICU_LIB ${ICU_LIBS})
# INSTALL(FILES "/usr/lib/libicu${ICU_LIB}.so.48.1.1" DESTINATION lib) INSTALL_SYMLINK_DEST("/usr/lib/libicu${ICU_LIB}.so.48" ${LIB_INSTALL_PREFIX})
#ENDFOREACH() ENDFOREACH()
INSTALL_SYMLINK_DEST("/usr/lib/libxcb-render-util.so.0" ${LIB_INSTALL_PREFIX})
# Install additional libs. # Install additional libs.
#INSTALL(FILES "${Qt5_DIR}/lib/libQt5DBus.so.5.0.1" DESTINATION lib RENAME libQt5DBus.so.5) #INSTALL(FILES "${Qt5_DIR}/lib/libQt5DBus.so.5.0.1" DESTINATION lib RENAME libQt5DBus.so.5)
@@ -299,7 +310,6 @@ ELSEIF(WIN32)
ENDIF() ENDIF()
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0) SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
SET(CPACK_GENERATOR NSIS)
SET(CPACK_PACKAGE_NAME "MultiMC 5") SET(CPACK_PACKAGE_NAME "MultiMC 5")
SET(CPACK_PACKAGE_VENDOR "") SET(CPACK_PACKAGE_VENDOR "")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MultiMC - Minecraft launcher and management tool.") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MultiMC - Minecraft launcher and management tool.")

3
package/linux/MultiMC
View File

@@ -1,8 +1,9 @@
#!/bin/sh #!/bin/sh
# Basic start script for running MultiMC with the libs packaged with it. # Basic start script for running MultiMC with the libs packaged with it.
MMC_DIR = $(dirname "$0") MMC_DIR=$(dirname "$0")
cd "${MMC_DIR}" cd "${MMC_DIR}"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./lib" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./lib"
export QT_PLUGIN_PATH=$QT_PLUGIN_PATH:"."
exec ./bin/MultiMC exec ./bin/MultiMC