[Initng-svn] r3757 - in initng-ifiles/trunk: cmake initfiles initfiles/daemon initfiles/daemon/bluetooth initfiles/daemon/lirc initfiles/debug initfiles/net

[svn at initng.thinktux.net]

Author: biebl
Date: Tue Apr 11 04:50:24 2006
New Revision: 3757

Modified:
   initng-ifiles/trunk/cmake/InitngMacros.cmake
   initng-ifiles/trunk/initfiles/CMakeLists.txt
   initng-ifiles/trunk/initfiles/daemon/CMakeLists.txt
   initng-ifiles/trunk/initfiles/daemon/bluetooth/CMakeLists.txt
   initng-ifiles/trunk/initfiles/daemon/lirc/CMakeLists.txt
   initng-ifiles/trunk/initfiles/debug/CMakeLists.txt
   initng-ifiles/trunk/initfiles/net/CMakeLists.txt
   initng-ifiles/trunk/initfiles/system/CMakeLists.txt

Log:
cmake support is now more or less complete. ifiles are properly generated and installed.


Modified: initng-ifiles/trunk/cmake/InitngMacros.cmake
==============================================================================
--- initng-ifiles/trunk/cmake/InitngMacros.cmake	(original)
+++ initng-ifiles/trunk/cmake/InitngMacros.cmake	Tue Apr 11 04:50:24 2006
@@ -1,5 +1,18 @@
-MACRO (PROCESS_IIFILES _iifiles)
-	FOREACH (_current_FILE ${ARGN})
-		MESSAGE("Processing ${_current_FILE}")
-	ENDFOREACH (_current_FILE)
-ENDMACRO (PROCESS_IIFILES)
+MACRO(PROCESS_IIFILES _i_FILES _ii_FILES)
+	SET(_i_FILES)
+	FOREACH(_current_FILE ${ARGN})
+		get_filename_component(_tmp_FILE ${_current_FILE} ABSOLUTE)
+		get_filename_component(_abs_PATH ${_tmp_FILE} PATH)
+		get_filename_component(_basename ${_tmp_FILE} NAME_WE)
+
+		SET(_i_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.i)
+		ADD_CUSTOM_TARGET(${_basename} ALL
+			COMMAND echo "Processing: ${_current_FILE}"
+			COMMAND ${CMAKE_BINARY_DIR}/tools/install_service -i ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} -o ${_i_FILE} 2> /dev/null
+			DEPENDS ${_current_FILE})
+		ADD_DEPENDENCIES(${_basename} install_service)
+		SET(${_i_FILES} ${${_i_FILES}} ${_i_FILE})
+			
+	ENDFOREACH(_current_FILE)
+	#MACRO_ADDITIONAL_CLEAN_FILES(${_i_FILES})
+ENDMACRO(PROCESS_IIFILES)

Modified: initng-ifiles/trunk/initfiles/CMakeLists.txt
==============================================================================
--- initng-ifiles/trunk/initfiles/CMakeLists.txt	(original)
+++ initng-ifiles/trunk/initfiles/CMakeLists.txt	Tue Apr 11 04:50:24 2006
@@ -15,6 +15,6 @@
 	single.runlevel
 )
 
-PROCESS_IIFILES(${II_FILES})
+PROCESS_IIFILES(I_FILES ${II_FILES})
 
-INSTALL_FILES(/etc/initng FILES ${II_FILES} ${RUNLEVEL_FILES})
+INSTALL_FILES(/etc/initng FILES ${I_FILES} ${RUNLEVEL_FILES})

Modified: initng-ifiles/trunk/initfiles/daemon/CMakeLists.txt
==============================================================================
--- initng-ifiles/trunk/initfiles/daemon/CMakeLists.txt	(original)
+++ initng-ifiles/trunk/initfiles/daemon/CMakeLists.txt	Tue Apr 11 04:50:24 2006
@@ -114,6 +114,6 @@
 	vdr.ii
 )
 
-PROCESS_IIFILES(${II_FILES})
+PROCESS_IIFILES(I_FILES ${II_FILES})
 
-INSTALL_FILES(/etc/initng/daemon FILES ${II_FILES})
+INSTALL_FILES(/etc/initng/daemon FILES ${I_FILES})

Modified: initng-ifiles/trunk/initfiles/daemon/bluetooth/CMakeLists.txt
==============================================================================
--- initng-ifiles/trunk/initfiles/daemon/bluetooth/CMakeLists.txt	(original)
+++ initng-ifiles/trunk/initfiles/daemon/bluetooth/CMakeLists.txt	Tue Apr 11 04:50:24 2006
@@ -9,6 +9,6 @@
 	sdpd.ii
 )
 
-PROCESS_IIFILES(${II_FILES})
+PROCESS_IIFILES(I_FILES ${II_FILES})
 
-INSTALL_FILES(/etc/initng/daemon/bluetooth FILES ${II_FILES})
+INSTALL_FILES(/etc/initng/daemon/bluetooth FILES ${I_FILES})

Modified: initng-ifiles/trunk/initfiles/daemon/lirc/CMakeLists.txt
==============================================================================
--- initng-ifiles/trunk/initfiles/daemon/lirc/CMakeLists.txt	(original)
+++ initng-ifiles/trunk/initfiles/daemon/lirc/CMakeLists.txt	Tue Apr 11 04:50:24 2006
@@ -4,6 +4,6 @@
 	lircrcd.ii
 )
 
-PROCESS_IIFILES(${II_FILES})
+PROCESS_IIFILES(I_FILES ${II_FILES})
 
-INSTALL_FILES(/etc/initng/daemon/lirc FILES ${II_FILES})
+INSTALL_FILES(/etc/initng/daemon/lirc FILES ${I_FILES})

Modified: initng-ifiles/trunk/initfiles/debug/CMakeLists.txt
==============================================================================
--- initng-ifiles/trunk/initfiles/debug/CMakeLists.txt	(original)
+++ initng-ifiles/trunk/initfiles/debug/CMakeLists.txt	Tue Apr 11 04:50:24 2006
@@ -13,7 +13,7 @@
 	empty.ii
 )
 
-PROCESS_IIFILES(${II_FILES})
+PROCESS_IIFILES(I_FILES ${II_FILES})
 
-INSTALL_FILES(/etc/initng/debug FILES ${II_FILES})
+INSTALL_FILES(/etc/initng/debug FILES ${I_FILES})
 INSTALL_PROGRAMS(/etc/initng/debug FILES pidfile-daemon.sh) 

Modified: initng-ifiles/trunk/initfiles/net/CMakeLists.txt
==============================================================================
--- initng-ifiles/trunk/initfiles/net/CMakeLists.txt	(original)
+++ initng-ifiles/trunk/initfiles/net/CMakeLists.txt	Tue Apr 11 04:50:24 2006
@@ -2,6 +2,6 @@
 	net.ii
 )
 
-PROCESS_IIFILES(${II_FILES})
+PROCESS_IIFILES(I_FILES ${II_FILES})
 
-INSTALL_FILES(/etc/initng/net FILES ${II_FILES})
+INSTALL_FILES(/etc/initng/net FILES ${I_FILES})

Modified: initng-ifiles/trunk/initfiles/system/CMakeLists.txt
==============================================================================
--- initng-ifiles/trunk/initfiles/system/CMakeLists.txt	(original)
+++ initng-ifiles/trunk/initfiles/system/CMakeLists.txt	Tue Apr 11 04:50:24 2006
@@ -54,6 +54,6 @@
 	xorgconf.ii
 )
 
-PROCESS_IIFILES(${II_FILES})
+PROCESS_IIFILES(I_FILES ${II_FILES})
 
-INSTALL_FILES(/etc/initng/system FILES ${II_FILES})
+INSTALL_FILES(/etc/initng/system FILES ${I_FILES})