Changeset 116 in tmcsimulator

Timestamp:

10/14/2017 10:35:56 AM (9 years ago)

Author:

jtorres

Message:

Changed linker file in WorkingFEPSim

Location:

branches/WorkingFEPSim/nbproject

Files:

• Makefile-Debug.mk (modified) (2 diffs)
• Makefile-impl.mk (modified) (1 diff)
• Makefile-variables.mk (modified) (1 diff)
• Package-Debug.bash (modified) (3 diffs)
• configurations.xml (modified) (1 diff)

branches/WorkingFEPSim/nbproject/Makefile-Debug.mk

@@ -58 +58 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=../../tmcsimulator/branches/FEPSimulator/tinyxml/libosxtinyxml.a
+LDLIBSOPTIONS=tinyxml/tinyxml.a
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
+        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ../../tmcsimulator/branches/FEPSimulator/tinyxml/libosxtinyxml.a
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim: tinyxml/tinyxml.a
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim: ${OBJECTFILES}
         ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-        ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS}
+        ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
@@ -106 +106 @@
 .clean-conf: ${CLEAN_SUBPROJECTS}
         ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-        ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
+        ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim
 
 # Subprojects

branches/WorkingFEPSim/nbproject/Makefile-impl.mk

@@ -25 +25 @@
 
 # Project Name
-PROJECTNAME=FEPSimulator
+PROJECTNAME=WorkingFEPSim
 
 # Active Configuration

branches/WorkingFEPSim/nbproject/Makefile-variables.mk

@@ -10 +10 @@
 CND_PLATFORM_Debug=GNU-MacOSX
 CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-MacOSX
-CND_ARTIFACT_NAME_Debug=fepsimulator
-CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-MacOSX/fepsimulator
+CND_ARTIFACT_NAME_Debug=workingfepsim
+CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-MacOSX/workingfepsim
 CND_PACKAGE_DIR_Debug=dist/Debug/GNU-MacOSX/package
-CND_PACKAGE_NAME_Debug=fepsimulator.tar
-CND_PACKAGE_PATH_Debug=dist/Debug/GNU-MacOSX/package/fepsimulator.tar
+CND_PACKAGE_NAME_Debug=workingfepsim.tar
+CND_PACKAGE_PATH_Debug=dist/Debug/GNU-MacOSX/package/workingfepsim.tar
 # Release configuration
 CND_PLATFORM_Release=GNU-Linux-x86

branches/WorkingFEPSim/nbproject/Package-Debug.bash

@@ -14 +14 @@
 NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
-OUTPUT_BASENAME=fepsimulator
-PACKAGE_TOP_DIR=fepsimulator/
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim
+OUTPUT_BASENAME=workingfepsim
+PACKAGE_TOP_DIR=workingfepsim/
 
 # Functions
@@ -61 +61 @@
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory "${NBTMPDIR}/fepsimulator/bin"
+makeDirectory "${NBTMPDIR}/workingfepsim/bin"
 copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
 
@@ -67 +67 @@
 # Generate tar file
 cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/workingfepsim.tar
 cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/workingfepsim.tar *
 checkReturnCode
 

branches/WorkingFEPSim/nbproject/configurations.xml

@@ -53 +53 @@
         <linkerTool>
           <linkerLibItems>
-            <linkerLibFileItem>../../tmcsimulator/branches/FEPSimulator/tinyxml/libosxtinyxml.a</linkerLibFileItem>
+            <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem>
           </linkerLibItems>
         </linkerTool>