summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a189a87)
raw | patch | inline | side by side (parent: a189a87)
author | lnetsch <lnetsch@localhost> | |
Fri, 6 Jan 2012 19:30:44 +0000 (19:30 +0000) | ||
committer | lnetsch <lnetsch@localhost> | |
Fri, 6 Jan 2012 19:30:44 +0000 (19:30 +0000) |
diff --git a/.gitattributes b/.gitattributes
index 09227c5c73d2cad3181ca9e3770da7d4d6f3732a..4fe0a98839598dfbb3ac9617d2db4ac40912052f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
TIesrEngine/TIesrEngineSDso/nbproject/project.xml -text
TIesrEngine/TIesrEngineSIso/.dep.inc -text
TIesrEngine/TIesrEngineSIso/nbproject/Makefile-ArmLinuxDebugGnueabi.mk -text
+TIesrEngine/TIesrEngineSIso/nbproject/Makefile-ArmLinuxDebugGnueabiWinHost.mk -text
TIesrEngine/TIesrEngineSIso/nbproject/Makefile-ArmLinuxReleaseGnueabi.mk -text
+TIesrEngine/TIesrEngineSIso/nbproject/Makefile-ArmLinuxReleaseGnueabiWinHost.mk -text
TIesrEngine/TIesrEngineSIso/nbproject/Makefile-LinuxDebugGnu.mk -text
TIesrEngine/TIesrEngineSIso/nbproject/Makefile-LinuxReleaseGnu.mk -text
TIesrEngine/TIesrEngineSIso/nbproject/Makefile-WindowsDebugMinGW.mk -text
TIesrEngine/TIesrEngineSIso/nbproject/Makefile-impl.mk -text
TIesrEngine/TIesrEngineSIso/nbproject/Makefile-variables.mk -text
TIesrEngine/TIesrEngineSIso/nbproject/Package-ArmLinuxDebugGnueabi.bash -text
+TIesrEngine/TIesrEngineSIso/nbproject/Package-ArmLinuxDebugGnueabiWinHost.bash -text
TIesrEngine/TIesrEngineSIso/nbproject/Package-ArmLinuxReleaseGnueabi.bash -text
+TIesrEngine/TIesrEngineSIso/nbproject/Package-ArmLinuxReleaseGnueabiWinHost.bash -text
TIesrEngine/TIesrEngineSIso/nbproject/Package-LinuxDebugGnu.bash -text
TIesrEngine/TIesrEngineSIso/nbproject/Package-LinuxReleaseGnu.bash -text
TIesrEngine/TIesrEngineSIso/nbproject/Package-WindowsDebugMinGW.bash -text
index d7dae7aea9555bd40958cc5b6f7b34b74e0d1578..5df2dd920b625458b0949cd30d02b758afbdb068 100755 (executable)
then cd ../../Dist/${CONF}/lib; \
rm -f libTIesrEngineSI.so; \
ln -s libTIesrEngineSI.so.1 libTIesrEngineSI.so; \
+ elif [ ${CONF} = ArmLinuxDebugGnueabiWinHost -o \
+ ${CONF} = ArmLinuxReleaseGnueabiWinHost ]; \
+ then cd ../../Dist/${CONF}/lib; \
+ cp libTIesrEngineSI.so.1 libTIesrEngineSI.so; \
fi
diff --git a/TIesrEngine/TIesrEngineSIso/nbproject/Makefile-ArmLinuxDebugGnueabiWinHost.mk b/TIesrEngine/TIesrEngineSIso/nbproject/Makefile-ArmLinuxDebugGnueabiWinHost.mk
--- /dev/null
@@ -0,0 +1,17 @@
+.build-conf:
+ @echo Tool collection not found.
+ @echo Please specify existing tool collection in project properties
+ @exit 1
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r build/ArmLinuxDebugGnueabiWinHost
+ ${RM} ../../Dist/ArmLinuxDebugGnueabiWinHost/lib/libTIesrEngineSI.so.1
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/TIesrEngine/TIesrEngineSIso/nbproject/Makefile-ArmLinuxReleaseGnueabiWinHost.mk b/TIesrEngine/TIesrEngineSIso/nbproject/Makefile-ArmLinuxReleaseGnueabiWinHost.mk
--- /dev/null
@@ -0,0 +1,17 @@
+.build-conf:
+ @echo Tool collection not found.
+ @echo Please specify existing tool collection in project properties
+ @exit 1
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r build/ArmLinuxReleaseGnueabiWinHost
+ ${RM} ../../Dist/ArmLinuxReleaseGnueabiWinHost/lib/libTIesrEngineSI.so.1
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/TIesrEngine/TIesrEngineSIso/nbproject/Makefile-impl.mk b/TIesrEngine/TIesrEngineSIso/nbproject/Makefile-impl.mk
index 2e953d94bc089ef8859960ac0091f7065917a00a..d87663252154f4c542ee7cee70d803b16d897a05 100644 (file)
CONF=${DEFAULTCONF}
# All Configurations
-ALLCONFS=WindowsDebugMinGW WindowsReleaseMinGW LinuxDebugGnu LinuxReleaseGnu ArmLinuxDebugGnueabi ArmLinuxReleaseGnueabi
+ALLCONFS=WindowsDebugMinGW WindowsReleaseMinGW LinuxDebugGnu LinuxReleaseGnu ArmLinuxDebugGnueabi ArmLinuxReleaseGnueabi ArmLinuxDebugGnueabiWinHost ArmLinuxReleaseGnueabiWinHost
# build
diff --git a/TIesrEngine/TIesrEngineSIso/nbproject/Makefile-variables.mk b/TIesrEngine/TIesrEngineSIso/nbproject/Makefile-variables.mk
index f0b34dfbd49959f358a169a44482f8ef4f62087c..a71d8d7e6692f3bc11a067f942bbd552bc5fd62f 100644 (file)
CND_PACKAGE_DIR_ArmLinuxReleaseGnueabi=dist/ArmLinuxReleaseGnueabi/arm-none-linux-gnueabi-Linux-x86/package
CND_PACKAGE_NAME_ArmLinuxReleaseGnueabi=libTIesrEngineSIso.so.tar
CND_PACKAGE_PATH_ArmLinuxReleaseGnueabi=dist/ArmLinuxReleaseGnueabi/arm-none-linux-gnueabi-Linux-x86/package/libTIesrEngineSIso.so.tar
+# ArmLinuxDebugGnueabiWinHost configuration
+CND_PLATFORM_ArmLinuxDebugGnueabiWinHost=
+CND_ARTIFACT_DIR_ArmLinuxDebugGnueabiWinHost=../../Dist/ArmLinuxDebugGnueabiWinHost/lib
+CND_ARTIFACT_NAME_ArmLinuxDebugGnueabiWinHost=libTIesrEngineSI.so.1
+CND_ARTIFACT_PATH_ArmLinuxDebugGnueabiWinHost=../../Dist/ArmLinuxDebugGnueabiWinHost/lib/libTIesrEngineSI.so.1
+CND_PACKAGE_DIR_ArmLinuxDebugGnueabiWinHost=dist/ArmLinuxDebugGnueabiWinHost//package
+CND_PACKAGE_NAME_ArmLinuxDebugGnueabiWinHost=libTIesrEngineSIso.so.tar
+CND_PACKAGE_PATH_ArmLinuxDebugGnueabiWinHost=dist/ArmLinuxDebugGnueabiWinHost//package/libTIesrEngineSIso.so.tar
+# ArmLinuxReleaseGnueabiWinHost configuration
+CND_PLATFORM_ArmLinuxReleaseGnueabiWinHost=
+CND_ARTIFACT_DIR_ArmLinuxReleaseGnueabiWinHost=../../Dist/ArmLinuxReleaseGnueabiWinHost/lib
+CND_ARTIFACT_NAME_ArmLinuxReleaseGnueabiWinHost=libTIesrEngineSI.so.1
+CND_ARTIFACT_PATH_ArmLinuxReleaseGnueabiWinHost=../../Dist/ArmLinuxReleaseGnueabiWinHost/lib/libTIesrEngineSI.so.1
+CND_PACKAGE_DIR_ArmLinuxReleaseGnueabiWinHost=dist/ArmLinuxReleaseGnueabiWinHost//package
+CND_PACKAGE_NAME_ArmLinuxReleaseGnueabiWinHost=libTIesrEngineSIso.so.tar
+CND_PACKAGE_PATH_ArmLinuxReleaseGnueabiWinHost=dist/ArmLinuxReleaseGnueabiWinHost//package/libTIesrEngineSIso.so.tar
diff --git a/TIesrEngine/TIesrEngineSIso/nbproject/Package-ArmLinuxDebugGnueabiWinHost.bash b/TIesrEngine/TIesrEngineSIso/nbproject/Package-ArmLinuxDebugGnueabiWinHost.bash
--- /dev/null
@@ -0,0 +1,74 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=
+CND_CONF=ArmLinuxDebugGnueabiWinHost
+CND_DISTDIR=dist
+TMPDIR=build/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=../../Dist/${CND_CONF}/lib/libTIesrEngineSI.so.1
+OUTPUT_BASENAME=libTIesrEngineSI.so.1
+PACKAGE_TOP_DIR=libTIesrEngineSIso.so/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${TMPDIR}
+mkdir -p ${TMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory ${TMPDIR}/libTIesrEngineSIso.so/lib
+copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libTIesrEngineSIso.so.tar
+cd ${TMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libTIesrEngineSIso.so.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${TMPDIR}
diff --git a/TIesrEngine/TIesrEngineSIso/nbproject/Package-ArmLinuxReleaseGnueabiWinHost.bash b/TIesrEngine/TIesrEngineSIso/nbproject/Package-ArmLinuxReleaseGnueabiWinHost.bash
--- /dev/null
@@ -0,0 +1,74 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=
+CND_CONF=ArmLinuxReleaseGnueabiWinHost
+CND_DISTDIR=dist
+TMPDIR=build/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=../../Dist/${CND_CONF}/lib/libTIesrEngineSI.so.1
+OUTPUT_BASENAME=libTIesrEngineSI.so.1
+PACKAGE_TOP_DIR=libTIesrEngineSIso.so/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${TMPDIR}
+mkdir -p ${TMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory ${TMPDIR}/libTIesrEngineSIso.so/lib
+copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libTIesrEngineSIso.so.tar
+cd ${TMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libTIesrEngineSIso.so.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${TMPDIR}
diff --git a/TIesrEngine/TIesrEngineSIso/nbproject/configurations.xml b/TIesrEngine/TIesrEngineSIso/nbproject/configurations.xml
index 2516037b7047c945e73b7f684689cbe12254345a..f4f2f45fc79c5bbf0be2804794222bdac6a7e6e3 100755 (executable)
</linkerTool>
</compileType>
</conf>
+ <conf name="ArmLinuxDebugGnueabiWinHost" type="2">
+ <toolsSet>
+ <developmentServer>localhost</developmentServer>
+ <compilerSet>arm-linux_win_host|Cygwin</compilerSet>
+ <platform>2</platform>
+ </toolsSet>
+ <compileType>
+ <ccTool>
+ <commandLine>-v</commandLine>
+ <warningLevel>2</warningLevel>
+ </ccTool>
+ <linkerTool>
+ <output>../../Dist/${CND_CONF}/lib/libTIesrEngineSI.so.1</output>
+ <linkerLibItems>
+ <linkerLibProjectItem>
+ <makeArtifact PL="../TIesrEngineCoreso"
+ CT="2"
+ CN="ArmLinuxDebugGnueabiWinHost"
+ AC="true"
+ BL="false"
+ WD="../TIesrEngineCoreso"
+ BC="${MAKE} -f Makefile CONF=ArmLinuxDebugGnueabiWinHost"
+ CC="${MAKE} -f Makefile CONF=ArmLinuxDebugGnueabiWinHost clean"
+ OP="../../Dist/ArmLinuxDebugGnueabiWinHost/lib/libTIesrEngineCore.so.1">
+ </makeArtifact>
+ </linkerLibProjectItem>
+ </linkerLibItems>
+ <commandLine>-Wl,-znow,-zdefs -Wl,-h,libTIesrEngineSI.so.1 -Wl,--version-script=../resource/TIesrEngineSI.ver</commandLine>
+ </linkerTool>
+ </compileType>
+ </conf>
+ <conf name="ArmLinuxReleaseGnueabiWinHost" type="2">
+ <toolsSet>
+ <developmentServer>localhost</developmentServer>
+ <compilerSet>arm-linux_win_host|Cygwin</compilerSet>
+ <platform>2</platform>
+ </toolsSet>
+ <compileType>
+ <ccTool>
+ <developmentMode>5</developmentMode>
+ <commandLine>-v</commandLine>
+ <warningLevel>2</warningLevel>
+ </ccTool>
+ <linkerTool>
+ <output>../../Dist/${CND_CONF}/lib/libTIesrEngineSI.so.1</output>
+ <linkerLibItems>
+ <linkerLibProjectItem>
+ <makeArtifact PL="../TIesrEngineCoreso"
+ CT="2"
+ CN="ArmLinuxReleaseGnueabiWinHost"
+ AC="false"
+ BL="false"
+ WD="../TIesrEngineCoreso"
+ BC="${MAKE} -f Makefile CONF=ArmLinuxReleaseGnueabiWinHost"
+ CC="${MAKE} -f Makefile CONF=ArmLinuxReleaseGnueabiWinHost clean"
+ OP="../../Dist/ArmLinuxReleaseGnueabiWinHost/lib/libTIesrEngineCore.so.1">
+ </makeArtifact>
+ </linkerLibProjectItem>
+ </linkerLibItems>
+ <commandLine>-Wl,-znow,-zdefs -Wl,-h,libTIesrEngineSI.so.1 -Wl,--version-script=../resource/TIesrEngineSI.ver</commandLine>
+ </linkerTool>
+ </compileType>
+ </conf>
</confs>
</configurationDescriptor>
diff --git a/TIesrEngine/TIesrEngineSIso/nbproject/private/configurations.xml b/TIesrEngine/TIesrEngineSIso/nbproject/private/configurations.xml
index a1af2a8515a0164617920522214de7098e5025eb..76c1a18e3fc71e8251c6c70bb290bb391aeccff4 100755 (executable)
</environment>
</runprofile>
</conf>
+ <conf name="ArmLinuxDebugGnueabiWinHost" type="2">
+ <gdbdebugger version="2">
+ <gdb_command>gdb</gdb_command>
+ <array_repeat_threshold>10</array_repeat_threshold>
+ </gdbdebugger>
+ <gizmo_options version="1">
+ </gizmo_options>
+ <runprofile version="5">
+ <args></args>
+ <rundir></rundir>
+ <buildfirst>true</buildfirst>
+ <console-type>0</console-type>
+ <terminal-type>0</terminal-type>
+ <environment>
+ </environment>
+ </runprofile>
+ </conf>
+ <conf name="ArmLinuxReleaseGnueabiWinHost" type="2">
+ <gdbdebugger version="2">
+ <gdb_command>gdb</gdb_command>
+ <array_repeat_threshold>10</array_repeat_threshold>
+ </gdbdebugger>
+ <gizmo_options version="1">
+ </gizmo_options>
+ <runprofile version="5">
+ <args></args>
+ <rundir></rundir>
+ <buildfirst>true</buildfirst>
+ <console-type>0</console-type>
+ <terminal-type>0</terminal-type>
+ <environment>
+ </environment>
+ </runprofile>
+ </conf>
</confs>
</configurationDescriptor>