[Initng-svn] r3765 - in initng-ifiles/trunk: .

[svn at initng.thinktux.net]

Author: biebl
Date: Wed Apr 12 00:03:17 2006
New Revision: 3765

Modified:
   initng-ifiles/trunk/CMakeLists.txt
   initng-ifiles/trunk/cmake/InitngMacros.cmake

Log:
If INSTALL_RUNLEVELS is set (default: ON), system.virtual and default.runlevel are created and installed.


Modified: initng-ifiles/trunk/CMakeLists.txt
==============================================================================
--- initng-ifiles/trunk/CMakeLists.txt	(original)
+++ initng-ifiles/trunk/CMakeLists.txt	Wed Apr 12 00:03:17 2006
@@ -20,6 +20,7 @@
 OPTION(INSTALL_SCRIPTS_NET "Install network helper scripts" OFF)
 OPTION(INSTALL_SCRIPTS_SPLASH "Install splash helper scripts" OFF)
 OPTION(INSTALL_DEBUG "Install debug ifiles" OFF)
+OPTION(INSTALL_RUNLEVELS "Generate and install system.virtual and default.runlevel" ON)
 
 IF(INSTALL_VIM)
 	ADD_SUBDIRECTORY(vim)
@@ -31,12 +32,21 @@
 
 INSTALL_PROGRAMS(/sbin FILES gen_system_runlevel)
 
+IF(INSTALL_RUNLEVELS)
+	SET(RUNLEVEL_FILES
+		system.virtual
+		default.runlevel
+	)
+	GENERATE_RUNLEVEL(${RUNLEVEL_FILES})
+
+	INSTALL_FILES(/etc/initng FILES ${RUNLEVEL_FILES})
+ENDIF(INSTALL_RUNLEVELS)
+
 CONFIGURE_FILE(
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
         "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
         IMMEDIATE @ONLY)
 
 ADD_CUSTOM_TARGET(uninstall
-        "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
-")
+        "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 

Modified: initng-ifiles/trunk/cmake/InitngMacros.cmake
==============================================================================
--- initng-ifiles/trunk/cmake/InitngMacros.cmake	(original)
+++ initng-ifiles/trunk/cmake/InitngMacros.cmake	Wed Apr 12 00:03:17 2006
@@ -1,6 +1,7 @@
 MACRO(PROCESS_IIFILES _i_FILES)
 	# reset the variable
 	SET(${_i_FILES})
+
 	FOREACH(_current_FILE ${ARGN})
 		GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE)
 		GET_FILENAME_COMPONENT(_abs_PATH ${_tmp_FILE} PATH)
@@ -9,16 +10,32 @@
 		
 		ADD_CUSTOM_COMMAND(OUTPUT ${_i_FILE}
 			COMMAND ${CMAKE_BINARY_DIR}/tools/install_service 
-			ARGS -i ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} -o ${_i_FILE} 2> /dev/null
+			ARGS -i ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} -o ${_i_FILE} >& /dev/null
 			DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${CMAKE_BINARY_DIR}/tools/install_service)
 		
 		SET(${_i_FILES} ${${_i_FILES}} ${_i_FILE})
 			
 	ENDFOREACH(_current_FILE)
 
-	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_CLEAN_FILES ${_i_FILES})
-
 	ADD_CUSTOM_TARGET(ifiles ALL 
 		DEPENDS ${${_i_FILES}})	
 
 ENDMACRO(PROCESS_IIFILES)
+
+MACRO(GENERATE_RUNLEVEL)
+	SET(_runlevel_FILES)
+	FOREACH(_current_FILE ${ARGN})
+		SET(_runlevel_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_current_FILE})
+		ADD_CUSTOM_COMMAND(OUTPUT ${_runlevel_FILE}
+			COMMAND ${CMAKE_SOURCE_DIR}/gen_system_runlevel 
+			ARGS -confdir ${CMAKE_CURRENT_BINARY_DIR} ${_current_FILE} >& /dev/null
+			DEPENDS ${CMAKE_SOURCE_DIR}/gen_system_runlevel)
+		
+		SET(_runlevel_FILES ${_runlevel_FILES} ${_runlevel_FILE})
+			
+	ENDFOREACH(_current_FILE)
+
+	ADD_CUSTOM_TARGET(runlevel ALL 
+		DEPENDS ${_runlevel_FILES})	
+		
+ENDMACRO(GENERATE_RUNLEVEL)