Rewrite unix2dos

Don't depend on external tools.
Fix running on Windows.

Author: dg0yt

cmake/licensing_helper.cmake

@@ -36,9 +36,6 @@ set(LICENSING_OPTIONAL_ITEMS "" CACHE STRING
   "List of items which may be deployed even when licensing documentation is absent"
 )
 
-# Import unix2dos configuration
-include("unix2dos")
-
 
 # Deploy 3rd-party copyright, terms etc. 
 # The app name can be followed by the filenames of its explicit license texts as

cmake/licensing_helper_install.cmake.in

@@ -31,6 +31,13 @@ macro(HANDLE_CROSSCOMPILING)
 endmacro()
 
 
+function(LICENSING_HELPER_UNIX2DOS)
+	handle_crosscompiling()
+	include("unix2dos")
+	unix2dos(${ARGN})
+endfunction()
+
+
 function(LICENSING_HELPER_COLLECT_RUNTIME var)
 	handle_crosscompiling()
 	if(MINGW)
@@ -86,9 +93,7 @@ endfunction()
 function(LICENSING_HELPER_DEPLOY_COPYRIGHT app)
 	set(licensing_dir "$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DOCDIR}/licensing")
 	file(INSTALL ${ARGN} DESTINATION "${licensing_dir}")
-	handle_crosscompiling()
-	include("unix2dos")
-	unix2dos("${licensing_dir}/*")
+	licensing_helper_unix2dos("${licensing_dir}/*")
 endfunction()
 
 
@@ -114,9 +119,7 @@ endfunction()
 function(LICENSING_HELPER_DEPLOY_COMMON app)
 	set(common_dir "$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DOCDIR}/licensing/common-licenses")
 	file(INSTALL ${ARGN} DESTINATION "${common_dir}")
-	handle_crosscompiling()
-	include("unix2dos")
-	unix2dos("${common_dir}/*")
+	licensing_helper_unix2dos("${common_dir}/*")
 endfunction()
 
 
@@ -143,17 +146,15 @@ function(LICENSING_HELPER_DEDUP_COMMON app)
 endfunction()
 
 
+list(APPEND CMAKE_MODULE_PATH "@PROJECT_SOURCE_DIR@/cmake")
+
 set(BUNDLE_EXECUTABLE "@BUNDLE_EXECUTABLE@")
 set(BUNDLE_COPYRIGHT "@BUNDLE_COPYRIGHT@")
 
 set(LICENSING_OPTIONAL_ITEMS "@LICENSING_OPTIONAL_ITEMS@")
 set(LICENSING_COPYRIGHT_DIR "@LICENSING_COPYRIGHT_DIR@")
 set(LICENSING_COMMON_DIR "@LICENSING_COMMON_DIR@")
 
-set(UNIX2DOS_COMMAND "@UNIX2DOS_COMMAND@")
-set(UNIX2DOS_SED_COMMAND "@UNIX2DOS_SED_COMMAND@")
-list(APPEND CMAKE_MODULE_PATH "@PROJECT_SOURCE_DIR@/cmake")
-
 set(CMAKE_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@")
 set(CMAKE_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")
 set(CMAKE_INSTALL_DOCDIR "@CMAKE_INSTALL_DOCDIR@")

cmake/unix2dos.cmake

@@ -17,11 +17,22 @@
 #    along with OpenOrienteering.  If not, see <http://www.gnu.org/licenses/>.
 
 
+# Script mode
+if(UNIX2DOS_FILE)
+	file(READ "${UNIX2DOS_FILE}" content)
+	string(REGEX REPLACE "\r*\n" "\r\n" content "${content}")
+	file(WRITE "${UNIX2DOS_FILE}" "${content}")
+	return()
+endif()
+
+
+set(UNIX2DOS_ENABLED   "${WIN32}" CACHE BOOL "Convert line endings for Windows")
+
+
 if(COMMAND unix2dos)
 	# include guard
 	return()
-elseif(NOT WIN32)
-	# no-op if not building for Windows
+elseif(NOT UNIX2DOS_ENABLED)
 	function(UNIX2DOS)
 	endfunction()
 	function(UNIX2DOS_INSTALLED)
@@ -30,48 +41,42 @@ elseif(NOT WIN32)
 endif()
 
 
-message(STATUS "Enabling unix2dos")
+# Windows-only
+
+set(UNIX2DOS_LIST_FILE "${CMAKE_CURRENT_LIST_FILE}")
 
-find_program(UNIX2DOS_COMMAND
-  NAMES unix2dos
-  DOC "Filepath of the unix2dos executable"
-)
-find_program(SED_COMMAND
-  NAMES gsed sed
-  DOC "Filepath of the sed executable"
-)
-if(NOT UNIX2DOS_COMMAND AND NOT SED_COMMAND)
-	message(WARNING "unix2dos or sed are required to convert text files for Windows")
-endif()
-mark_as_advanced(UNIX2DOS_COMMAND)
-mark_as_advanced(UNIX2DOS_SED_COMMAND)
 
+# Convert the files matching the given pattern to Windows line endings.
+# Cf. CMake's file(GLOB ...) for the pattern syntax
 
-# On Windows, convert the files matching the given pattern from UNIX to Windows
-# line endings. Cf. CMake's file(GLOB ...) for the pattern syntax
 function(UNIX2DOS)
-	file(GLOB files ${ARGN} LIST_DIRECTORIES false)
+	file(GLOB files LIST_DIRECTORIES false ${ARGN})
 	foreach(file ${files})
-		if(UNIX2DOS_COMMAND)
-			execute_process(COMMAND "${UNIX2DOS_COMMAND}" -ascii --quiet "${file}")
-		elseif(UNIX2DOS_SED_COMMAND)
-			execute_process(
-			  COMMAND "${UNIX2DOS_SED_COMMAND}" -e "s,\\r*$,\\r," -i -- "${file}"
-			  COMMAND "${CMAKE_COMMAND}" -E remove -f "${file}--"
-			)
+		execute_process(
+		  COMMAND "${CMAKE_COMMAND}" "-DUNIX2DOS_FILE=${file}" -P "${UNIX2DOS_LIST_FILE}"
+		  RESULT_VARIABLE result
+		  ERROR_VARIABLE error
+		)
+		if(NOT result EQUAL 0)
+			message(FATAL_ERROR "${error}")
 		endif()
 	endforeach()
 endfunction()
 
 
+# At installation time, convert the files matching the given installation path
+# pattern from UNIX to Windows line endings.
+# Cf. CMake's file(GLOB ...) for the pattern syntax
+
 function(UNIX2DOS_INSTALLED)
 	set(code
-	  "list(APPEND CMAKE_MODULE_PATH \"${PROJECT_SOURCE_DIR}/cmake\")"
-	  "include(\"unix2dos\")"
+	  "set(UNIX2DOS_ENABLED ON CACHE BOOL \"Convert line endings for Windows\")"
+	  "include(\"${UNIX2DOS_LIST_FILE}\")"
 	)
 	foreach(pattern ${ARGN})
 		list(APPEND code "unix2dos(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${pattern}\")")
 	endforeach()
 	string(REPLACE ";" "\n  " code "${code}")
 	install(CODE "${code}")
 endfunction()
+