From 615442c342cde9a69b95af133d90cd2e08568cb0 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 04 12月 2012 18:03:06 +0800
Subject: [PATCH] Refactor IEEE488.2 registers to support SRQ
---
netbeans/nbproject/configurations.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/netbeans/nbproject/configurations.xml b/netbeans/nbproject/configurations.xml
index 133b92f..ef32289 100644
--- a/netbeans/nbproject/configurations.xml
+++ b/netbeans/nbproject/configurations.xml
@@ -7,9 +7,14 @@
<logicalFolder name="f1" displayName="scpi" projectFiles="true">
<itemPath>../scpi/scpi.h</itemPath>
<itemPath>../scpi/scpi_constants.h</itemPath>
+ <itemPath>../scpi/scpi_debug.h</itemPath>
<itemPath>../scpi/scpi_error.h</itemPath>
+ <itemPath>../scpi/scpi_fifo.h</itemPath>
<itemPath>../scpi/scpi_ieee488.h</itemPath>
<itemPath>../scpi/scpi_minimal.h</itemPath>
+ <itemPath>../scpi/scpi_parser.h</itemPath>
+ <itemPath>../scpi/scpi_types.h</itemPath>
+ <itemPath>../scpi/scpi_units.h</itemPath>
<itemPath>../scpi/scpi_utils.h</itemPath>
</logicalFolder>
</logicalFolder>
@@ -21,10 +26,12 @@
displayName="Source Files"
projectFiles="true">
<logicalFolder name="f1" displayName="scpi" projectFiles="true">
- <itemPath>../scpi/scpi.c</itemPath>
+ <itemPath>../scpi/scpi_debug.c</itemPath>
<itemPath>../scpi/scpi_error.c</itemPath>
+ <itemPath>../scpi/scpi_fifo.c</itemPath>
<itemPath>../scpi/scpi_ieee488.c</itemPath>
<itemPath>../scpi/scpi_minimal.c</itemPath>
+ <itemPath>../scpi/scpi_parser.c</itemPath>
<itemPath>../scpi/scpi_units.c</itemPath>
<itemPath>../scpi/scpi_utils.c</itemPath>
</logicalFolder>
@@ -34,6 +41,12 @@
displayName="Test Files"
projectFiles="false"
kind="TEST_LOGICAL_FOLDER">
+ <logicalFolder name="f1"
+ displayName="FIFO test"
+ projectFiles="true"
+ kind="TEST">
+ <itemPath>tests/test_fifo.c</itemPath>
+ </logicalFolder>
<logicalFolder name="f3"
displayName="Test SCPI utils"
projectFiles="true"
@@ -71,10 +84,9 @@
</incDir>
</ccTool>
<linkerTool>
- <output>${TESTDIR}/TestFiles/f2</output>
+ <output>${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/scpi_parser</output>
<linkerLibItems>
- <linkerLibStdlibItem>CUnit</linkerLibStdlibItem>
- <linkerLibStdlibItem>CUnit</linkerLibStdlibItem>
+ <linkerLibLibItem>cunit</linkerLibLibItem>
</linkerLibItems>
<commandLine>-g3</commandLine>
</linkerTool>
@@ -95,17 +107,33 @@
<cTool>
<incDir>
<pElem>.</pElem>
+ </incDir>
+ </cTool>
+ <ccTool>
+ <incDir>
+ <pElem>.</pElem>
+ </incDir>
+ </ccTool>
+ <linkerTool>
+ <output>${TESTDIR}/TestFiles/f2</output>
+ <linkerLibItems>
+ <linkerLibStdlibItem>CUnit</linkerLibStdlibItem>
+ </linkerLibItems>
+ </linkerTool>
+ </folder>
+ <folder path="TestFiles/f2">
+ <cTool>
+ <incDir>
<pElem>.</pElem>
</incDir>
</cTool>
<ccTool>
<incDir>
<pElem>.</pElem>
- <pElem>.</pElem>
</incDir>
</ccTool>
<linkerTool>
- <output>${TESTDIR}/TestFiles/f1</output>
+ <output>${TESTDIR}/TestFiles/f2</output>
<linkerLibItems>
<linkerLibStdlibItem>CUnit</linkerLibStdlibItem>
</linkerLibItems>
@@ -136,6 +164,8 @@
<compileType>
<cTool>
<developmentMode>5</developmentMode>
+ <commandLine>-Os -Wextra</commandLine>
+ <warningLevel>2</warningLevel>
</cTool>
<ccTool>
<developmentMode>5</developmentMode>
@@ -162,6 +192,16 @@
group="bin"/>
</packFileList>
</packaging>
+ <folder path="TestFiles/f1">
+ <linkerTool>
+ <output>${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/f1</output>
+ </linkerTool>
+ </folder>
+ <folder path="TestFiles/f3">
+ <linkerTool>
+ <output>${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/f2</output>
+ </linkerTool>
+ </folder>
</conf>
</confs>
</configurationDescriptor>
--
Gitblit v1.9.1