Rename binary and all packaging related files to openorienteering-mapper

CMakeLists.txt

@@ -136,8 +136,8 @@ elseif(WIN32)
 elseif(APPLE)
 	set(MAPPER_RUNTIME_DESTINATION .)
 	set(MAPPER_LIBRARY_DESTINATION .)
-	set(MAPPER_DATA_DESTINATION    "Mapper.app/Contents/Resources")
-	set(MAPPER_ABOUT_DESTINATION   "Mapper.app/Contents/Resources/doc")
+	set(MAPPER_DATA_DESTINATION    "openorienteering-mapper.app/Contents/Resources")
+	set(MAPPER_ABOUT_DESTINATION   "openorienteering-mapper.app/Contents/Resources/doc")
 elseif(ANDROID)
 	set(MAPPER_RUNTIME_DESTINATION "libs/${CMAKE_ANDROID_ARCH_ABI}")
 	set(MAPPER_LIBRARY_DESTINATION "libs/${CMAKE_ANDROID_ARCH_ABI}")

codespell.sh

@@ -5,7 +5,7 @@ SKIP_LIST=
 while read WORD; do SKIP_LIST="${SKIP_LIST:+$SKIP_LIST,}$WORD"; done \
 <<END_SKIP_LIST
   3rd-party/cove/potrace
-  packaging/linux/Mapper.desktop
+  packaging/linux/openorienteering-mapper.desktop
   src/gdal/mapper-osmconf.ini
   src/printsupport/qt-5.5.1
   src/printsupport/qt-5.12.4

doc/man/Mapper.1 → doc/man/openorienteering-mapper.1

@@ -1,10 +1,10 @@
-.TH MAPPER 1 2024-04-01 OpenOrienteering
+.TH OPENORIENTEERING-MAPPER 1 2024-04-01 OpenOrienteering
 
 .SH NAME
-Mapper \- orienteering map drawing software
+openorienteering-mapper \- orienteering map drawing software
 
 .SH SYNOPSIS
-.B Mapper
+.B openorienteering-mapper
 .RI [ FILES ]
 
 .SH DESCRIPTION
@@ -79,7 +79,7 @@ There is NO WARRANTY, to the extent permitted by law.
 
 .SH "SEE ALSO"
 Extended documentation for
-.B Mapper
+.B openorienteering-mapper
 is available from the program's help menu and also online at:
 .br
 <https://www.openorienteering.org/mapper-manual/>

packaging/CMakeLists.txt

@@ -137,7 +137,7 @@ set(CPACK_SOURCE_IGNORE_FILES
 
 set(MAPPER_MACOS_SUBDIR "")
 
-set(CPACK_PACKAGE_EXECUTABLES "Mapper" "${CPACK_PACKAGE_NAME} ${Mapper_VERSION_DISPLAY}")
+set(CPACK_PACKAGE_EXECUTABLES "openorienteering-mapper" "${CPACK_PACKAGE_NAME} ${Mapper_VERSION_DISPLAY}")
 
 if(WIN32)
 	# Packaging as ZIP archive
@@ -155,7 +155,7 @@ if(WIN32)
 		# NSIS start menu links will point to executables in this directory
 		set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
 		# A path to the executable that contains the uninstaller icon.
-		set(CPACK_NSIS_INSTALLED_ICON_NAME Mapper.exe)
+		set(CPACK_NSIS_INSTALLED_ICON_NAME openorienteering-mapper.exe)
 		# URL to a web site providing more information about your application.
 		set(CPACK_NSIS_URL_INFO_ABOUT "https://www.openorienteering.org/apps/mapper/")
 		# Extra NSIS include
@@ -172,7 +172,7 @@ if(WIN32)
 	endif(MAKENSIS_EXECUTABLE)
 
 elseif(APPLE)
-	set(MAPPER_MACOS_SUBDIR "/Mapper.app/Contents/MacOS")
+	set(MAPPER_MACOS_SUBDIR "/openorienteering-mapper.app/Contents/MacOS")
 	set(CPACK_GENERATOR_DEFAULT "DragNDrop")
 	set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/images/mapper-icon/Mapper.icns")
 	set(CPACK_COMMAND_HDIUTIL "${CMAKE_CURRENT_LIST_DIR}/macos/hdiutil.sh")
@@ -181,7 +181,7 @@ elseif(APPLE)
 	  MACOSX_BUNDLE_ICON_FILE            "Mapper.icns"
 	  MACOSX_BUNDLE_GUI_IDENTIFIER       "org.openorienteering.${CMAKE_PROJECT_NAME}"
 	  MACOSX_BUNDLE_LONG_VERSION_STRING  "${CMAKE_PROJECT_NAME} ${Mapper_VERSION_DISPLAY} for macOS"
-	  MACOSX_BUNDLE_BUNDLE_NAME          "${CMAKE_PROJECT_NAME}" # less than 16 characters long
+	  MACOSX_BUNDLE_BUNDLE_NAME          "Mapper" # less than 16 characters long
 	  MACOSX_BUNDLE_SHORT_VERSION_STRING "${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}"
 	  MACOSX_BUNDLE_BUNDLE_VERSION       "${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}"
 	  MACOSX_BUNDLE_COPYRIGHT            "${Mapper_COPYRIGHT}"
@@ -461,10 +461,10 @@ endforeach(_qt_plugin)
 
 if(UNIX AND NOT APPLE AND NOT ANDROID)
 	install(
-	  FILES "${PROJECT_SOURCE_DIR}/doc/man/Mapper.1"
+	  FILES "${PROJECT_SOURCE_DIR}/doc/man/openorienteering-mapper.1"
 	  DESTINATION "share/man/man1")
 	install(
-	  FILES "${CMAKE_CURRENT_BINARY_DIR}/linux/Mapper.desktop"
+	  FILES "${CMAKE_CURRENT_BINARY_DIR}/linux/openorienteering-mapper.desktop"
 	  DESTINATION "share/applications")
 	install(
 	  FILES "${CMAKE_CURRENT_BINARY_DIR}/linux/openorienteering-mapper.xml"
@@ -474,7 +474,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
 		install(
 		  FILES "${PROJECT_SOURCE_DIR}/images/mapper-icon/Mapper-${_size}.png"
 		  DESTINATION "share/icons/hicolor/${_size}x${_size}/apps"
-		  RENAME Mapper.png
+		  RENAME openorienteering-mapper.png
 		)
 		install(
 		  FILES "${PROJECT_SOURCE_DIR}/images/mapper-icon/Mapper-${_size}.png"

packaging/android/AndroidManifest.xml.in

@@ -36,7 +36,7 @@
             <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
             <!-- Application arguments -->
 
-            <meta-data android:name="android.app.lib_name" android:value="Mapper"/>
+            <meta-data android:name="android.app.lib_name" android:value="openorienteering-mapper"/>
             <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
             <meta-data android:name="android.app.repository" android:value="default"/>
             <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>

packaging/android/CMakeLists.txt

@@ -44,7 +44,7 @@ if(MAPPER_APP_ID STREQUAL "default" OR NOT MAPPER_APP_ID)
 endif()
 
 # The folder where to generate the qmake project. Recorded in .gitignore.
-set(MAPPER_PRO_DIR "${CMAKE_CURRENT_BINARY_DIR}/Mapper")
+set(MAPPER_PRO_DIR "${CMAKE_CURRENT_BINARY_DIR}/openorienteering-mapper")
 # The folder where to stage the APK sources for the actual app ID.
 set(ANDROID_PACKAGE_SOURCE_DIR "${MAPPER_PRO_DIR}/${MAPPER_APP_ID}")
 
@@ -102,7 +102,7 @@ endif()
 # For Android, we create a dummy qmake project which provides
 # - configuration for running androiddeployqt from CPackConfig.cmake, and
 # - a project for debugging the Android app in Qt Creator
-# The directory name must match the Mapper binary.
+# The directory name must match the openorienteering-mapper binary.
 configure_file(
   "Mapper.pro.in"
   "${MAPPER_PRO_DIR}/Mapper.pro"

packaging/android/CPackConfig.cmake.in

@@ -80,14 +80,14 @@ if(result)
 endif()
 
 # Create an androiddeployqt configuration file via qmake project.
-set(deployment_settings "@CMAKE_CURRENT_BINARY_DIR@/Mapper/Mapper-deployment-settings.json")
+set(deployment_settings "@CMAKE_CURRENT_BINARY_DIR@/openorienteering-mapper/Mapper-deployment-settings.json")
 execute_process(
   COMMAND "$<TARGET_FILE:Qt5::qmake>"
     -spec android-clang
     "${config}"
     "ANDROID_ABIS=@ANDROID_ABI@"
     "ANDROID_DEPLOYMENT_SETTINGS_FILE=${deployment_settings}"
-  WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/Mapper"
+  WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/openorienteering-mapper"
   RESULT_VARIABLE result
 )
 if(result)
@@ -107,7 +107,7 @@ $<@RELEASE_APK@:
 $<@SIGN_APK@:
     ${sign}
 >
-  WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/Mapper"
+  WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/openorienteering-mapper"
   RESULT_VARIABLE result
 )
 if(result)

packaging/android/Mapper.pro.in

@@ -22,7 +22,7 @@
 !android:error("This project is for Android only.")
 
 TEMPLATE = app
-TARGET   = Mapper
+TARGET   = openorienteering-mapper
 
 ANDROID_VERSION_CODE = "@Mapper_VERSION_CODE@"
 ANDROID_VERSION_NAME = "@Mapper_VERSION_DISPLAY@"
@@ -42,7 +42,7 @@ CPACK_CONFIG_CLEANUP_TRIGGER = \
   Qt5:  @Qt5Core_VERSION@
 
 # For the generated .pro file to be used in Qt Creator,
-# we must install everything and replace the dummy libMapper.so.
+# we must install everything and replace the dummy libopenorienteering-mapper.so.
 INSTALLS            += everything
 
 everything.path  = /

packaging/android/install_android_package.cmake.in

@@ -64,15 +64,15 @@ while(icons)
 endwhile()
 
 $<$<VERSION_LESS:@Qt5Core_VERSION@,5.15.0>:
-# Copy the Mapper runtime from the CMake project to the qmake project.
+# Copy the openorienteering-mapper runtime from the CMake project to the qmake project.
 # androiddeployqt uses this location.
 file(INSTALL
   DESTINATION "@MAPPER_PRO_DIR@"
   FILES "$<TARGET_FILE:Mapper>"
   )
 >
 
-# Copy the Mapper runtime from the CMake project to the packaging dir.
+# Copy the openorienteering-mapper runtime from the CMake project to the packaging dir.
 # androiddeployqt checks this location.
 file(INSTALL
   DESTINATION "@MAPPER_PRO_DIR@/android-build/libs/@ANDROID_ABI@"

packaging/custom_install.cmake.in

@@ -55,7 +55,7 @@ function(fixup_bundle_portable runtime dirs)
 		include(BundleUtilities)
 		file(GLOB_RECURSE plugins "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}${runtime_destination}/plugins/*.dll")
 		list(APPEND runtime ${plugins})
-		fixup_bundle("$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}${runtime_destination}/Mapper.exe" "${runtime}" "${dirs}")
+		fixup_bundle("$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}${runtime_destination}/openorienteering-mapper.exe" "${runtime}" "${dirs}")
 		# Strip bundled DLLs
 		if (CMAKE_INSTALL_DO_STRIP AND NOT "@CMAKE_STRIP@" STREQUAL "")
 			file(GLOB dlls "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}${runtime_destination}/*.dll")
@@ -67,7 +67,7 @@ function(fixup_bundle_portable runtime dirs)
 		include(BundleUtilities)
 		file(GLOB_RECURSE plugins "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}${runtime_destination}@MAPPER_MACOS_SUBDIR@/../PlugIns/*.dylib")
 		list(APPEND runtime "${plugins}")
-		fixup_bundle("$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}${runtime_destination}/Mapper.app" "${runtime}" "${dirs}")
+		fixup_bundle("$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}${runtime_destination}/openorienteering-mapper.app" "${runtime}" "${dirs}")
 		if (CMAKE_INSTALL_DO_STRIP AND NOT "@CMAKE_STRIP@" STREQUAL "")
 			file(GLOB dylibs "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}${runtime_destination}@MAPPER_MACOS_SUBDIR@/*.dylib")
 			foreach(item ${dylibs} ${runtime})

packaging/linux/Mapper.desktop → packaging/linux/openorienteering-mapper.desktop

@@ -30,8 +30,8 @@ Comment[tr]=Oryantiring haritaları çizmek için ücretsiz bir program
 Comment[uk]=Вільна програма для креслення спортивних карт
 Comment[zh_CN]=用于绘制定向运动地图的免费开源软件
 Comment[zh_Hant]=繪製定向越野運動地圖的免費軟體
-Exec=Mapper %F
-Icon=Mapper
+Exec=openorienteering-mapper %F
+Icon=openorienteering-mapper
 Terminal=false
 Categories=Graphics;Maps;Qt;
 MimeType=application/x-openorienteering-xmap;application/x-openorienteering-ocd;

packaging/windows/custom.nsi.in

@@ -34,12 +34,12 @@ FunctionEnd
 Function installAssociations
   ; The application
   WriteRegStr HKLM "Software\Classes\OpenOrienteering.Map" "" "OpenOrienteering Map"
-  WriteRegStr HKLM "Software\Classes\OpenOrienteering.Map\DefaultIcon" "" "$INSTDIR\Mapper.exe"
+  WriteRegStr HKLM "Software\Classes\OpenOrienteering.Map\DefaultIcon" "" "$INSTDIR\openorienteering-mapper.exe"
 
   ReadRegStr $R0 HKLM "Software\Classes\OpenOrienteering.Map\shell\open\command" ""
   StrCmp $R0 "" 0 +3
     WriteRegStr HKLM "Software\Classes\OpenOrienteering.Map\shell" "" "open"
-    WriteRegStr HKLM "Software\Classes\OpenOrienteering.Map\shell\open\command" "" '"$INSTDIR\Mapper.exe" "%1"'
+    WriteRegStr HKLM "Software\Classes\OpenOrienteering.Map\shell\open\command" "" '"$INSTDIR\openorienteering-mapper.exe" "%1"'
 
   ; The file type associations
   WriteRegStr HKLM "Software\Classes\.omap" "" "OpenOrienteering.Map"

src/CMakeLists.txt

@@ -365,6 +365,7 @@ else()
 	target_compile_definitions(Mapper PRIVATE MAPPER_USE_QTSINGLEAPPLICATION)
 	target_link_libraries(Mapper QtSingleApplication)
 endif()
+set_target_properties(Mapper PROPERTIES OUTPUT_NAME "openorienteering-mapper")
 
 target_link_libraries(Mapper
   Mapper_Common

src/mingw/resources.rc.in

@@ -37,7 +37,7 @@ BEGIN
 			VALUE "FileVersion", "@Mapper_VERSION_MAJOR@.@Mapper_VERSION_MINOR@.@Mapper_VERSION_PATCH@ @CMAKE_BUILD_TYPE@"
 			VALUE "InternalName", "@CMAKE_PROJECT_NAME@"
 			VALUE "LegalCopyright", "@Mapper_COPYRIGHT@"
-			VALUE "OriginalFilename", "Mapper.exe"
+			VALUE "OriginalFilename", "openorienteering-mapper.exe"
 			VALUE "ProductName", "OpenOrienteering @CMAKE_PROJECT_NAME@"
 			VALUE "ProductVersion", "@Mapper_VERSION_MAJOR@.@Mapper_VERSION_MINOR@.@Mapper_VERSION_PATCH@ @CMAKE_BUILD_TYPE@"
 		END

translations/CMakeLists.txt

@@ -293,7 +293,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
 	if(Mapper_DEVELOPMENT_BUILD)
 		# Only development builds are allowed to update the source directories.
 		set(update_sources
-		  COMMAND "${CMAKE_COMMAND}" -E copy_if_different "../packaging/linux/Mapper.desktop" "${PROJECT_SOURCE_DIR}/packaging/linux/"
+		  COMMAND "${CMAKE_COMMAND}" -E copy_if_different "../packaging/linux/openorienteering-mapper.desktop" "${PROJECT_SOURCE_DIR}/packaging/linux/"
 		  COMMAND "${CMAKE_COMMAND}" -E copy_if_different "../packaging/linux/openorienteering-mapper.xml" "${PROJECT_SOURCE_DIR}/packaging/linux/"
 		)
 	endif()
@@ -304,7 +304,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
 	add_custom_command(OUTPUT text-files.stamp
 	    desktop_file_comment.txt mime_type_comment.txt
 	  COMMAND "${CMAKE_COMMAND}" -E make_directory "../packaging/linux"
-	  COMMAND "${CMAKE_COMMAND}" -E copy "${PROJECT_SOURCE_DIR}/packaging/linux/Mapper.desktop" "../packaging/linux/"
+	  COMMAND "${CMAKE_COMMAND}" -E copy "${PROJECT_SOURCE_DIR}/packaging/linux/openorienteering-mapper.desktop" "../packaging/linux/"
 	  COMMAND "${CMAKE_COMMAND}" -E copy "${PROJECT_SOURCE_DIR}/packaging/linux/openorienteering-mapper.xml" "../packaging/linux/"
 	  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/translate_text_files.sh" ${translations}
 	  ${update_sources}

translations/translate_text_files.sh

@@ -41,8 +41,8 @@ done | sed -e "
 sed -e '
   /^Comment=/ r desktop_file_comment.txt
   /^Comment\[/ d
-' -i -- "../packaging/linux/Mapper.desktop" \
-&& rm -f "../packaging/linux/Mapper.desktop--"
+' -i -- "../packaging/linux/openorienteering-mapper.desktop" \
+&& rm -f "../packaging/linux/openorienteering-mapper.desktop--"
 
 for FILE
 do