make developer utilities entirely optional

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

.travis.yml

@@ -20,8 +20,8 @@ before_script:
     - sh -e /etc/init.d/xvfb start
     - sleep 3
 script:
-    - if [ "$CXX" == "clang++" ];then cmake -GNinja -DENABLE_TESTING=TRUE -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" ;fi
+    - if [ "$CXX" == "clang++" ];then cmake -GNinja -DENABLE_TESTING=TRUE -DKATIE_UTILS=ON -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" ;fi
-    - if [ "$CXX" == "g++" ];then cmake -GNinja -DENABLE_TESTING=TRUE -DKATIE_ALLINONE=ON -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" ;fi
+    - if [ "$CXX" == "g++" ];then cmake -GNinja -DENABLE_TESTING=TRUE -DKATIE_UTILS=ON -DKATIE_ALLINONE=ON -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" ;fi
     - ninja
 # the tests/benchmarks take more then 1-hour and Travis times out,
 # despite the documentaiton for the service claiming otherwise

CMakeLists.txt

@@ -134,6 +134,9 @@ add_feature_info(x11 WITH_X11 "an open source something")
 option(KATIE_BOOTSTRAP "Build only core tools" OFF)
 add_feature_info(bootstrap KATIE_BOOTSTRAP "internal build option")
 
+option(KATIE_UTILS "Build maintainance utilities" OFF)
+add_feature_info(utils KATIE_UTILS "developers build option")
+
 option(KATIE_ALLINONE "Build targets from single source file" OFF)
 add_feature_info(allinone KATIE_ALLINONE "experimental build option")
 
@@ -178,6 +181,7 @@ set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
 add_definitions(
     -DQT_USE_QSTRINGBUILDER
     -DQT_ASCII_CAST_WARNINGS
+    -DQT_POSIX_IPC
     # -DQT_STRICT_ITERATORS
     # maybe one day, this forces it onto other projects which (most likely)
     # means source code adjustments!
@@ -633,16 +637,18 @@ endif()
 add_subdirectory(src/tools)
 
 # utilities needed for Katie maintainance
-add_subdirectory(util/fixnonlatin1)
+if(KATIE_UTILS)
-add_subdirectory(util/gencmap)
+    add_subdirectory(util/fixnonlatin1)
-add_subdirectory(util/lexgen)
+    add_subdirectory(util/gencmap)
-add_subdirectory(util/normalize)
+    add_subdirectory(util/lexgen)
-add_subdirectory(util/plugintest)
+    add_subdirectory(util/normalize)
-add_subdirectory(util/qlalr)
+    add_subdirectory(util/plugintest)
-add_subdirectory(util/qurl-generateTLDs)
+    add_subdirectory(util/qlalr)
-add_subdirectory(util/unicode)
+    add_subdirectory(util/qurl-generateTLDs)
-add_subdirectory(util/xkbdatagen)
+    add_subdirectory(util/unicode)
-add_subdirectory(util/generaterun)
+    add_subdirectory(util/xkbdatagen)
+    add_subdirectory(util/generaterun)
+endif()
 
 # the macro calls bellow are generted via the incfsck script
 katie_generate_obsolete(qxmlstreamnotationdeclaration.h QtCore qxmlstream.h)

util/fixnonlatin1/CMakeLists.txt

@@ -15,5 +15,5 @@ set(FIXONLATIN1_SOURCES
 
 katie_setup_target(fixonlatin1 ${FIXONLATIN1_SOURCES})
 
-add_executable(fixonlatin1 EXCLUDE_FROM_ALL ${fixonlatin1_SOURCES})
+add_executable(fixonlatin1 ${fixonlatin1_SOURCES})
 target_link_libraries(fixonlatin1 ${EXTRA_FIXONLATIN1_LIBS})

util/gencmap/CMakeLists.txt

@@ -17,5 +17,5 @@ set(GENCMAP_SOURCES
 
 katie_setup_target(gencmap ${GENCMAP_SOURCES})
 
-add_executable(gencmap EXCLUDE_FROM_ALL ${gencmap_SOURCES})
+add_executable(gencmap ${gencmap_SOURCES})
 target_link_libraries(gencmap ${EXTRA_GENCMAP_LIBS})

util/generaterun/CMakeLists.txt

@@ -17,5 +17,5 @@ set(GENERATERUN_SOURCES
 
 katie_setup_target(generaterun ${GENERATERUN_SOURCES})
 
-add_executable(generaterun EXCLUDE_FROM_ALL ${generaterun_SOURCES})
+add_executable(generaterun ${generaterun_SOURCES})
 target_link_libraries(generaterun ${EXTRA_GENERATERUN_LIBS})

util/integrity/qt.bod

@@ -1,111 +0,0 @@
-CommandOptions {
-	MOCCommandOptions {
-		MOCOutput {
-			{
-				name="-o"
-			}
-			delimiter="Space"
-			merge="Replace"
-			#flags={"OUTPUTNAME"}
-		}
-		MOCDefines {
-			{
-				name="-D"
-			}
-			delimiter="Touching"
-			merge="Concat"
-		}
-		MOCIncludes {
-			{
-				name="-I"
-			}
-			delimiter="Touching"
-			merge="Concat"
-			flags={"RELATIVEPATH"}
-		}
-	}
-	UICommandOptions {
-		UIOutput {
-			{
-				name="-o"
-			}
-			delimiter="Space"
-			merge="Replace"
-			flags={"OUTPUTNAME"}
-		}
-	}
-	RCCCommandOptions {
-		RCCOutput {
-			{
-				name="-o"
-			}
-			delimiter="Space"
-			merge="Replace"
-			flags={"OUTPUTNAME"}
-		}
-		RCCName {
-			{
-				name="-name"
-			}
-			delimiter="Space"
-			merge="Replace"
-		}
-	}
-}
-
-Commands {
-	MOCPreprocessor {
-		name="MOCPreprocessor"
-		exec="${QT_BUILD_DIR}/bin/moc"
-		options={ "MOCCommandOptions", "SpecialOptions" }
-	}
-	UIPreprocessor {
-		name="UIPreprocessor"
-		exec="${QT_BUILD_DIR}/bin/uic"
-		options={ "UICommandOptions" }
-	}
-	RCCPreprocessor {
-		name="RCCPreprocessor"
-		exec="${QT_BUILD_DIR}/bin/rcc"
-		options={ "RCCCommandOptions" }
-	}
-}
-
-FileTypes {
-	MocCPP {
-		name="MOC/Qt Header"
-		outputExtension="time"
-		outputType="SourceFile"
-		command="MOCPreprocessor"
-		commandLine="${QT_BUILD_DIR}/bin/moc -nn $OPTIONS $INPUTFILE"
-		progress="MOCing"
-		extraFiles="$(OUTPUTDIR)/moc_$(OUTPUTNAMEBASE).cpp"
-		#postExecSafe={"${GHS_TOOLS_DIR}/filechanged work/$(OUTPUTNAME)"}
-		color="#0020a0"
-		grepable=true
-	}
-	RCC {
-		name="Qt Resource"
-		outputExtension="time"
-		#extensions={"qrc"}
-		outputType="SourceFile"
-		command="RCCPreprocessor"
-		commandLine="${QT_BUILD_DIR}/bin/rcc $OPTIONS $INPUTFILE"
-		extraFiles="$(OUTPUTDIR)/qrc_$(OUTPUTNAMEBASE).cpp"
-		progress="Generating Resource source from"
-		action="Generate Resource source for"
-		grepable=true
-	}
-	UI {
-		name="Qt Dialog"
-		outputExtension="time"
-		#extensions={"ui"}
-		outputType="SourceFile"
-		command="UIPreprocessor"
-		commandLine="${QT_BUILD_DIR}/bin/uic $OPTIONS $INPUTFILE"
-		extraFiles="$(OUTPUTDIR)/ui_$(OUTPUTNAMEBASE).cpp"
-		progress="Generating Dialog source from"
-		action="Generate Dialog source for"
-		grepable=true
-	}
-}

util/lexgen/CMakeLists.txt

@@ -27,5 +27,5 @@ set(LEXGEN_HEADERS
 
 katie_setup_target(lexgen ${LEXGEN_SOURCES} ${LEXGEN_HEADERS})
 
-add_executable(lexgen EXCLUDE_FROM_ALL ${lexgen_SOURCES})
+add_executable(lexgen ${lexgen_SOURCES})
 target_link_libraries(lexgen ${EXTRA_LEXGEN_LIBS})

util/normalize/CMakeLists.txt

@@ -15,5 +15,5 @@ set(NORMALIZE_SOURCES
 
 katie_setup_target(normalize ${NORMALIZE_SOURCES})
 
-add_executable(normalize EXCLUDE_FROM_ALL ${normalize_SOURCES})
+add_executable(normalize ${normalize_SOURCES})
 target_link_libraries(normalize ${EXTRA_NORMALIZE_LIBS})

util/plugintest/CMakeLists.txt

@@ -15,5 +15,5 @@ set(PLUGINTEST_SOURCES
 
 katie_setup_target(plugintest ${PLUGINTEST_SOURCES})
 
-add_executable(plugintest EXCLUDE_FROM_ALL ${plugintest_SOURCES})
+add_executable(plugintest ${plugintest_SOURCES})
 target_link_libraries(plugintest ${EXTRA_PLUGINTEST_LIBS})

util/plugintest/plugintest.pro

@@ -1,4 +0,0 @@
-TEMPLATE = app
-TARGET = plugintest
-SOURCES += main.cpp
-QT = core

util/qlalr/CMakeLists.txt

@@ -31,5 +31,5 @@ set(QLALR_HEADERS
 
 katie_setup_target(qlalr ${QLALR_SOURCES} ${QLALR_HEADERS})
 
-add_executable(qlalr EXCLUDE_FROM_ALL ${qlalr_SOURCES})
+add_executable(qlalr ${qlalr_SOURCES})
 target_link_libraries(qlalr ${EXTRA_QLALR_LIBS})

util/qurl-generateTLDs/CMakeLists.txt

@@ -15,5 +15,5 @@ set(QURLGENERATE_SOURCES
 
 katie_setup_target(qurl-generateTLDs ${QURLGENERATE_SOURCES})
 
-add_executable(qurl-generateTLDs EXCLUDE_FROM_ALL ${qurl-generateTLDs_SOURCES})
+add_executable(qurl-generateTLDs ${qurl-generateTLDs_SOURCES})
 target_link_libraries(qurl-generateTLDs ${EXTRA_QURLGENERATE_LIBS})

util/unicode/CMakeLists.txt

@@ -15,5 +15,5 @@ set(UNICODE_SOURCES
 
 katie_setup_target(unicode ${UNICODE_SOURCES})
 
-add_executable(unicode EXCLUDE_FROM_ALL ${unicode_SOURCES})
+add_executable(unicode ${unicode_SOURCES})
 target_link_libraries(unicode ${EXTRA_UNICODE_LIBS})

util/xkbdatagen/CMakeLists.txt

@@ -17,5 +17,5 @@ set(XKBDATAGEN_SOURCES
 
 katie_setup_target(xkbdatagen ${XKBDATAGEN_SOURCES})
 
-add_executable(xkbdatagen EXCLUDE_FROM_ALL ${xkbdatagen_SOURCES})
+add_executable(xkbdatagen ${xkbdatagen_SOURCES})
 target_link_libraries(xkbdatagen ${EXTRA_XKBDATAGEN_LIBS})