Changeset 224 in tmcsimulator for branches/FEPSimulator/nbproject


Ignore:
Timestamp:
11/04/2017 01:48:46 PM (8 years ago)
Author:
jdalbey
Message:

FEPSim.cpp Added a comment containing code to let ATMS server catch up.

Location:
branches/FEPSimulator/nbproject
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/FEPSimulator/nbproject/Makefile-Release.mk

    r80 r224  
    2222 
    2323# Macros 
    24 CND_PLATFORM=GNU-Linux-x86 
     24CND_PLATFORM=GNU-Linux 
    2525CND_DLIB_EXT=so 
    2626CND_CONF=Release 
    … …  
    3737OBJECTFILES= \ 
    3838        ${OBJECTDIR}/DataPacker.o \ 
    39         ${OBJECTDIR}/FEPClient.o \ 
    40         ${OBJECTDIR}/NetworkReader.o \ 
     39        ${OBJECTDIR}/FEPSim.o \ 
     40        ${OBJECTDIR}/HighwaysParser.o \ 
     41        ${OBJECTDIR}/Main.o \ 
    4142        ${OBJECTDIR}/fep_clnt.o \ 
    4243        ${OBJECTDIR}/fep_xdr.o 
    … …  
    6162# Build Targets 
    6263.build-conf: ${BUILD_SUBPROJECTS} 
    63         "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client 
     64        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator 
    6465 
    65 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: ${OBJECTFILES} 
     66${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES} 
    6667        ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} 
    67         ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client ${OBJECTFILES} ${LDLIBSOPTIONS} 
     68        ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS} 
    6869 
    69 ${OBJECTDIR}/DataPacker.o: DataPacker.cpp  
     70${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
    7071        ${MKDIR} -p ${OBJECTDIR} 
    7172        ${RM} "$@.d" 
    7273        $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp 
    7374 
    74 ${OBJECTDIR}/FEPClient.o: FEPClient.cpp  
     75${OBJECTDIR}/FEPSim.o: FEPSim.cpp 
    7576        ${MKDIR} -p ${OBJECTDIR} 
    7677        ${RM} "$@.d" 
    77         $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPClient.o FEPClient.cpp 
     78        $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp 
    7879 
    79 ${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp  
     80${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp 
    8081        ${MKDIR} -p ${OBJECTDIR} 
    8182        ${RM} "$@.d" 
    82         $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/NetworkReader.o NetworkReader.cpp 
     83        $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp 
    8384 
    84 ${OBJECTDIR}/fep_clnt.o: fep_clnt.c  
     85${OBJECTDIR}/Main.o: Main.cpp 
     86        ${MKDIR} -p ${OBJECTDIR} 
     87        ${RM} "$@.d" 
     88        $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp 
     89 
     90${OBJECTDIR}/fep_clnt.o: fep_clnt.c 
    8591        ${MKDIR} -p ${OBJECTDIR} 
    8692        ${RM} "$@.d" 
    8793        $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c 
    8894 
    89 ${OBJECTDIR}/fep_xdr.o: fep_xdr.c  
     95${OBJECTDIR}/fep_xdr.o: fep_xdr.c 
    9096        ${MKDIR} -p ${OBJECTDIR} 
    9197        ${RM} "$@.d" 
    … …  
    98104.clean-conf: ${CLEAN_SUBPROJECTS} 
    99105        ${RM} -r ${CND_BUILDDIR}/${CND_CONF} 
    100         ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client 
    101106 
    102107# Subprojects 

  • branches/FEPSimulator/nbproject/Makefile-impl.mk

    r209 r224  
    7777        @echo "# This code depends on make tool being used" >.dep.inc 
    7878        @if [ -n "${MAKE_VERSION}" ]; then \ 
    79             echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \ 
     79            echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES} \$${TESTOBJECTFILES}))" >>.dep.inc; \ 
    8080            echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \ 
    8181            echo "include \$${DEPFILES}" >>.dep.inc; \ 

  • branches/FEPSimulator/nbproject/Makefile-variables.mk

    r209 r224  
    1616CND_PACKAGE_PATH_Debug=dist/Debug/GNU-MacOSX/package/fepsimulator.tar 
    1717# Release configuration 
    18 CND_PLATFORM_Release=GNU-Linux-x86 
    19 CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux-x86 
    20 CND_ARTIFACT_NAME_Release=fep_rpc_client 
    21 CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux-x86/fep_rpc_client 
    22 CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux-x86/package 
    23 CND_PACKAGE_NAME_Release=feprpcclient.tar 
    24 CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux-x86/package/feprpcclient.tar 
     18CND_PLATFORM_Release=GNU-Linux 
     19CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux 
     20CND_ARTIFACT_NAME_Release=fepsimulator 
     21CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux/fepsimulator 
     22CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package 
     23CND_PACKAGE_NAME_Release=fepsimulator.tar 
     24CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/fepsimulator.tar 
    2525# testHighwaysParser configuration 
    2626CND_PLATFORM_testHighwaysParser=GNU-MacOSX 

  • branches/FEPSimulator/nbproject/Package-Release.bash

    r77 r224  
    77# Macros 
    88TOP=`pwd` 
    9 CND_PLATFORM=GNU-Linux-x86 
     9CND_PLATFORM=GNU-Linux 
    1010CND_CONF=Release 
    1111CND_DISTDIR=dist 
    … …  
    1414NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging 
    1515TMPDIRNAME=tmp-packaging 
    16 OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client 
    17 OUTPUT_BASENAME=fep_rpc_client 
    18 PACKAGE_TOP_DIR=feprpcclient/ 
     16OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator 
     17OUTPUT_BASENAME=fepsimulator 
     18PACKAGE_TOP_DIR=fepsimulator/ 
    1919 
    2020# Functions 
    … …  
    6161# Copy files and create directories and links 
    6262cd "${TOP}" 
    63 makeDirectory "${NBTMPDIR}/feprpcclient/bin" 
     63makeDirectory "${NBTMPDIR}/fepsimulator/bin" 
    6464copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 
    6565 
    … …  
    6767# Generate tar file 
    6868cd "${TOP}" 
    69 rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/feprpcclient.tar 
     69rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar 
    7070cd ${NBTMPDIR} 
    71 tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/feprpcclient.tar * 
     71tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar * 
    7272checkReturnCode 
    7373 

  • branches/FEPSimulator/nbproject/private/private.xml

    r217 r224  
    33    <data xmlns="http://www.netbeans.org/ns/make-project-private/1"> 
    44        <activeConfTypeElem>1</activeConfTypeElem> 
    5         <activeConfIndexElem>0</activeConfIndexElem> 
     5        <activeConfIndexElem>1</activeConfIndexElem> 
    66    </data> 
    77    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> 
    88    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> 
    9         <group> 
    10             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file> 
    11             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> 
    12             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file> 
    13             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file> 
    14             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.cpp</file> 
    15         </group> 
     9        <group/> 
    1610    </open-files> 
    1711</project-private> 
Note: See TracChangeset for help on using the changeset viewer.