Skip to content

Commit

Permalink
version bump and netbeans configuration auto changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel Kraynyukhov committed May 16, 2018
1 parent bb0a0a2 commit 907d002
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 7 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.2
0.6.3
4 changes: 2 additions & 2 deletions nbproject/Makefile-Debug.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 12 additions & 0 deletions nbproject/Package-Debug.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
24 changes: 24 additions & 0 deletions nbproject/configurations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,30 @@
perm="755"
owner="root"
group="bin"/>
<packFileListElem type="File"
to="${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}"
from="${OUTPUT_PATH}"
perm="755"
owner="root"
group="bin"/>
<packFileListElem type="File"
to="${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}"
from="${OUTPUT_PATH}"
perm="755"
owner="root"
group="bin"/>
<packFileListElem type="File"
to="${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}"
from="${OUTPUT_PATH}"
perm="755"
owner="root"
group="bin"/>
<packFileListElem type="File"
to="${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}"
from="${OUTPUT_PATH}"
perm="755"
owner="root"
group="bin"/>
</packFileList>
<packInfoList>
<packInfoListElem name="Package" value="lapps" mandatory="true"/>
Expand Down
6 changes: 2 additions & 4 deletions nbproject/private/private.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/src/main.cpp</file>
<file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/Config.h</file>
<file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/wsServer.h</file>
<file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/Env.h</file>
<file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/Makefile</file>
<file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/IOWorker.h</file>
<file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/WebSocket.h</file>
</group>
</open-files>
</project-private>

0 comments on commit 907d002

Please # to comment.