From 907d0028cf26610a93f5f3ba1813f09c59b2d902 Mon Sep 17 00:00:00 2001 From: Pavel Kraynyukhov Date: Thu, 17 May 2018 02:37:54 +0600 Subject: [PATCH] version bump and netbeans configuration auto changes --- VERSION | 2 +- nbproject/Makefile-Debug.mk | 4 ++-- nbproject/Package-Debug.bash | 12 ++++++++++++ nbproject/configurations.xml | 24 ++++++++++++++++++++++++ nbproject/private/private.xml | 6 ++---- 5 files changed, 41 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index b616048..844f6a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.2 +0.6.3 diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk index 94115e9..923d6f1 100644 --- a/nbproject/Makefile-Debug.mk +++ b/nbproject/Makefile-Debug.mk @@ -72,12 +72,12 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps: ${OBJECTFILES} ${OBJECTDIR}/src/getLog.o: src/getLog.cpp nbproject/Makefile-${CND_CONF}.mk ${MKDIR} -p ${OBJECTDIR}/src ${RM} "$@.d" - $(COMPILE.cc) -g -DAPP_NAME=\"LAppS\" -DLAPPS_TLS_ENABLE -DLOG_FILE=\"lapps.log\" -DLOG_INFO -DMAX_BUFF_SIZE=512 -DSTATS_ENABLE -DTSAFE_LOG=1 -I../libressl/include -I../ITCFramework/include -I../ITCLib/include -I../utils/include -Iinclude -Iinclude/modules -I/usr/local/include -I/usr/local/include/luajit-2.0 -std=c++14 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/getLog.o src/getLog.cpp + $(COMPILE.cc) -g -DAPP_NAME=\"LAppS\" -DLOG_FILE=\"lapps.log\" -DLOG_INFO -DMAX_BUFF_SIZE=512 -DSTATS_ENABLE -DTSAFE_LOG=1 -DLAPPS_TLS_ENABLE -I../libressl/include -I../ITCFramework/include -I../ITCLib/include -I../utils/include -Iinclude -Iinclude/modules -I/usr/local/include -I/usr/local/include/luajit-2.0 -std=c++14 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/getLog.o src/getLog.cpp ${OBJECTDIR}/src/main.o: src/main.cpp nbproject/Makefile-${CND_CONF}.mk ${MKDIR} -p ${OBJECTDIR}/src ${RM} "$@.d" - $(COMPILE.cc) -g -DAPP_NAME=\"LAppS\" -DLAPPS_TLS_ENABLE -DLOG_FILE=\"lapps.log\" -DLOG_INFO -DMAX_BUFF_SIZE=512 -DSTATS_ENABLE -DTSAFE_LOG=1 -I../libressl/include -I../ITCFramework/include -I../ITCLib/include -I../utils/include -Iinclude -Iinclude/modules -I/usr/local/include -I/usr/local/include/luajit-2.0 -std=c++14 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.cpp + $(COMPILE.cc) -g -DAPP_NAME=\"LAppS\" -DLOG_FILE=\"lapps.log\" -DLOG_INFO -DMAX_BUFF_SIZE=512 -DSTATS_ENABLE -DTSAFE_LOG=1 -DLAPPS_TLS_ENABLE -I../libressl/include -I../ITCFramework/include -I../ITCLib/include -I../utils/include -Iinclude -Iinclude/modules -I/usr/local/include -I/usr/local/include/luajit-2.0 -std=c++14 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.cpp # Subprojects .build-subprojects: diff --git a/nbproject/Package-Debug.bash b/nbproject/Package-Debug.bash index 52902a6..7a0ad7e 100644 --- a/nbproject/Package-Debug.bash +++ b/nbproject/Package-Debug.bash @@ -247,6 +247,18 @@ cd "${TOP}" makeDirectory "${NBTMPDIR}//usr/bin" copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 +cd "${TOP}" +makeDirectory "${NBTMPDIR}//usr/bin" +copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 + +cd "${TOP}" +makeDirectory "${NBTMPDIR}//usr/bin" +copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 + +cd "${TOP}" +makeDirectory "${NBTMPDIR}//usr/bin" +copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 + # Create control file cd "${TOP}" diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index ea3e47a..083c057 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -480,6 +480,30 @@ perm="755" owner="root" group="bin"/> + + + + diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 00ead1a..9526c10 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -10,11 +10,9 @@ - file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/src/main.cpp file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/Config.h - file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/wsServer.h - file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/Env.h - file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/Makefile + file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/IOWorker.h + file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/WebSocket.h