Changeset 82 in tmcsimulator for branches/FEPSimulator/nbproject


Ignore:
Timestamp:
10/06/2017 06:54:21 PM (9 years ago)
Author:
jtorres
Message:

Added socket client to ATMSDriver. Added socket server to FEPSim

Location:
branches/FEPSimulator/nbproject
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r80 r82  
    2222 
    2323# Macros 
    24 CND_PLATFORM=GNU-Linux-x86 
    25 CND_DLIB_EXT=so 
     24CND_PLATFORM=GNU-MacOSX 
     25CND_DLIB_EXT=dylib 
    2626CND_CONF=Debug 
    2727CND_DISTDIR=dist 
    … …  
    3737OBJECTFILES= \ 
    3838        ${OBJECTDIR}/DataPacker.o \ 
    39         ${OBJECTDIR}/FEPClient.o \ 
     39        ${OBJECTDIR}/FEPSim.o \ 
    4040        ${OBJECTDIR}/NetworkReader.o \ 
    4141        ${OBJECTDIR}/fep_clnt.o \ 
    … …  
    5757 
    5858# Link Libraries and Options 
    59 LDLIBSOPTIONS=tinyxml/tinyxml.a 
     59LDLIBSOPTIONS=tinyxml/libosxtinyxml.a 
    6060 
    6161# Build Targets 
    6262.build-conf: ${BUILD_SUBPROJECTS} 
    63         "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client 
     63        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator 
    6464 
    65 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: tinyxml/tinyxml.a 
     65${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/libosxtinyxml.a 
    6666 
    67 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: ${OBJECTFILES} 
     67${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES} 
    6868        ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} 
    69         ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client ${OBJECTFILES} ${LDLIBSOPTIONS} 
     69        ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS} 
    7070 
    7171${OBJECTDIR}/DataPacker.o: DataPacker.cpp  
    … …  
    7474        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp 
    7575 
    76 ${OBJECTDIR}/FEPClient.o: FEPClient.cpp  
     76${OBJECTDIR}/FEPSim.o: FEPSim.cpp  
    7777        ${MKDIR} -p ${OBJECTDIR} 
    7878        ${RM} "$@.d" 
    79         $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPClient.o FEPClient.cpp 
     79        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp 
    8080 
    8181${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp  
    … …  
    100100.clean-conf: ${CLEAN_SUBPROJECTS} 
    101101        ${RM} -r ${CND_BUILDDIR}/${CND_CONF} 
    102         ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client 
     102        ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator 
    103103 
    104104# Subprojects 

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

    r77 r82  
    2525 
    2626# Project Name 
    27 PROJECTNAME=fep_rpc_client 
     27PROJECTNAME=FEPSimulator 
    2828 
    2929# Active Configuration 

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

    r77 r82  
    88CND_DISTDIR=dist 
    99# Debug configuration 
    10 CND_PLATFORM_Debug=GNU-Linux-x86 
    11 CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-Linux-x86 
    12 CND_ARTIFACT_NAME_Debug=fep_rpc_client 
    13 CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux-x86/fep_rpc_client 
    14 CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux-x86/package 
    15 CND_PACKAGE_NAME_Debug=feprpcclient.tar 
    16 CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux-x86/package/feprpcclient.tar 
     10CND_PLATFORM_Debug=GNU-MacOSX 
     11CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-MacOSX 
     12CND_ARTIFACT_NAME_Debug=fepsimulator 
     13CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-MacOSX/fepsimulator 
     14CND_PACKAGE_DIR_Debug=dist/Debug/GNU-MacOSX/package 
     15CND_PACKAGE_NAME_Debug=fepsimulator.tar 
     16CND_PACKAGE_PATH_Debug=dist/Debug/GNU-MacOSX/package/fepsimulator.tar 
    1717# Release configuration 
    1818CND_PLATFORM_Release=GNU-Linux-x86 

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

    r77 r82  
    77# Macros 
    88TOP=`pwd` 
    9 CND_PLATFORM=GNU-Linux-x86 
     9CND_PLATFORM=GNU-MacOSX 
    1010CND_CONF=Debug 
    1111CND_DISTDIR=dist 
    1212CND_BUILDDIR=build 
    13 CND_DLIB_EXT=so 
     13CND_DLIB_EXT=dylib 
    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/configurations.xml

    r80 r82  
    66                   projectFiles="true"> 
    77      <itemPath>DataPacker.h</itemPath> 
    8       <itemPath>FEPClient.h</itemPath> 
     8      <itemPath>FEPSim.h</itemPath> 
    99      <itemPath>NetworkReader.h</itemPath> 
    1010      <itemPath>fep.h</itemPath> 
    … …  
    1919                   projectFiles="true"> 
    2020      <itemPath>DataPacker.cpp</itemPath> 
    21       <itemPath>FEPClient.cpp</itemPath> 
     21      <itemPath>FEPSim.cpp</itemPath> 
    2222      <itemPath>NetworkReader.cpp</itemPath> 
    2323      <itemPath>fep_clnt.c</itemPath> 
    … …  
    5252        <linkerTool> 
    5353          <linkerLibItems> 
    54             <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem> 
     54            <linkerLibFileItem>tinyxml/libosxtinyxml.a</linkerLibFileItem> 
    5555          </linkerLibItems> 
    5656        </linkerTool> 
    … …  
    6060      <item path="DataPacker.h" ex="false" tool="3" flavor2="0"> 
    6161      </item> 
    62       <item path="FEPClient.cpp" ex="false" tool="1" flavor2="0"> 
     62      <item path="FEPSim.cpp" ex="false" tool="1" flavor2="0"> 
    6363      </item> 
    64       <item path="FEPClient.h" ex="false" tool="3" flavor2="0"> 
     64      <item path="FEPSim.h" ex="false" tool="3" flavor2="0"> 
    6565      </item> 
    6666      <item path="NetworkReader.cpp" ex="false" tool="1" flavor2="0"> 
    … …  
    101101      <item path="DataPacker.h" ex="false" tool="3" flavor2="0"> 
    102102      </item> 
    103       <item path="FEPClient.cpp" ex="false" tool="1" flavor2="0"> 
     103      <item path="FEPSim.cpp" ex="false" tool="1" flavor2="0"> 
    104104      </item> 
    105       <item path="FEPClient.h" ex="false" tool="3" flavor2="0"> 
     105      <item path="FEPSim.h" ex="false" tool="3" flavor2="0"> 
    106106      </item> 
    107107      <item path="NetworkReader.cpp" ex="false" tool="1" flavor2="0"> 

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

    r80 r82  
    66      <toolsSet> 
    77        <developmentServer>localhost</developmentServer> 
    8         <platform>2</platform> 
     8        <platform>4</platform> 
    99      </toolsSet> 
    1010      <dbx_gdbdebugger version="1"> 
    … …  
    2828          <runcommandpicklistitem>"${OUTPUT_PATH}" localhost networkFile.txt</runcommandpicklistitem> 
    2929          <runcommandpicklistitem>"${OUTPUT_PATH}" 192.168.251.27 networkFile.txt</runcommandpicklistitem> 
     30          <runcommandpicklistitem>"${OUTPUT_PATH}" 192.168.251.27</runcommandpicklistitem> 
     31          <runcommandpicklistitem>"${OUTPUT_PATH}" 192.168.251.27 8080</runcommandpicklistitem> 
    3032        </runcommandpicklist> 
    31         <runcommand>"${OUTPUT_PATH}" 192.168.251.27 networkFile.txt</runcommand> 
     33        <runcommand>"${OUTPUT_PATH}" 192.168.251.27 8080</runcommand> 
    3234        <rundir></rundir> 
    3335        <buildfirst>true</buildfirst> 
Note: See TracChangeset for help on using the changeset viewer.