Changeset 214 in tmcsimulator for branches

Timestamp:

11/02/2017 02:11:33 PM (9 years ago)

Author:

jtorres

Message:

FEPSimulator config changes

Location:

branches/FEPSimulator

Files:

• FEPSim.cpp (modified) (1 diff)
• FEPSim.h (modified) (1 diff)
• nbproject/Makefile-Debug.mk (modified) (9 diffs)
• nbproject/configurations.xml (modified) (1 diff)

branches/FEPSimulator/FEPSim.cpp

@@ -95 +95 @@
             // Transfer the station data to ATMS and listen for response
             handleCallResponse(fep_reply_xfer_32(&fepReply, clnt));
-            unsigned int sleepseconds = /* 100 * */1000;
+            unsigned int sleepseconds = 50000;
             usleep(sleepseconds);
         }

branches/FEPSimulator/FEPSim.h

@@ -43 +43 @@
 #include <unistd.h>
 
-const int BUFF_SIZE = 1266341; // where it is now :) 
+const int BUFF_SIZE = 1266341;
 
 class FEPSim {

branches/FEPSimulator/nbproject/Makefile-Debug.mk

@@ -51 +51 @@
 
 # C Compiler Flags
-CFLAGS=`cppunit-config --cflags` 
+CFLAGS=
 
 # CC Compiler Flags
-CCFLAGS=`cppunit-config --cflags` 
-CXXFLAGS=`cppunit-config --cflags` 
+CCFLAGS=
+CXXFLAGS=
 
 # Fortran Compiler Flags
@@ -77 +77 @@
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
+        $(COMPILE.cc) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
 
 ${OBJECTDIR}/FEPSim.o: FEPSim.cpp 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
+        $(COMPILE.cc) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
 
 ${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
+        $(COMPILE.cc) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
 
 ${OBJECTDIR}/Main.o: Main.cpp 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
+        $(COMPILE.cc) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
 
 ${OBJECTDIR}/fep_clnt.o: fep_clnt.c 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.c) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c
+        $(COMPILE.c) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c
 
 ${OBJECTDIR}/fep_xdr.o: fep_xdr.c 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.c) -g -I. -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr.o fep_xdr.c
+        $(COMPILE.c) -g -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr.o fep_xdr.c
 
 # Subprojects
@@ -117 +117 @@
         ${MKDIR} -p ${TESTDIR}/tests
         ${RM} "$@.d"
-        $(COMPILE.cc) -g -I. -I. -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/HighwaysParserTest.o tests/HighwaysParserTest.cpp
+        $(COMPILE.cc) -g -I. -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/HighwaysParserTest.o tests/HighwaysParserTest.cpp
 
 
@@ -128 +128 @@
         then  \
             ${RM} "$@.d";\
-            $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker_nomain.o DataPacker.cpp;\
+            $(COMPILE.cc) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker_nomain.o DataPacker.cpp;\
         else  \
             ${CP} ${OBJECTDIR}/DataPacker.o ${OBJECTDIR}/DataPacker_nomain.o;\
@@ -141 +141 @@
         then  \
             ${RM} "$@.d";\
-            $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim_nomain.o FEPSim.cpp;\
+            $(COMPILE.cc) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim_nomain.o FEPSim.cpp;\
         else  \
             ${CP} ${OBJECTDIR}/FEPSim.o ${OBJECTDIR}/FEPSim_nomain.o;\
@@ -154 +154 @@
         then  \
             ${RM} "$@.d";\
-            $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser_nomain.o HighwaysParser.cpp;\
+            $(COMPILE.cc) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser_nomain.o HighwaysParser.cpp;\
         else  \
             ${CP} ${OBJECTDIR}/HighwaysParser.o ${OBJECTDIR}/HighwaysParser_nomain.o;\
@@ -167 +167 @@
         then  \
             ${RM} "$@.d";\
-            $(COMPILE.cc) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main_nomain.o Main.cpp;\
+            $(COMPILE.cc) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main_nomain.o Main.cpp;\
         else  \
             ${CP} ${OBJECTDIR}/Main.o ${OBJECTDIR}/Main_nomain.o;\
@@ -180 +180 @@
         then  \
             ${RM} "$@.d";\
-            $(COMPILE.c) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt_nomain.o fep_clnt.c;\
+            $(COMPILE.c) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt_nomain.o fep_clnt.c;\
         else  \
             ${CP} ${OBJECTDIR}/fep_clnt.o ${OBJECTDIR}/fep_clnt_nomain.o;\
@@ -193 +193 @@
         then  \
             ${RM} "$@.d";\
-            $(COMPILE.c) -g -I. -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr_nomain.o fep_xdr.c;\
+            $(COMPILE.c) -g -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_xdr_nomain.o fep_xdr.c;\
         else  \
             ${CP} ${OBJECTDIR}/fep_xdr.o ${OBJECTDIR}/fep_xdr_nomain.o;\

branches/FEPSimulator/nbproject/configurations.xml

@@ -52 +52 @@
       </toolsSet>
       <compileType>
-        <cTool>
-          <incDir>
-            <pElem>.</pElem>
-          </incDir>
-          <commandLine>`cppunit-config --cflags`</commandLine>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>.</pElem>
-          </incDir>
-          <commandLine>`cppunit-config --cflags`</commandLine>
-        </ccTool>
         <linkerTool>
           <output>${TESTDIR}/TestFiles/f2</output>