stubbfel/121Nat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

squash

Browse Source
This commit is contained in:
stubbfel
2015-12-10 00:22:06 +01:00
parent 360ee125d7
commit 8f4577de07
4 changed files with 25 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
nbproject/Makefile-Release.mk
View File

@@ -70,12 +70,16 @@ FFLAGS=
ASFLAGS= ASFLAGS=
# Link Libraries and Options # Link Libraries and Options
LDLIBSOPTIONS= LDLIBSOPTIONS=lib/bin/libjsoncpp.a lib/bin/libtins.so -lpthread
# Build Targets # Build Targets
.build-conf: ${BUILD_SUBPROJECTS} .build-conf: ${BUILD_SUBPROJECTS}
"${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/121nat "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/121nat
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/121nat: lib/bin/libjsoncpp.a
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/121nat: lib/bin/libtins.so
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/121nat: ${OBJECTFILES} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/121nat: ${OBJECTFILES}
${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/121nat ${OBJECTFILES} ${LDLIBSOPTIONS} ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/121nat ${OBJECTFILES} ${LDLIBSOPTIONS}
@@ -83,27 +87,27 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/121nat: ${OBJECTFILES}
${OBJECTDIR}/src/PduSender.o: src/PduSender.cpp ${OBJECTDIR}/src/PduSender.o: src/PduSender.cpp
${MKDIR} -p ${OBJECTDIR}/src ${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d" ${RM} "$@.d"
$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSender.o src/PduSender.cpp $(COMPILE.cc) -O2 -s -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSender.o src/PduSender.cpp
${OBJECTDIR}/src/PduSniffer.o: src/PduSniffer.cpp ${OBJECTDIR}/src/PduSniffer.o: src/PduSniffer.cpp
${MKDIR} -p ${OBJECTDIR}/src ${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d" ${RM} "$@.d"
$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer.o src/PduSniffer.cpp $(COMPILE.cc) -O2 -s -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer.o src/PduSniffer.cpp
${OBJECTDIR}/src/main.o: src/main.cpp ${OBJECTDIR}/src/main.o: src/main.cpp
${MKDIR} -p ${OBJECTDIR}/src ${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d" ${RM} "$@.d"
$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.cpp $(COMPILE.cc) -O2 -s -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.cpp
${OBJECTDIR}/src/map/NatRange.o: src/map/NatRange.cpp ${OBJECTDIR}/src/map/NatRange.o: src/map/NatRange.cpp
${MKDIR} -p ${OBJECTDIR}/src/map ${MKDIR} -p ${OBJECTDIR}/src/map
${RM} "$@.d" ${RM} "$@.d"
$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/map/NatRange.o src/map/NatRange.cpp $(COMPILE.cc) -O2 -s -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/map/NatRange.o src/map/NatRange.cpp
${OBJECTDIR}/src/map/natmap.o: src/map/natmap.cpp ${OBJECTDIR}/src/map/natmap.o: src/map/natmap.cpp
${MKDIR} -p ${OBJECTDIR}/src/map ${MKDIR} -p ${OBJECTDIR}/src/map
${RM} "$@.d" ${RM} "$@.d"
$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/map/natmap.o src/map/natmap.cpp $(COMPILE.cc) -O2 -s -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/map/natmap.o src/map/natmap.cpp
# Subprojects # Subprojects
.build-subprojects: .build-subprojects:
@@ -124,25 +128,25 @@ ${TESTDIR}/TestFiles/f1: ${TESTDIR}/tests/nattest.o ${TESTDIR}/tests/nattestrunn
${TESTDIR}/tests/jsontest.o: tests/jsontest.cpp ${TESTDIR}/tests/jsontest.o: tests/jsontest.cpp
${MKDIR} -p ${TESTDIR}/tests ${MKDIR} -p ${TESTDIR}/tests
${RM} "$@.d" ${RM} "$@.d"
$(COMPILE.cc) -O2 `cppunit-config --cflags` -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/jsontest.o tests/jsontest.cpp $(COMPILE.cc) -O2 -s -std=c++11 `cppunit-config --cflags` -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/jsontest.o tests/jsontest.cpp
${TESTDIR}/tests/jsontestrunner.o: tests/jsontestrunner.cpp ${TESTDIR}/tests/jsontestrunner.o: tests/jsontestrunner.cpp
${MKDIR} -p ${TESTDIR}/tests ${MKDIR} -p ${TESTDIR}/tests
${RM} "$@.d" ${RM} "$@.d"
$(COMPILE.cc) -O2 `cppunit-config --cflags` -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/jsontestrunner.o tests/jsontestrunner.cpp $(COMPILE.cc) -O2 -s -std=c++11 `cppunit-config --cflags` -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/jsontestrunner.o tests/jsontestrunner.cpp
${TESTDIR}/tests/nattest.o: tests/nattest.cpp ${TESTDIR}/tests/nattest.o: tests/nattest.cpp
${MKDIR} -p ${TESTDIR}/tests ${MKDIR} -p ${TESTDIR}/tests
${RM} "$@.d" ${RM} "$@.d"
$(COMPILE.cc) -O2 -I. `cppunit-config --cflags` -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/nattest.o tests/nattest.cpp $(COMPILE.cc) -O2 -s -I. -std=c++11 `cppunit-config --cflags` -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/nattest.o tests/nattest.cpp
${TESTDIR}/tests/nattestrunner.o: tests/nattestrunner.cpp ${TESTDIR}/tests/nattestrunner.o: tests/nattestrunner.cpp
${MKDIR} -p ${TESTDIR}/tests ${MKDIR} -p ${TESTDIR}/tests
${RM} "$@.d" ${RM} "$@.d"
$(COMPILE.cc) -O2 -I. `cppunit-config --cflags` -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/nattestrunner.o tests/nattestrunner.cpp $(COMPILE.cc) -O2 -s -I. -std=c++11 `cppunit-config --cflags` -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/nattestrunner.o tests/nattestrunner.cpp
${OBJECTDIR}/src/PduSender_nomain.o: ${OBJECTDIR}/src/PduSender.o src/PduSender.cpp ${OBJECTDIR}/src/PduSender_nomain.o: ${OBJECTDIR}/src/PduSender.o src/PduSender.cpp
@@ -153,7 +157,7 @@ ${OBJECTDIR}/src/PduSender_nomain.o: ${OBJECTDIR}/src/PduSender.o src/PduSender.
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \ (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \ then \
${RM} "$@.d";\ ${RM} "$@.d";\
$(COMPILE.cc) -O2 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSender_nomain.o src/PduSender.cpp;\ $(COMPILE.cc) -O2 -s -std=c++11 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSender_nomain.o src/PduSender.cpp;\
else \ else \
${CP} ${OBJECTDIR}/src/PduSender.o ${OBJECTDIR}/src/PduSender_nomain.o;\ ${CP} ${OBJECTDIR}/src/PduSender.o ${OBJECTDIR}/src/PduSender_nomain.o;\
fi fi
@@ -166,7 +170,7 @@ ${OBJECTDIR}/src/PduSniffer_nomain.o: ${OBJECTDIR}/src/PduSniffer.o src/PduSniff
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \ (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \ then \
${RM} "$@.d";\ ${RM} "$@.d";\
$(COMPILE.cc) -O2 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer_nomain.o src/PduSniffer.cpp;\ $(COMPILE.cc) -O2 -s -std=c++11 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer_nomain.o src/PduSniffer.cpp;\
else \ else \
${CP} ${OBJECTDIR}/src/PduSniffer.o ${OBJECTDIR}/src/PduSniffer_nomain.o;\ ${CP} ${OBJECTDIR}/src/PduSniffer.o ${OBJECTDIR}/src/PduSniffer_nomain.o;\
fi fi
@@ -179,7 +183,7 @@ ${OBJECTDIR}/src/main_nomain.o: ${OBJECTDIR}/src/main.o src/main.cpp
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \ (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \ then \
${RM} "$@.d";\ ${RM} "$@.d";\
$(COMPILE.cc) -O2 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main_nomain.o src/main.cpp;\ $(COMPILE.cc) -O2 -s -std=c++11 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main_nomain.o src/main.cpp;\
else \ else \
${CP} ${OBJECTDIR}/src/main.o ${OBJECTDIR}/src/main_nomain.o;\ ${CP} ${OBJECTDIR}/src/main.o ${OBJECTDIR}/src/main_nomain.o;\
fi fi
@@ -192,7 +196,7 @@ ${OBJECTDIR}/src/map/NatRange_nomain.o: ${OBJECTDIR}/src/map/NatRange.o src/map/
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \ (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \ then \
${RM} "$@.d";\ ${RM} "$@.d";\
$(COMPILE.cc) -O2 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/map/NatRange_nomain.o src/map/NatRange.cpp;\ $(COMPILE.cc) -O2 -s -std=c++11 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/map/NatRange_nomain.o src/map/NatRange.cpp;\
else \ else \
${CP} ${OBJECTDIR}/src/map/NatRange.o ${OBJECTDIR}/src/map/NatRange_nomain.o;\ ${CP} ${OBJECTDIR}/src/map/NatRange.o ${OBJECTDIR}/src/map/NatRange_nomain.o;\
fi fi
@@ -205,7 +209,7 @@ ${OBJECTDIR}/src/map/natmap_nomain.o: ${OBJECTDIR}/src/map/natmap.o src/map/natm
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \ (echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \ then \
${RM} "$@.d";\ ${RM} "$@.d";\
$(COMPILE.cc) -O2 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/map/natmap_nomain.o src/map/natmap.cpp;\ $(COMPILE.cc) -O2 -s -std=c++11 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/map/natmap_nomain.o src/map/natmap.cpp;\
else \ else \
${CP} ${OBJECTDIR}/src/map/natmap.o ${OBJECTDIR}/src/map/natmap_nomain.o;\ ${CP} ${OBJECTDIR}/src/map/natmap.o ${OBJECTDIR}/src/map/natmap_nomain.o;\
fi fi

2
nbproject/Makefile-impl.mk
View File

@@ -31,7 +31,7 @@ DEFAULTCONF=Debug
CONF=${DEFAULTCONF} CONF=${DEFAULTCONF}
# All Configurations # All Configurations
ALLCONFS=Debug Release Unitest ALLCONFS=Debug Release
# build # build

8
nbproject/Makefile-variables.mk
View File

@@ -22,14 +22,6 @@ CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux/121nat
CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package
CND_PACKAGE_NAME_Release=121nat.tar CND_PACKAGE_NAME_Release=121nat.tar
CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/121nat.tar CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/121nat.tar
# Unitest configuration
CND_PLATFORM_Unitest=GNU-Linux
CND_ARTIFACT_DIR_Unitest=dist/Unitest/GNU-Linux
CND_ARTIFACT_NAME_Unitest=121nat
CND_ARTIFACT_PATH_Unitest=dist/Unitest/GNU-Linux/121nat
CND_PACKAGE_DIR_Unitest=dist/Unitest/GNU-Linux/package
CND_PACKAGE_NAME_Unitest=121nat.tar
CND_PACKAGE_PATH_Unitest=dist/Unitest/GNU-Linux/package/121nat.tar
# #
# include compiler specific variables # include compiler specific variables
# #

82
nbproject/configurations.xml
View File

@@ -149,6 +149,8 @@
</cTool> </cTool>
<ccTool> <ccTool>
<developmentMode>5</developmentMode> <developmentMode>5</developmentMode>
<stripSymbols>true</stripSymbols>
<standard>8</standard>
</ccTool> </ccTool>
<fortranCompilerTool> <fortranCompilerTool>
<developmentMode>5</developmentMode> <developmentMode>5</developmentMode>
@@ -156,87 +158,13 @@
<asmTool> <asmTool>
<developmentMode>5</developmentMode> <developmentMode>5</developmentMode>
</asmTool> </asmTool>
</compileType>
<folder path="TestFiles/f1">
<cTool>
<incDir>
<pElem>.</pElem>
</incDir>
<commandLine>`cppunit-config --cflags`</commandLine>
</cTool>
<ccTool>
<incDir>
<pElem>.</pElem>
</incDir>
<commandLine>`cppunit-config --cflags`</commandLine>
</ccTool>
<linkerTool> <linkerTool>
<output>${TESTDIR}/TestFiles/f1</output>
<linkerLibItems> <linkerLibItems>
<linkerOptionItem>`cppunit-config --libs`</linkerOptionItem> <linkerLibFileItem>lib/bin/libjsoncpp.a</linkerLibFileItem>
<linkerLibFileItem>lib/bin/libtins.so</linkerLibFileItem>
<linkerLibLibItem>pthread</linkerLibLibItem>
</linkerLibItems> </linkerLibItems>
</linkerTool> </linkerTool>
</folder>
<folder path="TestFiles/f2">
<cTool>
<commandLine>`cppunit-config --cflags`</commandLine>
</cTool>
<ccTool>
<commandLine>`cppunit-config --cflags`</commandLine>
</ccTool>
<linkerTool>
<output>${TESTDIR}/TestFiles/f2</output>
<linkerLibItems>
<linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
</linkerLibItems>
</linkerTool>
</folder>
<item path="src/PduSender.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/PduSender.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/PduSniffer.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/PduSniffer.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/config.json" ex="false" tool="3" flavor2="0">
</item>
<item path="src/main.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/map/NatRange.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/map/NatRange.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/map/natmap.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/map/natmap.h" ex="false" tool="3" flavor2="0">
</item>
<item path="tests/jsontest.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="tests/jsontest.h" ex="false" tool="3" flavor2="0">
</item>
<item path="tests/jsontestrunner.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="tests/nattest.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="tests/nattest.h" ex="false" tool="3" flavor2="0">
</item>
<item path="tests/nattestrunner.cpp" ex="false" tool="1" flavor2="0">
</item>
</conf>
<conf name="Unitest" type="1">
<toolsSet>
<compilerSet>default</compilerSet>
<dependencyChecking>true</dependencyChecking>
<rebuildPropChanged>false</rebuildPropChanged>
</toolsSet>
<compileType>
<ccTool>
<standard>8</standard>
<incDir>
<pElem>test</pElem>
</incDir>
</ccTool>
</compileType> </compileType>
<folder path="TestFiles/f1"> <folder path="TestFiles/f1">
<cTool> <cTool>