Update install files

longturn · Jul 19, 2023 · 02adcba · 02adcba
1 parent 455faa6
commit 02adcba
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 27 deletions.
diff --git a/cmake/FreecivInstall.cmake b/cmake/FreecivInstall.cmake
@@ -153,6 +153,9 @@ endif()
 # Unix/Linux specific install steps
 if(UNIX AND NOT APPLE)
 
+  # Get the current day in year-month-day format
+  string(TIMESTAMP currentDay "%Y-%m-%d")
+
   # Fixes a bug of some sort on Linux where this gets set to /usr/local, but installs to /usr
   if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set (CMAKE_INSTALL_PREFIX "/usr"
@@ -162,22 +165,30 @@ if(UNIX AND NOT APPLE)
 
   # Install MetaInfo and Desktop files for the applications asked for at configure
   if(FREECIV_ENABLE_CLIENT)
-    install(
-      FILES
-      dist/net.longturn.freeciv21.client.metainfo.xml
-      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
-      COMPONENT freeciv21
-    )
     configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.client.desktop.in
                    net.longturn.freeciv21.client.desktop
                    @ONLY NEWLINE_STYLE UNIX)
+    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.client.metainfo.xml.in
+                   net.longturn.freeciv21.client.metainfo.xml
+                   @ONLY NEWLINE_STYLE UNIX)
     install(
       FILES
       ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.client.desktop
       DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
       COMPONENT freeciv21
     )
-
+    install(
+      FILES
+      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.client.metainfo.xml
+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
+      COMPONENT freeciv21
+    )
+    install(
+      FILES
+      ${CMAKE_SOURCE_DIR}/data/icons/128x128/freeciv21-client.png
+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/freeciv21/misc
+      COMPONENT freeciv21
+    )
     if(FREECIV_ENABLE_MANPAGES)
       install(
         FILES
@@ -189,22 +200,30 @@ if(UNIX AND NOT APPLE)
   endif(FREECIV_ENABLE_CLIENT)
 
   if(FREECIV_ENABLE_SERVER)
-    install(
-      FILES
-      dist/net.longturn.freeciv21.server.metainfo.xml
-      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
-      COMPONENT freeciv21
-    )
     configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.server.desktop.in
                    net.longturn.freeciv21.server.desktop
                    @ONLY NEWLINE_STYLE UNIX)
+    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.server.metainfo.xml.in
+                   net.longturn.freeciv21.server.metainfo.xml
+                   @ONLY NEWLINE_STYLE UNIX)
     install(
       FILES
       ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.server.desktop
       DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
       COMPONENT freeciv21
     )
-
+    install(
+      FILES
+      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.server.metainfo.xml
+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
+      COMPONENT freeciv21
+    )
+    install(
+      FILES
+      ${CMAKE_SOURCE_DIR}/data/icons/128x128/freeciv21-server.png
+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/freeciv21/misc
+      COMPONENT freeciv21
+    )
     if(FREECIV_ENABLE_MANPAGES)
       install(
         FILES
@@ -219,19 +238,28 @@ if(UNIX AND NOT APPLE)
   endif(FREECIV_ENABLE_SERVER)
 
   if(FREECIV_ENABLE_FCMP_QT)
+    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.modpack.desktop.in
+                   net.longturn.freeciv21.modpack.desktop
+                   @ONLY NEWLINE_STYLE UNIX)
+    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.modpack.metainfo.xml.in
+                   net.longturn.freeciv21.modpack.metainfo.xml
+                   @ONLY NEWLINE_STYLE UNIX)
+    install(
+      FILES
+      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.modpack.desktop
+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
+      COMPONENT freeciv21
+    )
     install(
       FILES
-      dist/net.longturn.freeciv21.modpack.metainfo.xml
+      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.modpack.metainfo.xml
       DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
       COMPONENT freeciv21
     )
-    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.modpack-qt.desktop.in
-                   net.longturn.freeciv21.modpack-qt.desktop
-                   @ONLY NEWLINE_STYLE UNIX)
     install(
       FILES
-      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.modpack-qt.desktop
-      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
+      ${CMAKE_SOURCE_DIR}/data/icons/128x128/freeciv21-modpack.png
+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/freeciv21/misc
       COMPONENT freeciv21
     )
 
@@ -247,21 +275,24 @@ if(UNIX AND NOT APPLE)
   endif(FREECIV_ENABLE_FCMP_QT)
 
  if(FREECIV_ENABLE_RULEDIT)
-    install(
-      FILES
-      dist/net.longturn.freeciv21.ruledit.metainfo.xml
-      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
-      COMPONENT tool_ruledit
-    )
     configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.ruledit.desktop.in
                    net.longturn.freeciv21.ruledit.desktop
                    @ONLY NEWLINE_STYLE UNIX)
+    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.ruledit.metainfo.xml.in
+                   net.longturn.freeciv21.ruledit.metainfo.xml
+                   @ONLY NEWLINE_STYLE UNIX)
     install(
       FILES
       ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.ruledit.desktop
       DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
       COMPONENT tool_ruledit
     )
+    install(
+      FILES
+      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.ruledit.metainfo.xml
+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
+      COMPONENT tool_ruledit
+    )
   endif(FREECIV_ENABLE_RULEDIT)
 endif(UNIX AND NOT APPLE)
 

diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
@@ -251,7 +251,7 @@
     Push "1"
     Call ConditionalAddToRegisty
     Push "DisplayIcon"
-    Push "$INSTDIR\client.ico"
+    Push "$INSTDIR\freeciv21-client.ico"
     Call ConditionalAddToRegisty
     Push "HelpLink"
     Push "@CPACK_NSIS_HELP_LINK@"