Move some files around

CMakeLists.txt

@@ -11,6 +11,7 @@ if (APPLE)
 endif()
 
 set(DAWN_NAMESPACE "name.janouch.Dawn")
+set(dawn_packaging "${PROJECT_SOURCE_DIR}/packaging")
 set(CPACK_PACKAGE_VENDOR "The Dawn Authors")
 set(CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
 
@@ -554,7 +555,7 @@ endif()
 
 # Application icon: SVG → PNG/ICO (xT) on non-Apple; Swift squircle ICNS (xM)
 # on Darwin. Qt looks up IDI_ICON1 and nothing else.
-set(dn_icon_svg "${PROJECT_SOURCE_DIR}/dn/dn.svg")
+set(dn_icon_svg "${dawn_packaging}/${DAWN_NAMESPACE}.svg")
 if (APPLE)
 	find_program(DN_SWIFT_EXECUTABLE swift REQUIRED)
 	set(MACOSX_BUNDLE_ICON_FILE dn.icns)
@@ -674,15 +675,14 @@ else()
 		add_custom_target(icons ALL DEPENDS ${dn_icon_png_list})
 
 		install(FILES "${dn_icon_svg}"
-			DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps"
-			RENAME "${DAWN_NAMESPACE}.svg")
+			DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps")
 		install(DIRECTORY "${dn_icon_base}"
 			DESTINATION "${CMAKE_INSTALL_DATADIR}")
 
 		# MimeType= follows the loader table compiled into dn, so ask it.
 		# A cross build can only ask through an emulator; without one,
 		# the checked-in list is installed as it is.
-		set(desktop "${PROJECT_SOURCE_DIR}/dn/${DAWN_NAMESPACE}.desktop")
+		set(desktop "${dawn_packaging}/${DAWN_NAMESPACE}.desktop")
 		if (NOT CMAKE_CROSSCOMPILING OR CMAKE_CROSSCOMPILING_EMULATOR)
 			set(generated
 				"${PROJECT_BINARY_DIR}/${DAWN_NAMESPACE}.mime.desktop")
@@ -699,11 +699,11 @@ else()
 		endif()
 
 		set(desktops "${desktop}"
-			"${PROJECT_SOURCE_DIR}/dn/${DAWN_NAMESPACE}.Browse.desktop")
+			"${dawn_packaging}/${DAWN_NAMESPACE}.Browse.desktop")
 		if (DAWN_WITH_WIP)
 			list(APPEND desktops
-				"${PROJECT_SOURCE_DIR}/dn/${DAWN_NAMESPACE}.CropJpeg.desktop"
-				"${PROJECT_SOURCE_DIR}/dn/${DAWN_NAMESPACE}.Commander.desktop")
+				"${dawn_packaging}/${DAWN_NAMESPACE}.CropJpeg.desktop"
+				"${dawn_packaging}/${DAWN_NAMESPACE}.Commander.desktop")
 		endif()
 
 		# What the launcher says is translated from the same catalogue as the
@@ -1023,7 +1023,7 @@ else()
 
 	# Software centres want this, and Flatpak bundles only carry an icon
 	# when an AppStream component points at one.
-	configure_file(flatpak-metainfo.xml.in
+	configure_file("${dawn_packaging}/${DAWN_NAMESPACE}.metainfo.xml.in"
 		"${PROJECT_BINARY_DIR}/${DAWN_NAMESPACE}.metainfo.xml" @ONLY)
 	install(FILES "${PROJECT_BINARY_DIR}/${DAWN_NAMESPACE}.metainfo.xml"
 		DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo")
@@ -1047,7 +1047,7 @@ if (WIN32 AND CMAKE_CROSSCOMPILING)
 		set(DAWN_MSI_WIP ON)
 	endif()
 	set(dawn_wxs "${PROJECT_BINARY_DIR}/dawn.wxs")
-	configure_file(dawn.wxs.in "${dawn_wxs}" @ONLY)
+	configure_file("${dawn_packaging}/Dawn.wxs.in" "${dawn_wxs}" @ONLY)
 
 	set(dawn_msi
 		"${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_PROCESSOR}.msi")

flatpak-build.sh

@@ -6,7 +6,8 @@ src=$(CDPATH= cd "$(dirname "$0")" && pwd)
 dst=${1:-$src/build-flatpak}
 
 version=$(awk '$1 == "VERSION" { print $2; exit }' "$src/CMakeLists.txt")
-baseyml=$src/$appid.BaseApp.yml
+baseyml=$src/packaging/$appid.BaseApp.yml
+yml=$src/packaging/$appid.yml
 
 # XXX: Not sure how to version the BaseApp; supposedly newer means better.
 baseapp=$dst/Dawn-BaseApp-latest-$arch.flatpak
@@ -43,14 +44,14 @@ flatpak --user install -y --reinstall "$baseapp"
 
 # We can't use --install-deps-from=flathub here because it would try to update
 # the BaseApp from Flathub.
-runtime_version=$(sed -n "s/^runtime-version: '\(.*\)'$/\1/p" "$src/$appid.yml")
+runtime_version=$(sed -n "s/^runtime-version: '\(.*\)'$/\1/p" "$yml")
 flatpak --user install --or-update -y flathub \
 	"org.freedesktop.Sdk//$runtime_version" \
 	"org.freedesktop.Sdk.Extension.rust-stable//$runtime_version"
 
 flatpak-builder --user --force-clean \
 	--default-branch=stable --state-dir="$dst/state" \
-	--repo="$dst/repo" "$dst/appdir" "$src/$appid.yml"
+	--repo="$dst/repo" "$dst/appdir" "$yml"
 flatpak build-bundle --arch="$arch" --runtime-repo="$flathub" \
 	"$dst/repo" "$bundle" "$appid" stable
 

packaging/name.janouch.Dawn.yml

@@ -69,7 +69,7 @@ modules:
       - -DFETCHCONTENT_SOURCE_DIR_JPEGQS=/run/build/dawn/jpegqs
     sources:
       - type: dir
-        path: .
+        path: ..
         skip:
           - .flatpak
           - .git
@@ -84,8 +84,8 @@ modules:
         sha256: 7dcbaa7d994511a03dba845aa218a25f9c8e70c0bcb0800ff61ae3d92dd50c3d
         dest: jpegqs
       - type: file
-        path: cmake/jpegqs/CMakeLists.txt
+        path: ../cmake/jpegqs/CMakeLists.txt
         dest: jpegqs
       - type: dir
-        path: cmake/jpegqs/include
+        path: ../cmake/jpegqs/include
         dest: jpegqs/include

po/POTFILES

@@ -9,10 +9,6 @@ dn/kit-chrome.cpp
 dn/kit-cie-diagram.cpp
 dn/kit-viewer.cpp
 dn/main.cpp
-dn/name.janouch.Dawn.Browse.desktop
-dn/name.janouch.Dawn.Commander.desktop
-dn/name.janouch.Dawn.CropJpeg.desktop
-dn/name.janouch.Dawn.desktop
 dn/window.cpp
 libdn/config-macos.mm
 libdn/config-unix.cpp
@@ -39,3 +35,7 @@ libdn/load-tiff.cpp
 libdn/load-webp.cpp
 libdn/load-wuffs.cpp
 libdn/load-xcursor.cpp
+packaging/name.janouch.Dawn.Browse.desktop
+packaging/name.janouch.Dawn.Commander.desktop
+packaging/name.janouch.Dawn.CropJpeg.desktop
+packaging/name.janouch.Dawn.desktop

tests/CMakeLists.txt

@@ -186,6 +186,6 @@ if(DAWN_DESKTOP_FILE_VALIDATE)
 		name.janouch.Dawn.CropJpeg.desktop
 	)
 		add_test(NAME ${desktop} COMMAND "${DAWN_DESKTOP_FILE_VALIDATE}"
-			"${PROJECT_SOURCE_DIR}/dn/${desktop}")
+			"${PROJECT_SOURCE_DIR}/packaging/${desktop}")
 	endforeach()
 endif()