From 8b0c4ac0a3d03465c12c2e01c307f319a7f4a361 Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Thu, 10 Dec 2015 15:32:52 +0100 Subject: [PATCH] Added Netbean to work with cmake --- .gitignore | 2 + Makefile | 129 ------------- nbproject/Makefile-Debug.mk | 126 ------------- nbproject/Makefile-Release.mk | 126 ------------- nbproject/Makefile-impl.mk | 133 ------------- nbproject/Makefile-variables.mk | 35 ---- nbproject/Package-Debug.bash | 76 -------- nbproject/Package-Release.bash | 76 -------- nbproject/configurations.xml | 206 ++++++++++++--------- nbproject/{ => private}/.gitignore | 2 +- .../private/CodeAssistancePathMapper.properties | 1 + nbproject/private/Default-build.log | 11 ++ nbproject/private/Default-exec.log | 168 +++++++++++++++++ nbproject/private/Default.properties | 1 + nbproject/private/configurations.xml | 89 +++++++++ nbproject/private/launcher.properties | 40 ++++ nbproject/private/private.xml | 10 + nbproject/project.xml | 14 +- src/main.c | 1 - 19 files changed, 450 insertions(+), 796 deletions(-) delete mode 100644 Makefile delete mode 100644 nbproject/Makefile-Debug.mk delete mode 100644 nbproject/Makefile-Release.mk delete mode 100644 nbproject/Makefile-impl.mk delete mode 100644 nbproject/Makefile-variables.mk delete mode 100644 nbproject/Package-Debug.bash delete mode 100644 nbproject/Package-Release.bash rename nbproject/{ => private}/.gitignore (95%) create mode 100644 nbproject/private/CodeAssistancePathMapper.properties create mode 100644 nbproject/private/Default-build.log create mode 100644 nbproject/private/Default-exec.log create mode 100644 nbproject/private/Default.properties create mode 100644 nbproject/private/configurations.xml create mode 100644 nbproject/private/launcher.properties create mode 100644 nbproject/private/private.xml diff --git a/.gitignore b/.gitignore index f42a67c2..3bd40a1f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ build/** dist/** !.gitignore .dep.inc +CMakeFiles/ +CMakeCache.txt diff --git a/Makefile b/Makefile deleted file mode 100644 index 180d7a16..00000000 --- a/Makefile +++ /dev/null @@ -1,129 +0,0 @@ -# -# There exist several targets which are by default empty and which can be -# used for execution of your targets. These targets are usually executed -# before and after some main targets. They are: -# -# .build-pre: called before 'build' target -# .build-post: called after 'build' target -# .clean-pre: called before 'clean' target -# .clean-post: called after 'clean' target -# .clobber-pre: called before 'clobber' target -# .clobber-post: called after 'clobber' target -# .all-pre: called before 'all' target -# .all-post: called after 'all' target -# .help-pre: called before 'help' target -# .help-post: called after 'help' target -# -# Targets beginning with '.' are not intended to be called on their own. -# -# Main targets can be executed directly, and they are: -# -# build build a specific configuration -# clean remove built files from a configuration -# clobber remove all built files -# all build all configurations -# help print help mesage -# -# Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and -# .help-impl are implemented in nbproject/makefile-impl.mk. -# -# Available make variables: -# -# CND_BASEDIR base directory for relative paths -# CND_DISTDIR default top distribution directory (build artifacts) -# CND_BUILDDIR default top build directory (object files, ...) -# CONF name of current configuration -# CND_PLATFORM_${CONF} platform name (current configuration) -# CND_ARTIFACT_DIR_${CONF} directory of build artifact (current configuration) -# CND_ARTIFACT_NAME_${CONF} name of build artifact (current configuration) -# CND_ARTIFACT_PATH_${CONF} path to build artifact (current configuration) -# CND_PACKAGE_DIR_${CONF} directory of package (current configuration) -# CND_PACKAGE_NAME_${CONF} name of package (current configuration) -# CND_PACKAGE_PATH_${CONF} path to package (current configuration) -# -# NOCDDL -CND_BUILDDIR=./build -CND_DISTDIR=./build/dist - -# Environment -MKDIR=mkdir -CP=cp -CCADMIN=CCadmin - - -# build -build: .build-post - -.build-pre: -# Add your pre 'build' code here... - -.build-post: .build-impl -# Add your post 'build' code here... - - -# clean -clean: .clean-post - -.clean-pre: -# Add your pre 'clean' code here... - -.clean-post: .clean-impl -# Add your post 'clean' code here... - - -# clobber -clobber: .clobber-post - -.clobber-pre: -# Add your pre 'clobber' code here... - -.clobber-post: .clobber-impl -# Add your post 'clobber' code here... - - -# all -all: .all-post - -.all-pre: -# Add your pre 'all' code here... - -.all-post: .all-impl -# Add your post 'all' code here... - - -# build tests -build-tests: .build-tests-post - -.build-tests-pre: -# Add your pre 'build-tests' code here... - -.build-tests-post: .build-tests-impl -# Add your post 'build-tests' code here... - - -# run tests -test: .test-post - -.test-pre: build-tests -# Add your pre 'test' code here... - -.test-post: .test-impl -# Add your post 'test' code here... - - -# help -help: .help-post - -.help-pre: -# Add your pre 'help' code here... - -.help-post: .help-impl -# Add your post 'help' code here... - - - -# include project implementation makefile -include nbproject/Makefile-impl.mk - -# include project make variables -include nbproject/Makefile-variables.mk diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk deleted file mode 100644 index 39692f38..00000000 --- a/nbproject/Makefile-Debug.mk +++ /dev/null @@ -1,126 +0,0 @@ -# -# Generated Makefile - do not edit! -# -# Edit the Makefile in the project folder instead (../Makefile). Each target -# has a -pre and a -post target defined where you can add customized code. -# -# This makefile implements configuration specific macros and targets. - - -# Environment -MKDIR=mkdir -CP=cp -GREP=grep -NM=nm -CCADMIN=CCadmin -RANLIB=ranlib -CC=gcc -CCC=g++ -CXX=g++ -FC=gfortran -AS=as - -# Macros -CND_PLATFORM=GNU-Linux -CND_DLIB_EXT=so -CND_CONF=Debug -CND_DISTDIR=dist -CND_BUILDDIR=build - -# Include project Makefile -include Makefile - -# Object Directory -OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} - -# Object Files -OBJECTFILES= \ - ${OBJECTDIR}/src/afbs-api.o \ - ${OBJECTDIR}/src/alsa-api.o \ - ${OBJECTDIR}/src/config.o \ - ${OBJECTDIR}/src/dbus-api.o \ - ${OBJECTDIR}/src/http-svc.o \ - ${OBJECTDIR}/src/main.o \ - ${OBJECTDIR}/src/rest-api.o \ - ${OBJECTDIR}/src/session.o - - -# C Compiler Flags -CFLAGS= - -# CC Compiler Flags -CCFLAGS= -CXXFLAGS= - -# Fortran Compiler Flags -FFLAGS= - -# Assembler Flags -ASFLAGS= - -# Link Libraries and Options -LDLIBSOPTIONS=`pkg-config --libs libmicrohttpd` `pkg-config --libs json-c` -lefence -lmagic - -# Build Targets -.build-conf: ${BUILD_SUBPROJECTS} - "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon - -${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon: ${OBJECTFILES} - ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} - ${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon ${OBJECTFILES} ${LDLIBSOPTIONS} - -${OBJECTDIR}/src/afbs-api.o: src/afbs-api.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/afbs-api.o src/afbs-api.c - -${OBJECTDIR}/src/alsa-api.o: src/alsa-api.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/alsa-api.o src/alsa-api.c - -${OBJECTDIR}/src/config.o: src/config.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/config.o src/config.c - -${OBJECTDIR}/src/dbus-api.o: src/dbus-api.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/dbus-api.o src/dbus-api.c - -${OBJECTDIR}/src/http-svc.o: src/http-svc.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http-svc.o src/http-svc.c - -${OBJECTDIR}/src/main.o: src/main.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c - -${OBJECTDIR}/src/rest-api.o: src/rest-api.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/rest-api.o src/rest-api.c - -${OBJECTDIR}/src/session.o: src/session.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/session.o src/session.c - -# Subprojects -.build-subprojects: - -# Clean Targets -.clean-conf: ${CLEAN_SUBPROJECTS} - ${RM} -r ${CND_BUILDDIR}/${CND_CONF} - ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon - -# Subprojects -.clean-subprojects: - -# Enable dependency checking -.dep.inc: .depcheck-impl - -include .dep.inc diff --git a/nbproject/Makefile-Release.mk b/nbproject/Makefile-Release.mk deleted file mode 100644 index 7cbdfe86..00000000 --- a/nbproject/Makefile-Release.mk +++ /dev/null @@ -1,126 +0,0 @@ -# -# Generated Makefile - do not edit! -# -# Edit the Makefile in the project folder instead (../Makefile). Each target -# has a -pre and a -post target defined where you can add customized code. -# -# This makefile implements configuration specific macros and targets. - - -# Environment -MKDIR=mkdir -CP=cp -GREP=grep -NM=nm -CCADMIN=CCadmin -RANLIB=ranlib -CC=gcc -CCC=g++ -CXX=g++ -FC=gfortran -AS=as - -# Macros -CND_PLATFORM=GNU-Linux -CND_DLIB_EXT=so -CND_CONF=Release -CND_DISTDIR=dist -CND_BUILDDIR=build - -# Include project Makefile -include Makefile - -# Object Directory -OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} - -# Object Files -OBJECTFILES= \ - ${OBJECTDIR}/src/afbs-api.o \ - ${OBJECTDIR}/src/alsa-api.o \ - ${OBJECTDIR}/src/config.o \ - ${OBJECTDIR}/src/dbus-api.o \ - ${OBJECTDIR}/src/http-svc.o \ - ${OBJECTDIR}/src/main.o \ - ${OBJECTDIR}/src/rest-api.o \ - ${OBJECTDIR}/src/session.o - - -# C Compiler Flags -CFLAGS= - -# CC Compiler Flags -CCFLAGS= -CXXFLAGS= - -# Fortran Compiler Flags -FFLAGS= - -# Assembler Flags -ASFLAGS= - -# Link Libraries and Options -LDLIBSOPTIONS= - -# Build Targets -.build-conf: ${BUILD_SUBPROJECTS} - "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon - -${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon: ${OBJECTFILES} - ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} - ${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon ${OBJECTFILES} ${LDLIBSOPTIONS} - -${OBJECTDIR}/src/afbs-api.o: src/afbs-api.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/afbs-api.o src/afbs-api.c - -${OBJECTDIR}/src/alsa-api.o: src/alsa-api.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/alsa-api.o src/alsa-api.c - -${OBJECTDIR}/src/config.o: src/config.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/config.o src/config.c - -${OBJECTDIR}/src/dbus-api.o: src/dbus-api.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/dbus-api.o src/dbus-api.c - -${OBJECTDIR}/src/http-svc.o: src/http-svc.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http-svc.o src/http-svc.c - -${OBJECTDIR}/src/main.o: src/main.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c - -${OBJECTDIR}/src/rest-api.o: src/rest-api.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/rest-api.o src/rest-api.c - -${OBJECTDIR}/src/session.o: src/session.c - ${MKDIR} -p ${OBJECTDIR}/src - ${RM} "$@.d" - $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/session.o src/session.c - -# Subprojects -.build-subprojects: - -# Clean Targets -.clean-conf: ${CLEAN_SUBPROJECTS} - ${RM} -r ${CND_BUILDDIR}/${CND_CONF} - ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon - -# Subprojects -.clean-subprojects: - -# Enable dependency checking -.dep.inc: .depcheck-impl - -include .dep.inc diff --git a/nbproject/Makefile-impl.mk b/nbproject/Makefile-impl.mk deleted file mode 100644 index a2d5e848..00000000 --- a/nbproject/Makefile-impl.mk +++ /dev/null @@ -1,133 +0,0 @@ -# -# Generated Makefile - do not edit! -# -# Edit the Makefile in the project folder instead (../Makefile). Each target -# has a pre- and a post- target defined where you can add customization code. -# -# This makefile implements macros and targets common to all configurations. -# -# NOCDDL - - -# Building and Cleaning subprojects are done by default, but can be controlled with the SUB -# macro. If SUB=no, subprojects will not be built or cleaned. The following macro -# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf -# and .clean-reqprojects-conf unless SUB has the value 'no' -SUB_no=NO -SUBPROJECTS=${SUB_${SUB}} -BUILD_SUBPROJECTS_=.build-subprojects -BUILD_SUBPROJECTS_NO= -BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}} -CLEAN_SUBPROJECTS_=.clean-subprojects -CLEAN_SUBPROJECTS_NO= -CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}} - - -# Project Name -PROJECTNAME=afb-daemon - -# Active Configuration -DEFAULTCONF=Debug -CONF=${DEFAULTCONF} - -# All Configurations -ALLCONFS=Debug Release - - -# build -.build-impl: .build-pre .validate-impl .depcheck-impl - @#echo "=> Running $@... Configuration=$(CONF)" - "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf - - -# clean -.clean-impl: .clean-pre .validate-impl .depcheck-impl - @#echo "=> Running $@... Configuration=$(CONF)" - "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf - - -# clobber -.clobber-impl: .clobber-pre .depcheck-impl - @#echo "=> Running $@..." - for CONF in ${ALLCONFS}; \ - do \ - "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf; \ - done - -# all -.all-impl: .all-pre .depcheck-impl - @#echo "=> Running $@..." - for CONF in ${ALLCONFS}; \ - do \ - "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf; \ - done - -# build tests -.build-tests-impl: .build-impl .build-tests-pre - @#echo "=> Running $@... Configuration=$(CONF)" - "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-tests-conf - -# run tests -.test-impl: .build-tests-impl .test-pre - @#echo "=> Running $@... Configuration=$(CONF)" - "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .test-conf - -# dependency checking support -.depcheck-impl: - @echo "# This code depends on make tool being used" >.dep.inc - @if [ -n "${MAKE_VERSION}" ]; then \ - echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES} \$${TESTOBJECTFILES}))" >>.dep.inc; \ - echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \ - echo "include \$${DEPFILES}" >>.dep.inc; \ - echo "endif" >>.dep.inc; \ - else \ - echo ".KEEP_STATE:" >>.dep.inc; \ - echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \ - fi - -# configuration validation -.validate-impl: - @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \ - then \ - echo ""; \ - echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \ - echo "See 'make help' for details."; \ - echo "Current directory: " `pwd`; \ - echo ""; \ - fi - @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \ - then \ - exit 1; \ - fi - - -# help -.help-impl: .help-pre - @echo "This makefile supports the following configurations:" - @echo " ${ALLCONFS}" - @echo "" - @echo "and the following targets:" - @echo " build (default target)" - @echo " clean" - @echo " clobber" - @echo " all" - @echo " help" - @echo "" - @echo "Makefile Usage:" - @echo " make [CONF=] [SUB=no] build" - @echo " make [CONF=] [SUB=no] clean" - @echo " make [SUB=no] clobber" - @echo " make [SUB=no] all" - @echo " make help" - @echo "" - @echo "Target 'build' will build a specific configuration and, unless 'SUB=no'," - @echo " also build subprojects." - @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no'," - @echo " also clean subprojects." - @echo "Target 'clobber' will remove all built files from all configurations and," - @echo " unless 'SUB=no', also from subprojects." - @echo "Target 'all' will will build all configurations and, unless 'SUB=no'," - @echo " also build subprojects." - @echo "Target 'help' prints this message." - @echo "" - diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk deleted file mode 100644 index 60514673..00000000 --- a/nbproject/Makefile-variables.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# Generated - do not edit! -# -# NOCDDL -# -CND_BASEDIR=`pwd` -CND_BUILDDIR=build -CND_DISTDIR=dist -# Debug configuration -CND_PLATFORM_Debug=GNU-Linux -CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-Linux -CND_ARTIFACT_NAME_Debug=afb-daemon -CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux/afb-daemon -CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux/package -CND_PACKAGE_NAME_Debug=afb-daemon.tar -CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux/package/afb-daemon.tar -# Release configuration -CND_PLATFORM_Release=GNU-Linux -CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux -CND_ARTIFACT_NAME_Release=afb-daemon -CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux/afb-daemon -CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package -CND_PACKAGE_NAME_Release=afb-daemon.tar -CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/afb-daemon.tar -# -# include compiler specific variables -# -# dmake command -ROOT:sh = test -f nbproject/private/Makefile-variables.mk || \ - (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk) -# -# gmake command -.PHONY: $(shell test -f nbproject/private/Makefile-variables.mk || (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk)) -# -include nbproject/private/Makefile-variables.mk diff --git a/nbproject/Package-Debug.bash b/nbproject/Package-Debug.bash deleted file mode 100644 index b7d25543..00000000 --- a/nbproject/Package-Debug.bash +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -x - -# -# Generated - do not edit! -# - -# Macros -TOP=`pwd` -CND_PLATFORM=GNU-Linux -CND_CONF=Debug -CND_DISTDIR=dist -CND_BUILDDIR=build -CND_DLIB_EXT=so -NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging -TMPDIRNAME=tmp-packaging -OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon -OUTPUT_BASENAME=afb-daemon -PACKAGE_TOP_DIR=afb-daemon/ - -# Functions -function checkReturnCode -{ - rc=$? - if [ $rc != 0 ] - then - exit $rc - fi -} -function makeDirectory -# $1 directory path -# $2 permission (optional) -{ - mkdir -p "$1" - checkReturnCode - if [ "$2" != "" ] - then - chmod $2 "$1" - checkReturnCode - fi -} -function copyFileToTmpDir -# $1 from-file path -# $2 to-file path -# $3 permission -{ - cp "$1" "$2" - checkReturnCode - if [ "$3" != "" ] - then - chmod $3 "$2" - checkReturnCode - fi -} - -# Setup -cd "${TOP}" -mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package -rm -rf ${NBTMPDIR} -mkdir -p ${NBTMPDIR} - -# Copy files and create directories and links -cd "${TOP}" -makeDirectory "${NBTMPDIR}/afb-daemon/bin" -copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 - - -# Generate tar file -cd "${TOP}" -rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar -cd ${NBTMPDIR} -tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar * -checkReturnCode - -# Cleanup -cd "${TOP}" -rm -rf ${NBTMPDIR} diff --git a/nbproject/Package-Release.bash b/nbproject/Package-Release.bash deleted file mode 100644 index 627cc4c8..00000000 --- a/nbproject/Package-Release.bash +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -x - -# -# Generated - do not edit! -# - -# Macros -TOP=`pwd` -CND_PLATFORM=GNU-Linux -CND_CONF=Release -CND_DISTDIR=dist -CND_BUILDDIR=build -CND_DLIB_EXT=so -NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging -TMPDIRNAME=tmp-packaging -OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon -OUTPUT_BASENAME=afb-daemon -PACKAGE_TOP_DIR=afb-daemon/ - -# Functions -function checkReturnCode -{ - rc=$? - if [ $rc != 0 ] - then - exit $rc - fi -} -function makeDirectory -# $1 directory path -# $2 permission (optional) -{ - mkdir -p "$1" - checkReturnCode - if [ "$2" != "" ] - then - chmod $2 "$1" - checkReturnCode - fi -} -function copyFileToTmpDir -# $1 from-file path -# $2 to-file path -# $3 permission -{ - cp "$1" "$2" - checkReturnCode - if [ "$3" != "" ] - then - chmod $3 "$2" - checkReturnCode - fi -} - -# Setup -cd "${TOP}" -mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package -rm -rf ${NBTMPDIR} -mkdir -p ${NBTMPDIR} - -# Copy files and create directories and links -cd "${TOP}" -makeDirectory "${NBTMPDIR}/afb-daemon/bin" -copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 - - -# Generate tar file -cd "${TOP}" -rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar -cd ${NBTMPDIR} -tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar * -checkReturnCode - -# Cleanup -cd "${TOP}" -rm -rf ${NBTMPDIR} diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index ce722f75..511a81e2 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -1,115 +1,151 @@ - - - - - - src/afbs-api.c - src/alsa-api.c - src/config.c - src/dbus-api.c - src/http-svc.c - src/main.c - src/rest-api.c - src/session.c - - - + + + afbs-api.c + alsa-api.c + config.c + dbus-api.c + http-svc.c + main.c + rest-api.c + session.c + + - Makefile + CMakeLists.txt + build/Makefile + nbproject/private/launcher.properties - Makefile + ^(nbproject)$ + + . + + build/Makefile - + default - true + false false - - + + + + + + + + + build + ${MAKE} -f Makefile + ${MAKE} -f Makefile clean + build/src/afb-daemon + + + build + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=${IDE_CC} -DCMAKE_CXX_COMPILER=${IDE_CXX} -DCMAKE_C_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_CXX_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .. + + + + + src /usr/include/json-c include - /opt/libmagic/include + build/src - - - `pkg-config --libs libmicrohttpd` - `pkg-config --libs json-c` - efence - magic - - - - - - - - - - - - - - - - - - - - - - default - true - false - - - - 5 + + + + src + /usr/include/json-c + include + build/src + - - 5 - - - 5 - - - 5 - - - - - - + + + + src + /usr/include/json-c + include + build/src + + + __PIC__=2 + __PIE__=2 + __REGISTER_PREFIX__= + __USER_LABEL_PREFIX__= + __pic__=2 + __pie__=2 + + - + + + + src + /usr/include/json-c + include + build/src + + - + + + + src + /usr/include/json-c + include + build/src + + - + + + + include + /usr/include/json-c + build/src + + - + + + + src + /usr/include/json-c + include + build/src + + - + + + + src + /usr/include/json-c + include + build/src + + + __PIC__=2 + __PIE__=2 + __REGISTER_PREFIX__= + __USER_LABEL_PREFIX__= + __pic__=2 + __pie__=2 + + diff --git a/nbproject/.gitignore b/nbproject/private/.gitignore similarity index 95% rename from nbproject/.gitignore rename to nbproject/private/.gitignore index 5e7d2734..da2f4b01 100644 --- a/nbproject/.gitignore +++ b/nbproject/private/.gitignore @@ -1,4 +1,4 @@ # Ignore everything in this directory -* +** # Except this file !.gitignore diff --git a/nbproject/private/CodeAssistancePathMapper.properties b/nbproject/private/CodeAssistancePathMapper.properties new file mode 100644 index 00000000..7f5ded8f --- /dev/null +++ b/nbproject/private/CodeAssistancePathMapper.properties @@ -0,0 +1 @@ +# Automatic path mapper. CRC = 1 diff --git a/nbproject/private/Default-build.log b/nbproject/private/Default-build.log new file mode 100644 index 00000000..df500729 --- /dev/null +++ b/nbproject/private/Default-build.log @@ -0,0 +1,11 @@ +Scanning dependencies of target afb-daemon +[ 12%] Building C object src/CMakeFiles/afb-daemon.dir/main.c.o +[ 25%] Building C object src/CMakeFiles/afb-daemon.dir/config.c.o +[ 37%] Building C object src/CMakeFiles/afb-daemon.dir/session.c.o +[ 50%] Building C object src/CMakeFiles/afb-daemon.dir/http-svc.c.o +[ 62%] Building C object src/CMakeFiles/afb-daemon.dir/afbs-api.c.o +[ 75%] Building C object src/CMakeFiles/afb-daemon.dir/dbus-api.c.o +[ 87%] Building C object src/CMakeFiles/afb-daemon.dir/rest-api.c.o +[100%] Building C object src/CMakeFiles/afb-daemon.dir/alsa-api.c.o +Linking C executable afb-daemon +[100%] Built target afb-daemon diff --git a/nbproject/private/Default-exec.log b/nbproject/private/Default-exec.log new file mode 100644 index 00000000..ae220060 --- /dev/null +++ b/nbproject/private/Default-exec.log @@ -0,0 +1,168 @@ +called: /usr/bin/gcc + /home/fulup/Workspace/afb-daemon/build/src + /usr/bin/gcc + -g3 + -gdwarf-2 + -fPIE + -I/home/fulup/Workspace/afb-daemon/include + -I/usr/include/json-c + -o + CMakeFiles/afb-daemon.dir/main.c.o + -c + /home/fulup/Workspace/afb-daemon/src/main.c + +called: /usr/bin/gcc + /home/fulup/Workspace/afb-daemon/build/src + /usr/bin/gcc + -g3 + -gdwarf-2 + -fPIE + -I/home/fulup/Workspace/afb-daemon/include + -I/usr/include/json-c + -o + CMakeFiles/afb-daemon.dir/config.c.o + -c + /home/fulup/Workspace/afb-daemon/src/config.c + +called: /usr/bin/gcc + /home/fulup/Workspace/afb-daemon/build/src + /usr/bin/gcc + -g3 + -gdwarf-2 + -fPIE + -I/home/fulup/Workspace/afb-daemon/include + -I/usr/include/json-c + -o + CMakeFiles/afb-daemon.dir/session.c.o + -c + /home/fulup/Workspace/afb-daemon/src/session.c + +called: /usr/bin/gcc + /home/fulup/Workspace/afb-daemon/build/src + /usr/bin/gcc + -g3 + -gdwarf-2 + -fPIE + -I/home/fulup/Workspace/afb-daemon/include + -I/usr/include/json-c + -o + CMakeFiles/afb-daemon.dir/http-svc.c.o + -c + /home/fulup/Workspace/afb-daemon/src/http-svc.c + +called: /usr/bin/gcc + /home/fulup/Workspace/afb-daemon/build/src + /usr/bin/gcc + -g3 + -gdwarf-2 + -fPIE + -I/home/fulup/Workspace/afb-daemon/include + -I/usr/include/json-c + -o + CMakeFiles/afb-daemon.dir/afbs-api.c.o + -c + /home/fulup/Workspace/afb-daemon/src/afbs-api.c + +called: /usr/bin/gcc + /home/fulup/Workspace/afb-daemon/build/src + /usr/bin/gcc + -g3 + -gdwarf-2 + -fPIE + -I/home/fulup/Workspace/afb-daemon/include + -I/usr/include/json-c + -o + CMakeFiles/afb-daemon.dir/dbus-api.c.o + -c + /home/fulup/Workspace/afb-daemon/src/dbus-api.c + +called: /usr/bin/gcc + /home/fulup/Workspace/afb-daemon/build/src + /usr/bin/gcc + -g3 + -gdwarf-2 + -fPIE + -I/home/fulup/Workspace/afb-daemon/include + -I/usr/include/json-c + -o + CMakeFiles/afb-daemon.dir/rest-api.c.o + -c + /home/fulup/Workspace/afb-daemon/src/rest-api.c + +called: /usr/bin/gcc + /home/fulup/Workspace/afb-daemon/build/src + /usr/bin/gcc + -g3 + -gdwarf-2 + -fPIE + -I/home/fulup/Workspace/afb-daemon/include + -I/usr/include/json-c + -o + CMakeFiles/afb-daemon.dir/alsa-api.c.o + -c + /home/fulup/Workspace/afb-daemon/src/alsa-api.c + +called: /usr/bin/gcc + /home/fulup/Workspace/afb-daemon/build/src + /usr/bin/gcc + -g3 + -gdwarf-2 + CMakeFiles/afb-daemon.dir/main.c.o + CMakeFiles/afb-daemon.dir/config.c.o + CMakeFiles/afb-daemon.dir/session.c.o + CMakeFiles/afb-daemon.dir/http-svc.c.o + CMakeFiles/afb-daemon.dir/afbs-api.c.o + CMakeFiles/afb-daemon.dir/dbus-api.c.o + CMakeFiles/afb-daemon.dir/rest-api.c.o + CMakeFiles/afb-daemon.dir/alsa-api.c.o + -o + afb-daemon + -rdynamic + -ljson-c + -lmicrohttpd + -lmagic + +called: /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/bin/ld + /home/fulup/Workspace/afb-daemon/build/src + /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/bin/ld + --build-id + --eh-frame-hdr + -m + elf_x86_64 + -export-dynamic + -dynamic-linker + /lib64/ld-linux-x86-64.so.2 + -o + afb-daemon + /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../lib64/crt1.o + /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../lib64/crti.o + /usr/lib64/gcc/x86_64-suse-linux/4.8/crtbegin.o + -L/usr/lib64/gcc/x86_64-suse-linux/4.8 + -L/usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../lib64 + -L/lib/../lib64 + -L/usr/lib/../lib64 + -L/usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/lib + -L/usr/lib64/gcc/x86_64-suse-linux/4.8/../../.. + CMakeFiles/afb-daemon.dir/main.c.o + CMakeFiles/afb-daemon.dir/config.c.o + CMakeFiles/afb-daemon.dir/session.c.o + CMakeFiles/afb-daemon.dir/http-svc.c.o + CMakeFiles/afb-daemon.dir/afbs-api.c.o + CMakeFiles/afb-daemon.dir/dbus-api.c.o + CMakeFiles/afb-daemon.dir/rest-api.c.o + CMakeFiles/afb-daemon.dir/alsa-api.c.o + -ljson-c + -lmicrohttpd + -lmagic + -lgcc + --as-needed + -lgcc_s + --no-as-needed + -lc + -lgcc + --as-needed + -lgcc_s + --no-as-needed + /usr/lib64/gcc/x86_64-suse-linux/4.8/crtend.o + /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../lib64/crtn.o + diff --git a/nbproject/private/Default.properties b/nbproject/private/Default.properties new file mode 100644 index 00000000..6b8095d5 --- /dev/null +++ b/nbproject/private/Default.properties @@ -0,0 +1 @@ +/home/fulup/Workspace/afb-daemon/src/main.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/main.c.o -c /home/fulup/Workspace/afb-daemon/src/main.c diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml new file mode 100644 index 00000000..24aab80c --- /dev/null +++ b/nbproject/private/configurations.xml @@ -0,0 +1,89 @@ + + + + + + + + + CMakeCCompilerId.c + + + + + + + + + + + + + + local-def.h + proto-def.h + + + afbs-api.c + alsa-api.c + config.c + dbus-api.c + http-svc.c + main.c + rest-api.c + session.c + + + + build/Makefile + + + + localhost + 2 + + + + . + ${AUTO_FOLDER} + + ${AUTO_FOLDER} + + ${MAKE} ${ITEM_NAME}.o + ${AUTO_COMPILE} + + ${AUTO_COMPILE} + + + + + + + + + + + + + + + + + gdb + + + + "${OUTPUT_PATH}" + "${OUTPUT_PATH}" --verbose --alias=icons:/usr/share/icons + + "${OUTPUT_PATH}" --verbose --alias=icons:/usr/share/icons + build + true + 0 + 0 + + + + + + diff --git a/nbproject/private/launcher.properties b/nbproject/private/launcher.properties new file mode 100644 index 00000000..6cc2127d --- /dev/null +++ b/nbproject/private/launcher.properties @@ -0,0 +1,40 @@ +# Launchers File syntax: +# +# [Must-have property line] +# launcher1.runCommand= +# [Optional extra properties] +# launcher1.displayName= +# launcher1.buildCommand= +# launcher1.runDir= +# launcher1.symbolFiles= +# launcher1.env.= +# (If this value is quoted with ` it is handled as a native command which execution result will become the value) +# [Common launcher properties] +# common.runDir= +# (This value is overwritten by a launcher specific runDir value if the latter exists) +# common.env.= +# (Environment variables from common launcher are merged with launcher specific variables) +# common.symbolFiles= +# (This value is overwritten by a launcher specific symbolFiles value if the latter exists) +# +# In runDir, symbolFiles and env fields you can use these macroses: +# ${PROJECT_DIR} - project directory absolute path +# ${OUTPUT_PATH} - linker output path (relative to project directory path) +# ${OUTPUT_BASENAME}- linker output filename +# ${TESTDIR} - test files directory (relative to project directory path) +# ${OBJECTDIR} - object files directory (relative to project directory path) +# ${CND_DISTDIR} - distribution directory (relative to project directory path) +# ${CND_BUILDDIR} - build directory (relative to project directory path) +# ${CND_PLATFORM} - platform name +# ${CND_CONF} - configuration name +# ${CND_DLIB_EXT} - dynamic library extension +# +# All the project launchers must be listed in the file! +# +# launcher1.runCommand=... +# launcher2.runCommand=... +# ... +# common.runDir=... +# common.env.KEY=VALUE + +# launcher1.runCommand= \ No newline at end of file diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml new file mode 100644 index 00000000..4f3fdc62 --- /dev/null +++ b/nbproject/private/private.xml @@ -0,0 +1,10 @@ + + + + true + + + 0 + 0 + + diff --git a/nbproject/project.xml b/nbproject/project.xml index 91920333..202336cd 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -6,18 +6,16 @@ afb-daemon c - + h UTF-8 - + + . + - Debug - 1 - - - Release - 1 + Default + 0 diff --git a/src/main.c b/src/main.c index 323b060f..78ffae54 100644 --- a/src/main.c +++ b/src/main.c @@ -241,7 +241,6 @@ static void listenLoop (AFB_session *session) { } } - /*--------------------------------------------------------- | main | Parse option and launch action -- 2.16.6