Index: branches/FEPSimulator/nbproject/Makefile-variables.mk =================================================================== --- branches/FEPSimulator/nbproject/Makefile-variables.mk (revision 209) +++ branches/FEPSimulator/nbproject/Makefile-variables.mk (revision 224) @@ -16,11 +16,11 @@ CND_PACKAGE_PATH_Debug=dist/Debug/GNU-MacOSX/package/fepsimulator.tar # Release configuration -CND_PLATFORM_Release=GNU-Linux-x86 -CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux-x86 -CND_ARTIFACT_NAME_Release=fep_rpc_client -CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux-x86/fep_rpc_client -CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux-x86/package -CND_PACKAGE_NAME_Release=feprpcclient.tar -CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux-x86/package/feprpcclient.tar +CND_PLATFORM_Release=GNU-Linux +CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux +CND_ARTIFACT_NAME_Release=fepsimulator +CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux/fepsimulator +CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package +CND_PACKAGE_NAME_Release=fepsimulator.tar +CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/fepsimulator.tar # testHighwaysParser configuration CND_PLATFORM_testHighwaysParser=GNU-MacOSX Index: branches/FEPSimulator/nbproject/private/private.xml =================================================================== --- branches/FEPSimulator/nbproject/private/private.xml (revision 217) +++ branches/FEPSimulator/nbproject/private/private.xml (revision 224) @@ -3,15 +3,9 @@ 1 - 0 + 1 - - file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h - file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp - file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h - file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h - file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.cpp - + Index: branches/FEPSimulator/nbproject/Makefile-Release.mk =================================================================== --- branches/FEPSimulator/nbproject/Makefile-Release.mk (revision 80) +++ branches/FEPSimulator/nbproject/Makefile-Release.mk (revision 224) @@ -22,5 +22,5 @@ # Macros -CND_PLATFORM=GNU-Linux-x86 +CND_PLATFORM=GNU-Linux CND_DLIB_EXT=so CND_CONF=Release @@ -37,6 +37,7 @@ OBJECTFILES= \ ${OBJECTDIR}/DataPacker.o \ - ${OBJECTDIR}/FEPClient.o \ - ${OBJECTDIR}/NetworkReader.o \ + ${OBJECTDIR}/FEPSim.o \ + ${OBJECTDIR}/HighwaysParser.o \ + ${OBJECTDIR}/Main.o \ ${OBJECTDIR}/fep_clnt.o \ ${OBJECTDIR}/fep_xdr.o @@ -61,31 +62,36 @@ # Build Targets .build-conf: ${BUILD_SUBPROJECTS} - "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client + "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator -${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: ${OBJECTFILES} +${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} - ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client ${OBJECTFILES} ${LDLIBSOPTIONS} + ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS} -${OBJECTDIR}/DataPacker.o: DataPacker.cpp +${OBJECTDIR}/DataPacker.o: DataPacker.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp -${OBJECTDIR}/FEPClient.o: FEPClient.cpp +${OBJECTDIR}/FEPSim.o: FEPSim.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPClient.o FEPClient.cpp + $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp -${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp +${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/NetworkReader.o NetworkReader.cpp + $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp -${OBJECTDIR}/fep_clnt.o: fep_clnt.c +${OBJECTDIR}/Main.o: Main.cpp + ${MKDIR} -p ${OBJECTDIR} + ${RM} "$@.d" + $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp + +${OBJECTDIR}/fep_clnt.o: fep_clnt.c ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c -${OBJECTDIR}/fep_xdr.o: fep_xdr.c +${OBJECTDIR}/fep_xdr.o: fep_xdr.c ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" @@ -98,5 +104,4 @@ .clean-conf: ${CLEAN_SUBPROJECTS} ${RM} -r ${CND_BUILDDIR}/${CND_CONF} - ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client # Subprojects Index: branches/FEPSimulator/nbproject/Makefile-impl.mk =================================================================== --- branches/FEPSimulator/nbproject/Makefile-impl.mk (revision 209) +++ branches/FEPSimulator/nbproject/Makefile-impl.mk (revision 224) @@ -77,5 +77,5 @@ @echo "# This code depends on make tool being used" >.dep.inc @if [ -n "${MAKE_VERSION}" ]; then \ - echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \ + echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES} \$${TESTOBJECTFILES}))" >>.dep.inc; \ echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \ echo "include \$${DEPFILES}" >>.dep.inc; \ Index: branches/FEPSimulator/nbproject/Package-Release.bash =================================================================== --- branches/FEPSimulator/nbproject/Package-Release.bash (revision 77) +++ branches/FEPSimulator/nbproject/Package-Release.bash (revision 224) @@ -7,5 +7,5 @@ # Macros TOP=`pwd` -CND_PLATFORM=GNU-Linux-x86 +CND_PLATFORM=GNU-Linux CND_CONF=Release CND_DISTDIR=dist @@ -14,7 +14,7 @@ NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging TMPDIRNAME=tmp-packaging -OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client -OUTPUT_BASENAME=fep_rpc_client -PACKAGE_TOP_DIR=feprpcclient/ +OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator +OUTPUT_BASENAME=fepsimulator +PACKAGE_TOP_DIR=fepsimulator/ # Functions @@ -61,5 +61,5 @@ # Copy files and create directories and links cd "${TOP}" -makeDirectory "${NBTMPDIR}/feprpcclient/bin" +makeDirectory "${NBTMPDIR}/fepsimulator/bin" copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 @@ -67,7 +67,7 @@ # Generate tar file cd "${TOP}" -rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/feprpcclient.tar +rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar cd ${NBTMPDIR} -tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/feprpcclient.tar * +tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar * checkReturnCode Index: branches/FEPSimulator/.dep.inc =================================================================== --- branches/FEPSimulator/.dep.inc (revision 77) +++ branches/FEPSimulator/.dep.inc (revision 224) @@ -1,4 +1,4 @@ # This code depends on make tool being used -DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) +DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES} ${TESTOBJECTFILES})) ifneq (${DEPFILES},) include ${DEPFILES} Index: branches/FEPSimulator/FEPSim.cpp =================================================================== --- branches/FEPSimulator/FEPSim.cpp (revision 223) +++ branches/FEPSimulator/FEPSim.cpp (revision 224) @@ -33,4 +33,5 @@ vector ldsMap = highwaysParser.stations; + cout << "Starting sendReplys for " << lines.size() << " lines." << endl; // Send one reply for every FEPLine for (int i = 0; i < lines.size(); i++) { @@ -98,5 +99,9 @@ handleCallResponse(fep_reply_xfer_32(&fepReply, clnt)); } - } + // pause to let ATMS server catch up + //unsigned int sleepseconds = 220000; + //usleep(sleepseconds); + } + cout << "Finished." << endl; }