getdata-commits Mailing List for GetData (Page 16)
Scientific Database Format
Brought to you by:
ketiltrout
Menu
▾
▴
getdata-commits — An automated log of GetData Subversion activity.
This list is closed, nobody may subscribe to it.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(20) |
Nov
(21) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(1) |
Feb
(1) |
Mar
(56) |
Apr
(20) |
May
(4) |
Jun
(2) |
Jul
(3) |
Aug
(11) |
Sep
(2) |
Oct
(4) |
Nov
(18) |
Dec
(16) |
| 2012 |
Jan
(8) |
Feb
(12) |
Mar
(30) |
Apr
(13) |
May
(10) |
Jun
(17) |
Jul
(18) |
Aug
(19) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(9) |
| 2013 |
Jan
(1) |
Feb
(4) |
Mar
(27) |
Apr
(6) |
May
(3) |
Jun
(1) |
Jul
(10) |
Aug
|
Sep
(3) |
Oct
(15) |
Nov
(4) |
Dec
(9) |
| 2014 |
Jan
|
Feb
(3) |
Mar
(4) |
Apr
(10) |
May
(15) |
Jun
|
Jul
(14) |
Aug
|
Sep
(2) |
Oct
(6) |
Nov
|
Dec
(9) |
| 2015 |
Jan
(2) |
Feb
(3) |
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ket...@us...> - 2011-03-26 01:45:55
|
Revision: 560
http://getdata.svn.sourceforge.net/getdata/?rev=560&view=rev
Author: ketiltrout
Date: 2011-03-26 01:45:47 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
Updates for 0.7.2.
Modified Paths:
--------------
trunk/html/Makefile
trunk/html/api.html
trunk/html/bindings.html
trunk/html/dirfile.html
trunk/html/encoding.html
trunk/html/getdata.html
trunk/html/index.html
Added Paths:
-----------
trunk/html/download.html
Modified: trunk/html/Makefile
===================================================================
--- trunk/html/Makefile 2011-03-25 00:36:12 UTC (rev 559)
+++ trunk/html/Makefile 2011-03-26 01:45:47 UTC (rev 560)
@@ -7,9 +7,9 @@
cd $(SRC_DIR)/man && $(MAKE) htmlman
cp $(SRC_DIR)/man/*3.html man3
-PUBLIC_HTML=index.html api.html bindings.html dirfile.html encoding.html \
- getdata.html getdata.css dirfile.png valid_html.png valid_css.png \
- man3
+PUBLIC_HTML=index.html api.html bindings.html dirfile.html download.html \
+ encoding.html getdata.html getdata.css dirfile.png valid_html.png \
+ valid_css.png man3
push: push-stamp
push-stamp: ${PUBLIC_HTML}
Modified: trunk/html/api.html
===================================================================
--- trunk/html/api.html 2011-03-25 00:36:12 UTC (rev 559)
+++ trunk/html/api.html 2011-03-26 01:45:47 UTC (rev 560)
@@ -10,7 +10,7 @@
<H1>The API Transition</H1>
<div class="topbar">
<a href="index.html">home</a> |
- <a href="index.html#download">download</a> |
+ <a href="download.html">download</a> |
<a href="getdata.html">API documentation</a> |
<a href="dirfile.html">dirfile standards</a> |
<a href="http://lists.sourceforge.net/lists/listinfo/getdata-devel">mailing list</a> |
@@ -35,6 +35,13 @@
<li><a href="index.html#warranty">Warranty and Redistribution</a></li>
<li><a href="index.html#contact">Contact</a></li>
</ul>
+ <h2 class="menu"><a href="download.html">Get GetData</a></h2>
+ <ul>
+ <li><a href="download.html#source">Latest Release</a>
+ <li><a href="download.html#distros">Pre-Built Packages</a>
+ <li><a href="download.html#svn">Subversion</a>
+ <li><a href="download.html#previous">Previous Releases</a>
+ </ul>
<h2 class="menu"><a href="bindings.html">GetData Bindings</a></h2>
<ul>
<li><a href="bindings.html#introduction">Introduction</a></li>
Modified: trunk/html/bindings.html
===================================================================
--- trunk/html/bindings.html 2011-03-25 00:36:12 UTC (rev 559)
+++ trunk/html/bindings.html 2011-03-26 01:45:47 UTC (rev 560)
@@ -10,7 +10,7 @@
<H1>GetData Bindings</H1>
<div class="topbar">
<a href="index.html">home</a> |
- <a href="index.html#download">download</a> |
+ <a href="download.html">download</a> |
<a href="getdata.html">API documentation</a> |
<a href="dirfile.html">dirfile standards</a> |
<a href="http://lists.sourceforge.net/lists/listinfo/getdata-devel">mailing list</a> |
@@ -33,6 +33,13 @@
<li><a href="index.html#warranty">Warranty and Redistribution</a></li>
<li><a href="index.html#contact">Contact</a></li>
</ul>
+ <h2 class="menu"><a href="download.html">Get GetData</a></h2>
+ <ul>
+ <li><a href="download.html#source">Latest Release</a>
+ <li><a href="download.html#distros">Pre-Built Packages</a>
+ <li><a href="download.html#svn">Subversion</a>
+ <li><a href="download.html#previous">Previous Releases</a>
+ </ul>
<h2 class="menu"><a href="getdata.html">Using GetData</a></h2>
<ul>
<li><a href="getdata.html#prelim">Preliminaries</a>
Modified: trunk/html/dirfile.html
===================================================================
--- trunk/html/dirfile.html 2011-03-25 00:36:12 UTC (rev 559)
+++ trunk/html/dirfile.html 2011-03-26 01:45:47 UTC (rev 560)
@@ -10,7 +10,7 @@
<H1>The Dirfile Standards</H1>
<div class="topbar">
<a href="index.html">home</a> |
- <a href="index.html#download">download</a> |
+ <a href="download.html">download</a> |
<a href="getdata.html">API documentation</a> |
dirfile standards |
<a href="http://lists.sourceforge.net/lists/listinfo/getdata-devel">mailing list</a> |
@@ -43,6 +43,13 @@
<li><a href="index.html#warranty">Warranty and Redistribution</a></li>
<li><a href="index.html#contact">Contact</a></li>
</ul>
+ <h2 class="menu"><a href="download.html">Get GetData</a></h2>
+ <ul>
+ <li><a href="download.html#source">Latest Release</a>
+ <li><a href="download.html#distros">Pre-Built Packages</a>
+ <li><a href="download.html#svn">Subversion</a>
+ <li><a href="download.html#previous">Previous Releases</a>
+ </ul>
<h2 class="menu"><a href="bindings.html">GetData Bindings</a></h2>
<ul>
<li><a href="bindings.html#introduction">Introduction</a></li>
@@ -233,78 +240,78 @@
marks, or in which the last character is the backslash character.
<p>Several characters when escaped by a preceding backslash character are
interpreted as special characters in tokens. Some of these have already
- been mentioned. They are presented in Table 1. Any other character
- which is escaped is interpreted as the character itself. (<i>i.e.</i>
- <span class="syntax"><b>\c</b></span> is interpreted as
- <span class="syntax"><b>c</b></span>).
+ been mentioned. The full list of character escape sequences is presented
+ in Table 1. Any other character which is escaped is interpreted as
+ the character itself. (<i>i.e.</i> <span class="syntax"><b>\c</b></span>
+ is interpreted as <span class="syntax"><b>c</b></span>).
<div class="inset">
- <table>
- <caption><b>Table 1:</b> Character Escape Sequences</caption>
- <tr><th>Sequence</th><th>Interpretation</th><th>Byte</th>
- </tr>
- <tr>
- <td class="syntax"><b>\"</b></td>
- <td>a quotation mark character</td><td>0x22</td>
- </tr>
- <tr>
- <td class="syntax"><b>\#</b></td>
- <td>a hash mark character</td><td>0x23</td>
- </tr>
- <tr>
- <td class="syntax"><b>\a</b></td>
- <td>an alert (bell) character</td><td>0x07</td>
- </tr>
- <tr>
- <td class="syntax"><b>\b</b></td>
- <td>a backspace character</td><td>0x08</td>
- </tr>
- <tr>
- <td class="syntax"><b>\e</b></td>
- <td>an escape character</td><td>0x1B</td>
- </tr>
- <tr>
- <td class="syntax"><b>\f</b></td>
- <td>a form-feed character</td><td>0x0C</td>
- </tr>
- <tr>
- <td class="syntax"><b>\n</b></td>
- <td>a line-feed character</td><td>0x0A</td>
- </tr>
- <tr>
- <td class="syntax"><b>\r</b></td>
- <td>a carriage return character</td><td>0x0D</td>
- </tr>
- <tr>
- <td class="syntax"><b>\t</b></td>
- <td>a horizontal tab character</td><td>0x09</td>
- </tr>
- <tr>
- <td class="syntax"><b>\v</b></td>
- <td>a vertical tab character</td><td>0x0B</td>
- </tr>
- <tr>
- <td class="syntax"><b>\\</b></td>
- <td>a backslash character</td><td>0x5C</td>
- </tr>
- <tr>
- <td class="syntax"><b>\</b><i>ooo</i></td>
- <td>the single byte given by the octal number <i>ooo</i>. (1 to 3
- digits)</td>
- <td>0<i>ooo</i></td>
- </tr>
- <tr>
- <td class="syntax"><b>\x</b><i>hh</i></td>
- <td>the single byte given by the hexadecimal number <i>hh</i>. (1 or
- 2 digits)</td>
- <td>0x<i>hh</i></td>
- </tr>
- <tr>
- <td class="syntax"><b>\u</b><i>hhhhhhh</i></td>
- <td colspan="2">
- the UTF-8 byte sequence encoding the Unicode code point given by the
- hexadecimal number <i>hhhhhhh</i>. (1 to 7 digits)
- </td></tr>
- </table>
+ <table>
+ <caption><b>Table 1:</b> Character Escape Sequences</caption>
+ <tr><th>Sequence</th><th>Interpretation</th><th>Byte</th>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\"</b></td>
+ <td>a quotation mark character</td><td>0x22</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\#</b></td>
+ <td>a hash mark character</td><td>0x23</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\a</b></td>
+ <td>an alert (bell) character</td><td>0x07</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\b</b></td>
+ <td>a backspace character</td><td>0x08</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\e</b></td>
+ <td>an escape character</td><td>0x1B</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\f</b></td>
+ <td>a form-feed character</td><td>0x0C</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\n</b></td>
+ <td>a line-feed character</td><td>0x0A</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\r</b></td>
+ <td>a carriage return character</td><td>0x0D</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\t</b></td>
+ <td>a horizontal tab character</td><td>0x09</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\v</b></td>
+ <td>a vertical tab character</td><td>0x0B</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\\</b></td>
+ <td>a backslash character</td><td>0x5C</td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\</b><i>ooo</i></td>
+ <td>the single byte given by the octal number <i>ooo</i>. (1 to 3
+ digits)</td>
+ <td>0<i>ooo</i></td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\x</b><i>hh</i></td>
+ <td>the single byte given by the hexadecimal number <i>hh</i>. (1 or
+ 2 digits)</td>
+ <td>0x<i>hh</i></td>
+ </tr>
+ <tr>
+ <td class="syntax"><b>\u</b><i>hhhhhhh</i></td>
+ <td colspan="2">
+ the UTF-8 byte sequence encoding the Unicode code point given by
+ the hexadecimal number <i>hhhhhhh</i>. (1 to 7 digits)
+ </td></tr>
+ </table>
</div>
<p>No token may contain the NUL character (0x00).
Furthermore, although support is present to create UTF-8 byte sequences,
@@ -365,9 +372,11 @@
<span class="syntax">getdata()</span>,
<span class="syntax">putdata()</span>,
<span class="syntax">get_nframes()</span>, &c.) will be possible on
- the dirfile. If no encoding scheme is specified, GetData assumes the
- dirfile is unencoded. The /ENCODING directive has
- <a href="#fragscope"><i>fragment scope</i></a>. Introduced in Standards
+ the dirfile. If no encoding scheme is specified, GetData will try to <a
+ href="encoding.html#discovery">determine the encoding scheme
+ automatically</a>, or in the case of a newly created dirfile, assume
+ the dirfile is unencoded. The /ENCODING directive has <a
+ href="#fragscope"><i>fragment scope</i></a>. Introduced in Standards
Version 6.
<li><b>/ENDIAN</b>: The /ENDIAN directive specifies the endianness of
the raw data in the database. Syntax is:
@@ -488,46 +497,53 @@
The meaning and number these parameters depends on the field type
specified.
<h3><a name="fieldname">Field Names</a></h3>
- <p>A field name consists of one or more
- characters, excluding both ASCII control characters (bytes 0x00 through
- 0x1F) and the reserved characters listed in Table 2 according to Standards
- Version. Furthermore, the field name of a <b>RAW</b> field may only
- contain characters allowed in filenames. Although never allowed in a
- field name, a forward slash (<b>/</b>) can be used to define metafields;
- see above under the <a href="#meta"><b>/META</b></a> directive. Like the
- rest of the format file, field names are case sensitive.
+ <p>A field name consists of one or more characters, excluding both ASCII
+ control characters (bytes 0x00 through 0x1F) and the reserved characters
+ listed in Table 2 according to Standards Version. Furthermore, the field
+ name of a <b>RAW</b> field may only contain characters allowed in
+ filenames<sup><a href="#fs_note">†</a></sup>. Although never
+ allowed in a field name, a forward slash (<b>/</b>) can be used to define
+ metafields; see above under the <a href="#meta"><b>/META</b></a>
+ directive. Like the rest of the format file, field names are case
+ sensitive.
<div class="inset">
- <table>
- <caption><b>Table 2:</b> Reserved Characters in Field Names</caption>
- <tr><th>Version</th><th>Reserved Characters</th>
- </tr>
- <tr>
- <td>0–4</td><td><b>#</b><sup>†</sup> <b>/</b>
- <i>whitespace</i><sup>†</sup></td>
- </tr>
- <tr>
- <td>5</td><td><b>#</b><sup>†</sup> <b>/ & ; < > |</b>
- <i>whitespace</i><sup>†</sup></td>
- </tr>
- <tr>
- <td>6—</td><td><b>/ & ; < > | .</b></td>
- </tr>
- </table>
- <div class="footnote">
- †: By virtue of there being no way to include such characters in
- tokens.
+ <table>
+ <caption><b>Table 2:</b> Reserved Characters in Field Names</caption>
+ <tr><th>Version</th><th>Reserved Characters</th>
+ </tr>
+ <tr>
+ <td>0–4</td><td><b>#</b><sup>‡</sup> <b>/</b>
+ <i>whitespace</i><sup>‡</sup></td>
+ </tr>
+ <tr>
+ <td>5</td><td><b>#</b><sup>‡</sup> <b>/ & ; < >
+ |</b> <i>whitespace</i><sup>‡</sup></td>
+ </tr>
+ <tr>
+ <td>6—</td><td><b>/ & ; < > | .</b></td>
+ </tr>
+ </table>
+ <div class="footnote">
+ ‡: By virtue of there being no way to include such characters
+ in tokens.
+ </div>
</div>
- </div>
-
<p>The field name may not be <b>INDEX</b>, which is a special, implicit
- field which contains the integer frame index. Standards Version 5 also
- prohibit <b>FILEFRAM</b> as a field name; it was an alias for
+ field which contains the integer frame index. Standards Version 5 and
+ earlier also prohibit <b>FILEFRAM</b> as a field name; it was an alias for
<b>INDEX</b>, (which arose in the prehistoric times of ReadData, GetData's
spiritual predecessor).
<p>Standards Version 3 and 4 restrict field names to 50 characters.
Standards Version 2 and earlier restrict field names to 16 characters.
Additionally, the filesystem will put restrictions on the length of a
<b>RAW</b> field name, regardless of Standards Version.
+ <div class="footnote inset">
+ <hr>
+ <a name="fs_note">†</a>: Consult the documentation of the
+ filesystem backing the database for details, although most modern
+ filesystems permit any byte except NUL (0x00) or, failing that, any
+ Unicode character except NUL.
+ </div>
<h3><a name="fieldtype">Field Types</a></h3>
<p>There are thirteen field types. Of these, ten are of vector type
(<b>BIT</b>, <b>DIVIDE</b>, <b>LINCOM</b>, <b>LINTERP</b>,
@@ -853,86 +869,87 @@
<h2><a name="versions">Standards Versions</a></h2>
<p>The latest version of the Dirfile Standards is Version 8.
<div class="inset">
- <table>
- <caption><b>Table 3:</b> Dirfile Standards Version history</caption>
- <tr>
- <th>Version</th><th>Release Date</th><th>Notes</th>
- </tr>
- <tr>
- <td>8</td><td>November 2010</td><td>Added the <b>DIVIDE</b>,
- <b>RECIP</b> and <b>CARRAY</b> field types, made the forward slash
- on reserved words mandatory, and prohibited using the single
- character data type aliases in the specification of <b>RAW</b>
- fields. It also introduced the optional second (<i>arm</i>) token
- to the <b>/ENDIAN</b> directive.
- </tr>
- <tr>
- <td>7</td><td>October 2009</td><td>Added the <b>POLYNOM</b> and
- <b>SBIT</b> field types, and complex data types <b>COMPLEX64</b>
- and <b>COMPLEX128</b>. It also introduced representation suffixes
- to field codes, made the <span class="syntax">n_fields</span>
- parameter to <b>LINCOM</b> optional, and introduced the
- directive-less method of specifying metafields.
- </td>
- </tr>
- <tr>
- <td>6</td><td>October 2008</td><td> Added the <b>/ENCODING</b>,
- <b>/META</b>, <b>/PROTECT</b>, and <b>REFERENCE</b> directives and
- the <b>CONST</b> and <b>STRING</b> field types. It permitted
- whitespace in tokens and introduced the character escape sequences.
- It allowed <b>CONST</b> fields to be used as parameters in field
- specification lines. It also removed <i>FILEFRAM</i> as an alias
- for <i>INDEX</i>, and allowed <span class="syntax"><b>#</b></span>
- and <span class="syntax"><b>\</b></span> in field codes.
- </td>
- </tr>
- <tr>
- <td>5</td><td>August 2008</td><td>
- Added <b>VERSION</b> and
- <b>ENDIAN</b>, and removed the restriction on field name length. It
- introduced the data types <b>INT8</b>, <b>INT64</b>, and
- <b>UINT64</b>, the new-style type specifiers, and increased the
- range of the <b>BIT</b> field type from 32 to 64 bits. It also
- prohibited the characters
- <span class="syntax"><b>#&/;<>\.|</b></span> in field
- names.
- </td>
- </tr>
- <tr>
- <td>4</td><td>October 2006</td><td>
- Added the <b>PHASE</b> field type.
- </td>
- </tr>
- <tr>
- <td>3</td><td>January 2006</td><td>
- (The <i>Large Dirfile Extension</i>) Added <b>INCLUDE</b>, support
- for sub-dirfiles, and increased the allowed length of a field name
- from 16 to 50 characters.
- </td>
- </tr>
- <tr>
- <td>2</td><td>September 2005</td><td>
- Added the <b>MULTIPLY</b> field type, and added support for
- <b>LINCOM</b> fields with inputs of differing sample rates.
- </td>
- </tr>
- <tr>
- <td>1</td><td>November 2004</td><td>
- Added <b>FRAMEOFFSET</b> and the optional fourth argument to the
- <b>BIT</b> field type.
- </td>
- </tr>
- <tr>
- <td>0</td><td>before<br>March 2003</td><td>
- This Refers to the dirfile standards supported by the GetData
- library originally introduced into the
- <a href="http://kst.kde.org/">kst</a> sources, which contained
- support for all other features covered by this document.
- </td>
- </tr>
- </table>
+ <table>
+ <caption><b>Table 3:</b> Dirfile Standards Version history</caption>
+ <tr>
+ <th>Version</th><th>Release Date</th><th>Notes</th>
+ </tr>
+ <tr>
+ <td>8</td><td>November 2010</td><td>Added the <b>DIVIDE</b>,
+ <b>RECIP</b> and <b>CARRAY</b> field types, made the forward slash
+ on reserved words mandatory, and prohibited using the single
+ character data type aliases in the specification of <b>RAW</b>
+ fields. It also introduced the optional second (<i>arm</i>) token
+ to the <b>/ENDIAN</b> directive.
+ </td>
+ </tr>
+ <tr>
+ <td>7</td><td>October 2009</td><td>Added the <b>POLYNOM</b> and
+ <b>SBIT</b> field types, and complex data types <b>COMPLEX64</b>
+ and <b>COMPLEX128</b>. It also introduced representation suffixes
+ to field codes, made the <span class="syntax">n_fields</span>
+ parameter to <b>LINCOM</b> optional, and introduced the
+ directive-less method of specifying metafields.
+ </td>
+ </tr>
+ <tr>
+ <td>6</td><td>October 2008</td><td> Added the <b>/ENCODING</b>,
+ <b>/META</b>, <b>/PROTECT</b>, and <b>REFERENCE</b> directives and
+ the <b>CONST</b> and <b>STRING</b> field types. It permitted
+ whitespace in tokens and introduced the character escape sequences.
+ It allowed <b>CONST</b> fields to be used as parameters in field
+ specification lines. It also removed <i>FILEFRAM</i> as an alias
+ for <i>INDEX</i>, and allowed <span class="syntax"><b>#</b></span>
+ and <span class="syntax"><b>\</b></span> in field codes.
+ </td>
+ </tr>
+ <tr>
+ <td>5</td><td>August 2008</td><td>
+ Added <b>VERSION</b> and
+ <b>ENDIAN</b>, and removed the restriction on field name length. It
+ introduced the data types <b>INT8</b>, <b>INT64</b>, and
+ <b>UINT64</b>, the new-style type specifiers, and increased the
+ range of the <b>BIT</b> field type from 32 to 64 bits. It also
+ prohibited the characters
+ <span class="syntax"><b>#&/;<>\.|</b></span> in field
+ names.
+ </td>
+ </tr>
+ <tr>
+ <td>4</td><td>October 2006</td><td>
+ Added the <b>PHASE</b> field type.
+ </td>
+ </tr>
+ <tr>
+ <td>3</td><td>January 2006</td><td>
+ (The <i>Large Dirfile Extension</i>) Added <b>INCLUDE</b>, support
+ for sub-dirfiles, and increased the allowed length of a field name
+ from 16 to 50 characters.
+ </td>
+ </tr>
+ <tr>
+ <td>2</td><td>September 2005</td><td>
+ Added the <b>MULTIPLY</b> field type, and added support for
+ <b>LINCOM</b> fields with inputs of differing sample rates.
+ </td>
+ </tr>
+ <tr>
+ <td>1</td><td>November 2004</td><td>
+ Added <b>FRAMEOFFSET</b> and the optional fourth argument to the
+ <b>BIT</b> field type.
+ </td>
+ </tr>
+ <tr>
+ <td>0</td><td>before<br>March 2003</td><td>
+ This Refers to the dirfile standards supported by the GetData
+ library originally introduced into the
+ <a href="http://kst.kde.org/">kst</a> sources, which contained
+ support for all other features covered by this document.
+ </td>
+ </tr>
+ </table>
</div>
- <div class="foot"><div class="copy">© 2008, 2009, 2010
+ <div class="foot"><div class="copy">© 2008, 2009, 2010, 2011
D. V. Wiebe</div>
<div class="w3c">
<a href="http://validator.w3.org/check?uri=referer"><img
Added: trunk/html/download.html
===================================================================
--- trunk/html/download.html (rev 0)
+++ trunk/html/download.html 2011-03-26 01:45:47 UTC (rev 560)
@@ -0,0 +1,252 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<HTML>
+ <HEAD>
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+ <LINK REL="stylesheet" HREF="getdata.css" TYPE="text/css">
+ <TITLE>GetData</TITLE>
+ </HEAD>
+ <BODY>
+ <H1>The GetData Project</H1>
+ <div class="topbar">
+ <a href="index.html">home</a> |
+ download |
+ <a href="getdata.html">API documentation</a> |
+ <a href="dirfile.html">dirfile standards</a> |
+ <a href="http://lists.sourceforge.net/lists/listinfo/getdata-devel">mailing list</a> |
+ <a href="http://sourceforge.net/projects/getdata/">sourceforge</a>
+ </div>
+ <div class="menu">
+ <h2 class="menu">Get GetData</h2>
+ <ul>
+ <li><a href="index.html#source">Latest Release</a>
+ <li><a href="index.html#distros">Pre-Built Packages</a>
+ <li><a href="index.html#svn">Subversion</a>
+ <li><a href="index.html#previous">Previous Releases</a>
+ </ul>
+ <h2 class="menu"><a href="index.html">The GetData Project</a></h2>
+ <ul>
+ <li><a href="download.html#overview">Overview</a>
+ <li><a href="download.html#download">Get GetData</a>
+ <li><a href="download.html#documentation">Documentation</a>
+ <li><a href="download.html#warranty">Warranty and Redistribution</a>
+ <li><a href="download.html#contact">Contact</a>
+ </ul>
+ <h2 class="menu"><a href="bindings.html">GetData Bindings</a></h2>
+ <ul>
+ <li><a href="bindings.html#introduction">Introduction</a></li>
+ <li><a href="bindings.html#fortran">Fortran Bindings</a></li>
+ <li><a href="bindings.html#cxx">C++ Bindings</a></li>
+ <li><a href="bindings.html#python">Python Bindings</a></li>
+ <li><a href="bindings.html#idl">IDL Bindings</a></li>
+ </ul>
+ <h2 class="menu"><a href="getdata.html">Using GetData</a></h2>
+ <ul>
+ <li><a href="getdata.html#prelim">Preliminaries</a>
+ <li><a href="getdata.html#building">Building GetData</a>
+ <li><a href="getdata.html#header">The GetData Header</a>
+ <li><a href="getdata.html#bindings">Language Bindings</a>
+ <li><a href="getdata.html#dirfile">Working with Dirfiles</a>
+ <li><a href="getdata.html#rmeta">Reading Metadata</a>
+ <li><a href="getdata.html#count">Counting Fields</a>
+ <li><a href="getdata.html#list">Listing Fields</a>
+ <li><a href="getdata.html#mmeta">Modifying Metadata</a>
+ <li><a href="getdata.html#add">Adding or Deleting Fields</a>
+ <li><a href="getdata.html#alter">Modifying Field Metadata</a>
+ <li><a href="getdata.html#data">Reading and Writing Data</a>
+ <li><a href="getdata.html#callback">The Parser Callback Function</a>
+ <li><a href="getdata.html#unclean">Unclean Database Recovery</a>
+ </ul>
+ <h2 class="menu"><a href="dirfile.html">The Dirfile Standards</a></h2>
+ <ul>
+ <li><a href="dirfile.html#introduction">Introduction</a>
+ <li><a href="dirfile.html#example">Dirfile Example</a>
+ <li><a href="dirfile.html#format">The Format File</a>
+ <li><a href="dirfile.html#directives">Directives</a>
+ <li><a href="dirfile.html#fields">Field Specifications</a>
+ <li><a href="dirfile.html#versions">Standards Versions</a>
+ </ul>
+ <h2 class="menu"><a href="encoding.html">Dirfile Encodings</a></h2>
+ <ul>
+ <li><a href="encoding.html#introduction">Introduction</a>
+ <li><a href="encoding.html#framework">The Encoding Framework</a>
+ <li><a href="encoding.html#discovery">Automatic Encoding Detection</a>
+ <li><a href="encoding.html#schemes">Supported Encoding Schemes</a>
+ </ul>
+ <h2 class="menu"><a href="api.html">The API Transition</a></h2>
+ <ul>
+ <li><a href="api.html#introduction">Introduction</a>
+ <li><a href="api.html#newapi">The New API</a>
+ <li><a href="api.html#dirfile">The DIRFILE Object</a>
+ <li><a href="api.html#datatypes">Data Types</a>
+ <li><a href="api.html#lfs">Largefile Support</a>
+ <li><a href="api.html#comparison">API Comparison</a>
+ <li><a href="api.html#example">Translation Example</a>
+ </ul>
+ <h2 class="menu">
+ <a href="http://sourceforge.net/projects/getdata/">SourceForge
+ Project Page</a>
+ </h2>
+ <div class="sflogo">
+ <a href="http://sourceforge.net"><img src=
+ "http://sflogo.sourceforge.net/sflogo.php?group_id=229287&type=4"
+ width="125" height="37" alt="SourceForge.net Logo"></a>
+ </div>
+ </div>
+ <div class="main">
+ <h2><a name="source">Latest Release</a></h2>
+ <p>The complete source code for official releases of the GetData project
+ are available from SourceForge. The latest version of GetData, released
+ 25 March, 2011, is:
+ <ul>
+ <li><a
+ href="http://sourceforge.net/projects/getdata/files/getdata/0.7.2/"
+ >0.7.2</a>. Three packages are available:
+ <ul>
+ <li><em><a href="http://sourceforge.net/projects/getdata/files/getdata/0.7.2/getdata-0.7.2.tar.bz2/download">getdata-0.7.2.tar.bz2</a>/<a href="http://sourceforge.net/projects/getdata/files/getdata/0.7.2/getdata-0.7.2.tar.gz/download">.gz</a>:</em> the full source code to the library, with bindings. This
+ package uses the GNU autotools build system, and is designed for POSIX
+ systems (UNIX, Linux, BSD, MacOS X, Cygwin, MSys, &c.)
+ <li><em><a href="http://sourceforge.net/projects/getdata/files/getdata/0.7.2/getdata_win-0.7.2.zip/download">getdata_win-0.7.2.zip</a>:</em> a reduced
+ source code package, with the CMake build system designed to be built
+ on Microsoft Windows, either using the free MinGW compiler, or else
+ Microsoft's Visual C++ compiler. (The full source package above can
+ also be built using MinGW, if the MSys shell is used to run the build
+ system.) Currently, the only bindings provided by this package are
+ the C++ bindings, and the package lacks support for compressed
+ dirfiles, the Legacy API, and a few other features. This build is
+ used in native Microsoft Windows builds of <a
+ href="http://kst.kde.org/">kst2</a>.
+ <li><em><a href="http://sourceforge.net/projects/getdata/files/getdata/0.7.2/idl_getdata-0.7.2.tar.bz2/download">idl_getdata-0.7.2.tar.bz2</a>/<a href="http://sourceforge.net/projects/getdata/files/getdata/0.7.2/idl_getdata-0.7.2.tar.gz/download">.gz</a>:</em> the Interactive Data Language (IDL) bindings,
+ packaged separately with an autotools build system, designed to be
+ built against an already installed version of GetData. Due to
+ licensing restrictions, <a href="#distro">pre-built packages</a>
+ rarely come with these bindings, and this package allows end-users to
+ add support for IDL without having to recompile the whole GetData
+ package.
+ </ul>
+ </ul>
+ GetData may be
+ <a href="http://sourceforge.net/projects/getdata/files/"
+ >downloaded</a> from your local SourceForge mirror.
+ <p class="inset">GetData 0.7 supports Dirfile Standards Version Eight.
+ Highlights of Standards Version Eight include vector division and
+ reciprocal field types, and scalar arrays. This version is also the first
+ GetData version to be supported under MacOS X and Win32.
+ </p>
+ <h2><a name="distro">Pre-Built Packages</a></h2>
+ <p>GetData has been packaged for release on various Linux distributions,
+ including:
+ <dl>
+ <dt>Fedora & Red Hat Enterprise Linux:</dt>
+ <dd>GetData has been included in
+ <a href="http://fedoraproject.org/">Fedora</a> since Fedora 8 and EPEL
+ since version 4. These packages are maintained by
+ <a href="http://matt.truch.net/">Matthew Truch</a>.</dd>
+ <dt>OpenSUSE
+ <dd>GetData has been included in
+ <a href="http://opensuse.org/">openSUSE</a> since openSUSE 11.4.
+ These packages are maintained by Christian Trippe.
+ <dt>Ubuntu:</dt>
+ <dd>Builds of GetData are available for
+ <a href="http://www.ubuntu.com/">Ubuntu</a> on Launchpad. For
+ Ubuntu version 9.04 see the <a
+ href="https://launchpad.net/~stevebenton/+archive/kst2-jaunty"
+ >kst2-jaunty</a> PPA, and for later versions, the <a
+ href="https://launchpad.net/~stevebenton/+archive/kst2">kst2</a> PPA.
+ These packages are maintained by Steve Benton.
+ </dd>
+ </dl>
+ <h2><a name="svn">Subversion</a></h2>
+ <p>The GetData source code is housed in a Subversion repository. The
+ latest development snapshot may be retrieved from:
+ <div class="syntax">
+ http://getdata.svn.sourceforge.net/svnroot/getdata/trunk/getdata
+ </div>
+ using a Subversion client. If you have the <code>svn</code> program, the
+ following may work:
+ <div class="syntax">
+ svn co http://getdata.svn.sourceforge.net/svnroot/getdata/trunk/getdata
+ getdata
+ </div>
+ Unlike the official releases, the repository does not contain the compiled
+ <code>configure</code> script, only its autoconf input. To create the
+ configure script, and the rest of the build environment, execute:
+ <div class="syntax">
+ autoreconf -vifs
+ </div>
+ from the directory containing <code>configure.ac</code>. <a
+ href="http://www.gnu.org/software/autoconf/">Autoconf</a> 2.63,
+ or newer, <a href="http://www.gnu.org/software/automake/">automake</a>
+ 1.10, or newer, and <a
+ href="http://www.gnu.org/software/libtool/">libtool</a> 2.2.6b, or
+ better, are required. You should only have to do this when you check out
+ a new copy of the repository.
+
+ <p>Please note: unlike the official releases, the library obtained from
+ the subversion repository may contain untested code and may exhibit
+ undocumented behaviour. It may not compile; it may irrevocably corrupt
+ any dirfile it touches; it may cause global warming. Its ABI and API are
+ not guaranteed to conform to any previous, current, or future release of
+ the library. However, if the latest official release contains a very
+ annoying bug which has been fixed in the repository, it might be worth a
+ try.
+ <p>The Subversion repository may be <a
+ href="http://getdata.svn.sourceforge.net/viewvc/getdata/trunk/getdata/"
+ >browsed on the web</a>. SourceForge also has <a
+ href="http://sourceforge.net/scm/?type=svn&group_id=229287">generic
+ instructions on using Subversion</a>.
+ <h2><a name="previous">Previous Releases</a></h2>
+ <p>Older getdata releases available include the following:
+ <ul>
+ <li><a
+ href="http://sourceforge.net/projects/getdata/files/getdata/0.7.1/"
+ >0.7.1</a>—<a
+ href="http://sourceforge.net/projects/getdata/files/getdata/0.7.1/"
+ >Release Notes</a>
+ <li><a
+ href="http://sourceforge.net/projects/getdata/files/getdata/0.6.3/"
+ >0.6.3</a>—<a
+ href="http://sourceforge.net/projects/getdata/files/getdata/0.6.3/RELEASE_NOTES-0.6.3/view"
+ >Release Notes</a>
+ <li><a
+ href="http://sourceforge.net/projects/getdata/files/getdata/0.5.0/"
+ >0.5.0</a>—<a
+ href="http://sourceforge.net/project/shownotes.php?release_id=654262"
+ >Release Notes</a>
+ <li><a
+ href="http://sourceforge.net/projects/getdata/files/getdata/0.4.2/"
+ >0.4.2</a>—<a
+ href="http://sourceforge.net/project/shownotes.php?release_id=640554"
+ >Release Notes</a>
+ <li><a
+ href="http://sourceforge.net/projects/getdata/files/getdata/0.3.1/"
+ >0.3.1</a>—<a
+ href="http://sourceforge.net/project/shownotes.php?release_id=628542"
+ >Release Notes</a>
+ </ul>
+ <p class="inset">
+ GetData 0.3 only supports dirfiles up to and including Dirfile Standards
+ Version Five. GetData 0.4 and 0.5 support dirfiles only up to and
+ including Standards Version Six. GetData 0.6 supports dirfiles only up to
+ and including Standards Version Seven.
+ <p class="inset">GetData 0.4 added the ability to add fields, support for
+ the <a href="http://slimdata.sourceforge.net/">slim compression
+ scheme</a>. GetData 0.5 added support for gzip and bzip2 complession
+ schemes, and added functionality for the manipulation of metadata.
+ GetData 0.6 added Python and IDL bindings.
+ <p class="inset">GetData 0.5 and earlier are released under the terms of
+ the <a href="COPYING.GPL">GNU General Public License</a>. Later releases
+ are available under the <a href="#warranty">GNU Lesser General Public
+ License</a>.</p>
+ <div class="foot"><div class="copy">© 2008, 2009, 2010, 2011 D. V.
+ Wiebe</div>
+ <div class="w3c">
+ <a href="http://validator.w3.org/check?uri=referer"><img
+ src="valid_html.png" alt="Valid HTML 4.01 Strict" height="21"
+ width="60"></a><a href="http://jigsaw.w3.org/css-validator/"><img
+ src="valid_css.png" alt="Valid CSS" height="21" width="60"></a>
+ </div>
+ </div>
+ </div>
+ </BODY>
+</HTML>
Modified: trunk/html/encoding.html
===================================================================
--- trunk/html/encoding.html 2011-03-25 00:36:12 UTC (rev 559)
+++ trunk/html/encoding.html 2011-03-26 01:45:47 UTC (rev 560)
@@ -10,7 +10,7 @@
<H1>Dirfile Encodings</H1>
<div class="topbar">
<a href="index.html">home</a> |
- <a href="index.html#download">download</a> |
+ <a href="download.html">download</a> |
<a href="getdata.html">API documentation</a> |
<a href="dirfile.html">dirfile standards</a> |
<a href="http://lists.sourceforge.net/lists/listinfo/getdata-devel">mailing list</a> |
@@ -39,6 +39,13 @@
<li><a href="index.html#warranty">Warranty and Redistribution</a></li>
<li><a href="index.html#contact">Contact</a></li>
</ul>
+ <h2 class="menu"><a href="download.html">Get GetData</a></h2>
+ <ul>
+ <li><a href="download.html#source">Latest Release</a>
+ <li><a href="download.html#distros">Pre-Built Packages</a>
+ <li><a href="download.html#svn">Subversion</a>
+ <li><a href="download.html#previous">Previous Releases</a>
+ </ul>
<h2 class="menu"><a href="bindings.html">GetData Bindings</a></h2>
<ul>
<li><a href="bindings.html#introduction">Introduction</a></li>
@@ -195,6 +202,10 @@
with different, supported file extensions exist in the same directory and
could legitimately be associated with the raw field being considered,
the encoding scheme discovered by GetData is not well defined.
+ <p>Once the encoding had been determined for a <b>RAW</b> field, GetData
+ assumes that encoding for all other <b>RAW</b> fields defined in the same
+ fragment (<i>i.e.</i>, automatic encoding detection still enforces a
+ single encoding per fragment).
<h2><a name="schemes">Supported Encoding Schemes</a></h2>
<p>In addition to raw (<i>unencoded</i>) data, GetData 0.6 and newer
Modified: trunk/html/getdata.html
===================================================================
--- trunk/html/getdata.html 2011-03-25 00:36:12 UTC (rev 559)
+++ trunk/html/getdata.html 2011-03-26 01:45:47 UTC (rev 560)
@@ -10,7 +10,7 @@
<H1>Using GetData</H1>
<div class="topbar">
<a href="index.html">home</a> |
- <a href="index.html#download">download</a> |
+ <a href="download.html">download</a> |
API documentation |
<a href="dirfile.html">dirfile standards</a> |
<a href="http://lists.sourceforge.net/lists/listinfo/getdata-devel">mailing list</a> |
@@ -191,6 +191,13 @@
<li><a href="index.html#warranty">Warranty and Redistribution</a></li>
<li><a href="index.html#contact">Contact</a></li>
</ul>
+ <h2 class="menu"><a href="download.html">Get GetData</a></h2>
+ <ul>
+ <li><a href="download.html#source">Latest Release</a>
+ <li><a href="download.html#distros">Pre-Built Packages</a>
+ <li><a href="download.html#svn">Subversion</a>
+ <li><a href="download.html#previous">Previous Releases</a>
+ </ul>
<h2 class="menu"><a href="bindings.html">GetData Bindings</a></h2>
<ul>
<li><a href="bindings.html#introduction">Introduction</a></li>
@@ -1522,9 +1529,9 @@
type <span class="keyword">gd_type_t</span> represent data types, and will
be one of the symbols listed in <a href="#data">Table 8</a>. Members
for different field types may occupy the same phyical memory.
- <p>The field type stored in the <span class="syntax">field_type</span>
- member of the <span class="keyword">gd_entry_t</span> will be one of the
- following symbols:
+ <p><a name="entrytype"></a>The field type stored in the <span
+ class="syntax">field_type</span> member of the <span
+ class="keyword">gd_entry_t</span> will be one of the following symbols:
<p class="inset">
<span class="literal">GD_NO_ENTRY</span> (indicating an invalid field
type), <span class="literal">GD_RAW_ENTRY</span>,
Modified: trunk/html/index.html
===================================================================
--- trunk/html/index.html 2011-03-25 00:36:12 UTC (rev 559)
+++ trunk/html/index.html 2011-03-26 01:45:47 UTC (rev 560)
@@ -10,7 +10,7 @@
<H1>The GetData Project</H1>
<div class="topbar">
home |
- <a href="index.html#download">download</a> |
+ <a href="download.html">download</a> |
<a href="getdata.html">API documentation</a> |
<a href="dirfile.html">dirfile standards</a> |
<a href="http://lists.sourceforge.net/lists/listinfo/getdata-devel">mailing list</a> |
@@ -21,16 +21,17 @@
<ul>
<li><a href="index.html#overview">Overview</a>
<li><a href="index.html#download">Get GetData</a>
- <ul class="submenu">
- <li><a href="index.html#source">Latest Release</a>
- <li><a href="index.html#distros">Pre-Built Linux Packages</a>
- <li><a href="index.html#svn">Subversion</a>
- <li><a href="index.html#previous">Previous Releases</a>
- </ul>
<li><a href="index.html#documentation">Documentation</a>
<li><a href="index.html#warranty">Warranty and Redistribution</a>
<li><a href="index.html#contact">Contact</a>
</ul>
+ <h2 class="menu"><a href="download.html">Get GetData</a></h2>
+ <ul>
+ <li><a href="download.html#source">Latest Release</a>
+ <li><a href="download.html#distros">Pre-Built Packages</a>
+ <li><a href="download.html#svn">Subversion</a>
+ <li><a href="download.html#previous">Previous Releases</a>
+ </ul>
<h2 class="menu"><a href="bindings.html">GetData Bindings</a></h2>
<ul>
<li><a href="bindings.html#introduction">Introduction</a></li>
@@ -61,17 +62,8 @@
<li><a href="dirfile.html#introduction">Introduction</a>
<li><a href="dirfile.html#example">Dirfile Example</a>
<li><a href="dirfile.html#format">The Format File</a>
- <ul class="submenu">
- <li><a href="dirfile.html#tokens">Tokens</a>
- </ul>
<li><a href="dirfile.html#directives">Directives</a>
<li><a href="dirfile.html#fields">Field Specifications</a>
- <ul class="submenu">
- <li><a href="dirfile.html#fieldname">Field Names</a>
- <li><a href="dirfile.html#fieldtype">Field Types</a>
- <li><a href="dirfile.html#fieldparam">Field Parameters</a>
- <li><a href="dirfile.html#fieldcode">Field Codes</a>
- </ul>
<li><a href="dirfile.html#versions">Standards Versions</a>
</ul>
<h2 class="menu"><a href="encoding.html">Dirfile Encodings</a></h2>
@@ -80,12 +72,6 @@
<li><a href="encoding.html#framework">The Encoding Framework</a>
<li><a href="encoding.html#discovery">Automatic Encoding Detection</a>
<li><a href="encoding.html#schemes">Supported Encoding Schemes</a>
- <ul class="submenu">
- <li><a href="encoding.html#text">Text Encoding</a>
- <li><a href="encoding.html#bzip2">Bzip2 Encoding</a>
- <li><a href="encoding.html#gzip">Gzip Encoding</a>
- <li><a href="encoding.html#slim">Slim Encoding</a>
- </ul>
</ul>
<h2 class="menu"><a href="api.html">The API Transition</a></h2>
<ul>
@@ -146,126 +132,13 @@
~10<sup>8</sup> samples each.
<h2><a name="download">Get GetData</a></h2>
- <h3><a name="source">Latest Release</a></h3>
<p>The complete source code for official releases of the GetData project
are available from SourceForge. The latest version of GetData, released
- 6 December, 2010, is:
- <ul>
- <li><a
- href="http://sourceforge.net/projects/getdata/files/getdata/0.7.1/"
- >0.7.1</a>—<a
- href="http://sourceforge.net/projects/getdata/files/getdata/0.7.1/RELEASE_NOTES-0.7.1/view"
- >Release Notes</a>
- </ul>
- It may be
- <a href="http://sourceforge.net/projects/getdata/files/"
- >downloaded</a> from your local SourceForge mirror.
- <p class="inset">GetData 0.7 supports Dirfile Standards Version Eight.
- Highlights of Standards Version Eight include vector division and
- reciprocal field types, and scalar arrays. This version is also the first
- GetData version to be supported under MacOS X and Win32.
- </p>
- <h3><a name="distro">Pre-Built Linux Packages</a></h3>
- <p>GetData has been packaged for release on various Linux distributions,
- including:
- <dl>
- <dt>Fedora & Red Hat Enterprise Linux:</dt>
- <dd>GetData has been included in
- <a href="http://fedoraproject.org/">Fedora</a> since Fedora 8 and EPEL
- since version 4. These packages are maintained by
- <a href="http://matt.truch.net/">Matthew Truch</a>.</dd>
- <dt>Ubuntu:</dt>
- <dd>Builds of GetData are available for
- <a href="http://www.ubuntu.com/">Ubuntu</a> on Launchpad. For
- Ubuntu version 9.04 see the <a
- href="https://launchpad.net/~stevebenton/+archive/kst2-jaunty"
- >kst2-jaunty</a> PPA, and for later versions, the <a
- href="https://launchpad.net/~stevebenton/+archive/kst2">kst2</a> PPA.
- These packages are maintained by Steve Benton.
- </dd>
- </dl>
- <h3><a name="svn">Subversion</a></h3>
- <p>The GetData source code is housed in a Subversion repository. The
- latest development snapshot may be retrieved from:
- <div class="syntax">
- http://getdata.svn.sourceforge.net/svnroot/getdata/trunk/getdata
- </div>
- using a Subversion client. If you have the <code>svn</code> program, the
- following may work:
- <div class="syntax">
- svn co http://getdata.svn.sourceforge.net/svnroot/getdata/trunk/getdata
- getdata
- </div>
- Unlike the official releases, the repository does not contain the compiled
- <code>configure</code> script, only its autoconf input. To create the
- configure script, and the rest of the build environment, execute:
- <div class="syntax">
- autoreconf -vifs
- </div>
- from the directory containing <code>configure.ac</code>. <a
- href="http://www.gnu.org/software/autoconf/">Autoconf</a> 2.63,
- or newer, <a href="http://www.gnu.org/software/automake/">automake</a>
- 1.10, or newer, and <a
- href="http://www.gnu.org/software/libtool/">libtool</a> 2.2.6b, or
- better, are required. You should only have to do this when you check out
- a new copy of the repository.
-
- <p>Please note: unlike the official releases, the library obtained from
- the subversion repository may contain untested code and may exhibit
- undocumented behaviour. It may not compile; it may irrevocably corrupt
- any dirfile it touches; it may cause global warming. Its ABI and API are
- not guaranteed to conform to any previous, current, or future release of
- the library. However, if the latest official release contains a very
- annoying bug which has been fixed in the repository, it might be worth a
- try.
- <p>The Subversion repository may be <a
- href="http://getdata.svn.sourceforge.net/viewvc/getdata/trunk/getdata/"
- >browsed on the web</a>. SourceForge also has <a
- href="http://sourceforge.net/scm/?type=svn&group_id=229287">generic
- instructions on using Subversion</a>.
- <h3><a name="previous">Previous Releases</a></h3>
- <p>Older getdata releases available include the following:
- <ul>
- <li><a
- href="http://sourceforge.net/projects/getdata/files/getdata/0.7.0/"
- >0.7.0</a>—<a
- href="http://sourceforge.net/projects/getdata/files/getdata/0.7.0/RELEASE_NOTES-0.7.0/view"
- >Release Notes</a>
- <li><a
- href="http://sourceforge.net/projects/getdata/files/getdata/0.6.3/"
- >0.6.3</a>—<a
- href="http://sourceforge.net/projects/getdata/files/getdata/0.6.3/RELEASE_NOTES-0.6.3/view"
- >Release Notes</a>
- <li><a
- href="http://sourceforge.net/projects/getdata/files/getdata/0.5.0/"
- >0.5.0</a>—<a
- href="http://sourceforge.net/project/shownotes.php?release_id=654262"
- >Release Notes</a>
- <li><a
- href="http://sourceforge.net/projects/getdata/files/getdata/0.4.2/"
- >0.4.2</a>—<a
- href="http://sourceforge.net/project/shownotes.php?release_id=640554"
- >Release Notes</a>
- <li><a
- href="http://sourceforge.net/projects/getdata/files/getdata/0.3.1/"
- >0.3.1</a>—<a
- href="http://sourceforge.net/project/shownotes.php?release_id=628542"
- >Release Notes</a>
- </ul>
- <p class="inset">
- GetData 0.3 only supports dirfiles up to and including Dirfile Standards
- Version Five. GetData 0.4 and 0.5 support dirfiles only up to and
- including Standards Version Six. GetData 0.6 supports dirfiles only up to
- and including Standards Version Seven.
- <p class="inset">GetData 0.4 added the ability to add fields, support for
- the <a href="http://slimdata.sourceforge.net/">slim compression
- scheme</a>. GetData 0.5 added support for gzip and bzip2 complession
- schemes, and added functionality for the manipulation of metadata.
- GetData 0.6 added Python and IDL bindings.
- <p class="inset">GetData 0.5 and earlier are released under the terms of
- the <a href="COPYING.GPL">GNU General Public License</a>. Later releases
- are available under the <a href="#warranty">GNU Lesser General Public
- License</a>.</p>
+ 25 March, 2011, is <a
+ href="http://sourceforge.net/projects/getdata/files/getdata/0.7.2/"
+ >0.7.2</a>; see:
+ <ul><li><a href="download.html">Get GetData</a></ul>
+
<h2><a name="documentation">Documentation</a></h2>
<p>The new API is fully documented in Unix man pages provided with the
distribution. Further documentation is available below:</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-25 00:36:18
|
Revision: 559
http://getdata.svn.sourceforge.net/getdata/?rev=559&view=rev
Author: ketiltrout
Date: 2011-03-25 00:36:12 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
Tag getdata-0.7.2
Added Paths:
-----------
tags/getdata-0.7.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-25 00:05:06
|
Revision: 558
http://getdata.svn.sourceforge.net/getdata/?rev=558&view=rev
Author: ketiltrout
Date: 2011-03-25 00:04:59 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
GetData 0.7.2.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/Makefile.am
branches/getdata-0.7/NEWS
branches/getdata-0.7/RELEASE_NOTES.in
branches/getdata-0.7/configure.ac
branches/getdata-0.7/m4/version.m4
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-24 19:53:14 UTC (rev 557)
+++ branches/getdata-0.7/ChangeLog 2011-03-25 00:04:59 UTC (rev 558)
@@ -1,4 +1,7 @@
-2011-03-24 D. V. Wiebe <ge...@ke...> svn:552
+2011-03-24 D. V. Wiebe <ge...@ke...> svn:558
+ GetData-0.7.2 released.
+
+2011-03-24 D. V. Wiebe <ge...@ke...> svn:555
* test/move_data_enc_ar.c test/entry_phase.c test/get_ss.c
test/alter_raw_type.c: Actually fail on error.
Modified: branches/getdata-0.7/Makefile.am
===================================================================
--- branches/getdata-0.7/Makefile.am 2011-03-24 19:53:14 UTC (rev 557)
+++ branches/getdata-0.7/Makefile.am 2011-03-25 00:04:59 UTC (rev 558)
@@ -38,8 +38,6 @@
--with-python-module-dir="$$dc_install_base/python"
# idl-only package
-idl_$(distdir).tar.bz2 idl_$(distdir).tar.gz: idldist
-
idldist: $(DISTFILES)
rm -rf svn_export
svn export . svn_export
@@ -72,8 +70,6 @@
rm -rf idl_$(distdir)
# windows source package
-getdata_win-$(PACKAGE_VERSION).zip: windist
-
windist: $(DISTFILES)
rm -rf crlf_export
cd man && $(MAKE) htmlman
Modified: branches/getdata-0.7/NEWS
===================================================================
--- branches/getdata-0.7/NEWS 2011-03-24 19:53:14 UTC (rev 557)
+++ branches/getdata-0.7/NEWS 2011-03-25 00:04:59 UTC (rev 558)
@@ -5,8 +5,6 @@
* If built with modules, the plugin shared objects will now be installed in
a separate directory (by default "${libdir}/getdata", but see the
--with-module-dir option in ./configure).
- * If called with GD_CREAT but no encoding specified, gd_include() now will
- duplicate the encoding of the parent fragment (if any).
* BUG FIX: When using modules, a missing plugin no longer results in a lock up
the second time an attempt is made to find it.
* BUG FIX: GetData now properly processes /INCLUDE directives with absolute
@@ -14,6 +12,11 @@
* BUG FIX: gd_add()ing the first raw field in a dirfile to a subfragment no
longer results in memory corruption when calling gd_close().
+ API Changes
+
+ * If called with GD_CREAT but no encoding specified, gd_include() now will
+ duplicate the encoding of the parent fragment (if any).
+
Miscellaneous
* The python module install dir can now be changed by passing
Modified: branches/getdata-0.7/RELEASE_NOTES.in
===================================================================
--- branches/getdata-0.7/RELEASE_NOTES.in 2011-03-24 19:53:14 UTC (rev 557)
+++ branches/getdata-0.7/RELEASE_NOTES.in 2011-03-25 00:04:59 UTC (rev 558)
@@ -1,18 +1,40 @@
-GetData 0.7.1 is known to compile and pass the test suite on the following systems (including C++ and Fortran bindings):
+GetData 0.7.2 is known to compile and pass the test suite on the following
+systems (including C++ and Fortran bindings):
Linux:
-* x86 and x86_64, using gcc 4.5 or icc 10.1, under Slackware, Fedora, Ubuntu, CentOS
-* armv5tej, using gcc 3.3 under Debian
+* x86, x86_64, PPC, S390, SPARC, ARM under (variously) Debian, Slackware,
+ Fedora, Ubuntu, CentOS
MacOS X:
* x86 and x86_64, using Xcode 3.2/gcc 4.2, under MacOS X Snow Leopard
Cygwin:
* x86_64, using gcc 4.3
Win32:
* x86_64, using mingw/gcc 4.5, under MSys
+* X86_64, using MSVC 10
-The Python bindings have been tested with Python 2.4 and Python 2.6.
+The Python bindings have been tested with Python 2.4 through Python 2.7.
-The IDL bindings have been tested with IDL 6.0, IDL 7.1 and IDL 8.0.
+The IDL bindings have been tested with IDL 6.0, IDL 7.1.
---------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+Three packages are available:
+* getdata-0.7.2.tar.bz2/.gz: the full source code to the library, with
+ bindings. This package uses the GNU autotools build system, and is
+ designed for POSIX systems (UNIX, Linux, BSD, MacOS X, Cygwin, MSys, &c.)
+* getdata_win-0.7.2.zip: a reduced source code package, with the CMake build
+ system designed to be built on Microsoft Windows, either using the free
+ MinGW compiler, or else Microsoft's Visual C++ compiler. (The full
+ source package above can also be built using MinGW, if the MSys shell is
+ used to run the build system.) Currently, the only bindings provided by
+ this package are the C++ bindings, and the package lacks support for
+ compressed dirfiles, the Legacy API, and a few other features. This
+ build is used in native Microsoft Windows builds of kst2.
+* idl_getdata-0.7.2.tar.bz2/.gz: the Interactive Data Language (IDL) bindings,
+ packaged separately with an autotools build system, designed to be built
+ against an already installed version of GetData. Due to licensing
+ restrictions, pre-built packages rarely come with these bindings, and
+ this package allows end-users to add support for IDL without having to
+ recompile the whole GetData package.
+
+-------------------------------------------------------------------------------
Modified: branches/getdata-0.7/configure.ac
===================================================================
--- branches/getdata-0.7/configure.ac 2011-03-24 19:53:14 UTC (rev 557)
+++ branches/getdata-0.7/configure.ac 2011-03-25 00:04:59 UTC (rev 558)
@@ -354,30 +354,7 @@
BUILDCC=$CC
AC_SUBST([BUILDCC])
fi
-echo
-echo "*** Checking C++ compiler characteristics"
-echo
-AC_PROG_CXX
-AC_PROG_CXX_C_O
-echo
-echo "*** Checking Fortran 77 compiler characteristics"
-echo
-AC_PROG_F77
-AC_PROG_F77_C_O
-echo
-echo "*** Checking Fortran 90 compiler characteristics"
-echo
-AC_PROG_FC
-AC_PROG_FC_C_O
-dnl does $FC accept fortran code with .f90 extension?
-AC_MSG_CHECKING([whether the Fortran 90 compiler works])
-AC_LANG_PUSH([Fortran])
-ac_ext="f90"
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-[AC_MSG_RESULT([yes])],
-[AC_MSG_RESULT([no]); FC=;])
-AC_LANG_POP
echo
echo "*** Building libtool"
echo
Modified: branches/getdata-0.7/m4/version.m4
===================================================================
--- branches/getdata-0.7/m4/version.m4 2011-03-24 19:53:14 UTC (rev 557)
+++ branches/getdata-0.7/m4/version.m4 2011-03-25 00:04:59 UTC (rev 558)
@@ -21,7 +21,7 @@
m4_define(getdata_major, 0)
m4_define(getdata_minor, 7)
m4_define(getdata_revision, 2)
-m4_define(getdata_extra, [rc3])
+m4_define(getdata_extra, [])
m4_define(getdata_version,
getdata_major.getdata_minor.getdata_revision[]getdata_extra)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-24 19:53:20
|
Revision: 557
http://getdata.svn.sourceforge.net/getdata/?rev=557&view=rev
Author: syntheticpp
Date: 2011-03-24 19:53:14 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
fix typo
Modified Paths:
--------------
branches/getdata-0.7/INSTALL
Modified: branches/getdata-0.7/INSTALL
===================================================================
--- branches/getdata-0.7/INSTALL 2011-03-24 19:47:42 UTC (rev 556)
+++ branches/getdata-0.7/INSTALL 2011-03-24 19:53:14 UTC (rev 557)
@@ -43,7 +43,7 @@
of `autoconf'.
To create the configure script, and the rest of the build environment
-which are not part of a plain checkout from sourcefore, execute:
+which are not part of a plain checkout from sourceforge, execute:
autoreconf -vifs
The simplest way to compile this package is:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-24 19:47:48
|
Revision: 556
http://getdata.svn.sourceforge.net/getdata/?rev=556&view=rev
Author: syntheticpp
Date: 2011-03-24 19:47:42 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
add hint how to call autoconf
Modified Paths:
--------------
branches/getdata-0.7/INSTALL
Modified: branches/getdata-0.7/INSTALL
===================================================================
--- branches/getdata-0.7/INSTALL 2011-03-24 02:23:52 UTC (rev 555)
+++ branches/getdata-0.7/INSTALL 2011-03-24 19:47:42 UTC (rev 556)
@@ -40,8 +40,12 @@
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+of `autoconf'.
+To create the configure script, and the rest of the build environment
+which are not part of a plain checkout from sourcefore, execute:
+ autoreconf -vifs
+
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-24 02:23:59
|
Revision: 555
http://getdata.svn.sourceforge.net/getdata/?rev=555&view=rev
Author: ketiltrout
Date: 2011-03-24 02:23:52 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Minor testsuite fixes.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/test/add_raw_include.c
branches/getdata-0.7/test/alter_raw_type.c
branches/getdata-0.7/test/entry_phase.c
branches/getdata-0.7/test/get_ss.c
branches/getdata-0.7/test/move_data_enc_ar.c
branches/getdata-0.7/test/test.h
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-23 20:01:42 UTC (rev 554)
+++ branches/getdata-0.7/ChangeLog 2011-03-24 02:23:52 UTC (rev 555)
@@ -1,3 +1,8 @@
+2011-03-24 D. V. Wiebe <ge...@ke...> svn:552
+
+ * test/move_data_enc_ar.c test/entry_phase.c test/get_ss.c
+ test/alter_raw_type.c: Actually fail on error.
+
2011-03-23 D. V. Wiebe <ge...@ke...> svn:551
GetData-0.7.2rc3:
Modified: branches/getdata-0.7/test/add_raw_include.c
===================================================================
--- branches/getdata-0.7/test/add_raw_include.c 2011-03-23 20:01:42 UTC (rev 554)
+++ branches/getdata-0.7/test/add_raw_include.c 2011-03-24 02:23:52 UTC (rev 555)
@@ -21,7 +21,7 @@
DIRFILE* D = gd_open(filedir, GD_RDWR | GD_CREAT | GD_UNENCODED | GD_VERBOSE);
int frag = gd_include(D, "format1", 0, GD_CREAT);
- gd_add_raw(D, "data", GD_UINT8, 2, 1);
+ gd_add_raw(D, "data", GD_UINT8, 2, frag);
error = gd_error(D);
/* check */
Modified: branches/getdata-0.7/test/alter_raw_type.c
===================================================================
--- branches/getdata-0.7/test/alter_raw_type.c 2011-03-23 20:01:42 UTC (rev 554)
+++ branches/getdata-0.7/test/alter_raw_type.c 2011-03-24 02:23:52 UTC (rev 555)
@@ -64,5 +64,5 @@
CHECKI(n, 32);
CHECKI(ret, 0);
- return 0;
+ return r;
}
Modified: branches/getdata-0.7/test/entry_phase.c
===================================================================
--- branches/getdata-0.7/test/entry_phase.c 2011-03-23 20:01:42 UTC (rev 554)
+++ branches/getdata-0.7/test/entry_phase.c 2011-03-24 02:23:52 UTC (rev 555)
@@ -40,5 +40,5 @@
CHECKI(E.EN(phase,shift), 3);
gd_free_entry_strings(&E);
- return 0;
+ return r;
}
Modified: branches/getdata-0.7/test/get_ss.c
===================================================================
--- branches/getdata-0.7/test/get_ss.c 2011-03-23 20:01:42 UTC (rev 554)
+++ branches/getdata-0.7/test/get_ss.c 2011-03-24 02:23:52 UTC (rev 555)
@@ -48,5 +48,5 @@
for (i = 0; i < 8; ++i)
CHECKUi(i,c[i], 40 + i);
- return 0;
+ return r;
}
Modified: branches/getdata-0.7/test/move_data_enc_ar.c
===================================================================
--- branches/getdata-0.7/test/move_data_enc_ar.c 2011-03-23 20:01:42 UTC (rev 554)
+++ branches/getdata-0.7/test/move_data_enc_ar.c 2011-03-24 02:23:52 UTC (rev 555)
@@ -76,5 +76,5 @@
CHECKI(unlink_txtdata, -1);
gd_free_entry_strings(&E);
- return 0;
+ return r;
}
Modified: branches/getdata-0.7/test/test.h
===================================================================
--- branches/getdata-0.7/test/test.h 2011-03-23 20:01:42 UTC (rev 554)
+++ branches/getdata-0.7/test/test.h 2011-03-24 02:23:52 UTC (rev 555)
@@ -60,7 +60,7 @@
#define CHECKi(i,e,n,nf,vf,...) \
if (e) { r = 1; \
- fprintf(stderr, #i ":%i " #n " = " nf " (expected " vf ")\n", (int)i, \
+ fprintf(stderr, #i ":%i " #n " = " nf " (expected " vf ")\n", (int)(i), \
__VA_ARGS__); }
#ifdef GD_NO_C99_API
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-23 20:01:48
|
Revision: 554
http://getdata.svn.sourceforge.net/getdata/?rev=554&view=rev
Author: syntheticpp
Date: 2011-03-23 20:01:42 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
also define the path with slashes, maybe it is needed in some tests
Modified Paths:
--------------
branches/getdata-0.7/cmake/test/CMakeLists.txt
Modified: branches/getdata-0.7/cmake/test/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/test/CMakeLists.txt 2011-03-23 20:00:48 UTC (rev 553)
+++ branches/getdata-0.7/cmake/test/CMakeLists.txt 2011-03-23 20:01:42 UTC (rev 554)
@@ -46,13 +46,14 @@
list(REMOVE_ITEM gd_sources ${GD_DIR}/test/${_item}.c)
endforeach()
-#set(gd_sources ${GD_DIR}/test/close.c ${GD_DIR}/test/alter_multiply.c)
-
set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}/\"")
+set(__TEST_SLASH__ "-D__TEST_SLASH__=\"${CMAKE_BINARY_DIR}/\"")
STRING(REGEX REPLACE "/" "\\\\\\\\" __TEST__ ${__TEST__})
-add_definitions(${__TEST__})
+add_definitions(${__TEST__} ${__TEST_SLASH__})
+#set(gd_sources ${GD_DIR}/test/parse_include_relabs.c)
+
foreach(_test ${gd_sources})
get_filename_component(testname ${_test} NAME_WE)
set(testname test_${testname})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-23 20:00:54
|
Revision: 553
http://getdata.svn.sourceforge.net/getdata/?rev=553&view=rev
Author: syntheticpp
Date: 2011-03-23 20:00:48 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
Modified Paths:
--------------
branches/getdata-0.7/test/move_subdir.c
branches/getdata-0.7/test/parse_include_relabs.c
branches/getdata-0.7/test/parse_include_relrel.c
branches/getdata-0.7/test/test.h
Modified: branches/getdata-0.7/test/move_subdir.c
===================================================================
--- branches/getdata-0.7/test/move_subdir.c 2011-03-23 18:34:42 UTC (rev 552)
+++ branches/getdata-0.7/test/move_subdir.c 2011-03-23 20:00:48 UTC (rev 553)
@@ -24,12 +24,7 @@
DIRFILE *D;
mkdir(filedir, 0777);
- // when using msvc the macro mkdir removes dirfile
-#ifdef mkdir
-#undef mkdir
-#define mkdir(x,y) mkdir(x)
-#endif
- mkdir(subdir, 0777);
+ mkdirsub(subdir, 0777);
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
write(fd, format_data, strlen(format_data));
Modified: branches/getdata-0.7/test/parse_include_relabs.c
===================================================================
--- branches/getdata-0.7/test/parse_include_relabs.c 2011-03-23 18:34:42 UTC (rev 552)
+++ branches/getdata-0.7/test/parse_include_relabs.c 2011-03-23 20:00:48 UTC (rev 553)
@@ -31,7 +31,7 @@
gd_spf_t spf;
mkdir(filedir, 0777);
- mkdir(subdir, 0777);
+ mkdirsub(subdir, 0777);
do {
ptr = (char*)realloc(cwd, cwd_size *= 2);
Modified: branches/getdata-0.7/test/parse_include_relrel.c
===================================================================
--- branches/getdata-0.7/test/parse_include_relrel.c 2011-03-23 18:34:42 UTC (rev 552)
+++ branches/getdata-0.7/test/parse_include_relrel.c 2011-03-23 20:00:48 UTC (rev 553)
@@ -24,7 +24,7 @@
gd_spf_t spf;
mkdir(filedir, 0777);
- mkdir(subdir, 0777);
+ mkdirsub(subdir, 0777);
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
write(fd, format_data, strlen(format_data));
Modified: branches/getdata-0.7/test/test.h
===================================================================
--- branches/getdata-0.7/test/test.h 2011-03-23 18:34:42 UTC (rev 552)
+++ branches/getdata-0.7/test/test.h 2011-03-23 20:00:48 UTC (rev 553)
@@ -35,6 +35,10 @@
#define mkdir(x,y) \
system("rmdir /q/s "__TEST__"dirfile"); \
_mkdir(x)
+// when using msvc the macro mkdir removes dirfile
+#define mkdirsub(x,y) _mkdir(x)
+#else
+#define mkdirsub(x,y) mkdir(x,y)
#endif
/* path munging for WIN32/64 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-23 18:34:49
|
Revision: 552
http://getdata.svn.sourceforge.net/getdata/?rev=552&view=rev
Author: syntheticpp
Date: 2011-03-23 18:34:42 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
fix typo
Modified Paths:
--------------
branches/getdata-0.7/cmake/CMakeLists.txt
Modified: branches/getdata-0.7/cmake/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-23 11:58:21 UTC (rev 551)
+++ branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-23 18:34:42 UTC (rev 552)
@@ -37,9 +37,9 @@
set(DEFINE_GD_LEGACY_API "/* #undef GD_LEGACY_API */")
# MSVCRT integer types
-set(DEFINE_gd_int16_t "#define gd_int16_t short int")
-set(DEFINE_gd_uint16_t "#define gd_int16_t unsigned short int")
-set(DEFINE_gd_int64_t "#define gd_int64_t __int64")
+set(DEFINE_gd_int16_t "#define gd_int16_t short int")
+set(DEFINE_gd_uint16_t "#define gd_uint16_t unsigned short int")
+set(DEFINE_gd_int64_t "#define gd_int64_t __int64")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-23 11:58:28
|
Revision: 551
http://getdata.svn.sourceforge.net/getdata/?rev=551&view=rev
Author: ketiltrout
Date: 2011-03-23 11:58:21 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
GetData 0.7.2rc3.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/NEWS
branches/getdata-0.7/configure.ac
branches/getdata-0.7/m4/version.m4
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-23 11:44:27 UTC (rev 550)
+++ branches/getdata-0.7/ChangeLog 2011-03-23 11:58:21 UTC (rev 551)
@@ -1,3 +1,8 @@
+2011-03-23 D. V. Wiebe <ge...@ke...> svn:551
+ GetData-0.7.2rc3:
+
+ * m4/version.m4 configure.ac: Fix library soversion defines.
+
2011-03-23 D. V. Wiebe <ge...@ke...> svn:550
* test/test.h: Write paths properly under WIN32/WIN64.
Modified: branches/getdata-0.7/NEWS
===================================================================
--- branches/getdata-0.7/NEWS 2011-03-23 11:44:27 UTC (rev 550)
+++ branches/getdata-0.7/NEWS 2011-03-23 11:58:21 UTC (rev 551)
@@ -1,4 +1,4 @@
-New in version 0.7.2rc2:
+New in version 0.7.2rc3:
Library Changes
Modified: branches/getdata-0.7/configure.ac
===================================================================
--- branches/getdata-0.7/configure.ac 2011-03-23 11:44:27 UTC (rev 550)
+++ branches/getdata-0.7/configure.ac 2011-03-23 11:58:21 UTC (rev 551)
@@ -39,8 +39,8 @@
dnl export version information from m4/version.m4
AC_SUBST(GETDATA_IFACE_VERSION, [getdata_iface_version])
-AC_SUBST(GETDATA_IMPL_REVISION, [getdata_iface_revision])
-AC_SUBST(GETDATA_IFACE_AGE, [getdata_iface_revision])
+AC_SUBST(GETDATA_IMPL_REVISION, [getdata_impl_revision])
+AC_SUBST(GETDATA_IFACE_AGE, [getdata_iface_age])
AC_SUBST(GETDATAXX_VERSION, [getdataxx_version])
AC_SUBST(FGETDATA_VERSION, [fgetdata_version])
AC_SUBST(F95GETDATA_VERSION, [f95getdata_version])
Modified: branches/getdata-0.7/m4/version.m4
===================================================================
--- branches/getdata-0.7/m4/version.m4 2011-03-23 11:44:27 UTC (rev 550)
+++ branches/getdata-0.7/m4/version.m4 2011-03-23 11:58:21 UTC (rev 551)
@@ -21,16 +21,16 @@
m4_define(getdata_major, 0)
m4_define(getdata_minor, 7)
m4_define(getdata_revision, 2)
-m4_define(getdata_extra, [rc2])
+m4_define(getdata_extra, [rc3])
m4_define(getdata_version,
getdata_major.getdata_minor.getdata_revision[]getdata_extra)
dnl libgetdata current interface version
m4_define(getdata_iface_version, 4)
dnl libgetdata current interface implementation revision
-m4_define(getdata_iface_revision, 2)
+m4_define(getdata_impl_revision, 2)
dnl libgetdata interface age (current interface - oldest supported interface)
-m4_define(getdata_iface_revision, 0)
+m4_define(getdata_iface_age, 0)
dnl libgetdata++ interface version info
m4_define(getdataxx_version, 2:0:0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-23 11:44:34
|
Revision: 550
http://getdata.svn.sourceforge.net/getdata/?rev=550&view=rev
Author: ketiltrout
Date: 2011-03-23 11:44:27 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
Write paths properly under WIN32/WIN64.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/src/include.c
branches/getdata-0.7/test/parse_include_absolute.c
branches/getdata-0.7/test/parse_include_absrel.c
branches/getdata-0.7/test/parse_include_relabs.c
branches/getdata-0.7/test/test.h
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-23 02:59:01 UTC (rev 549)
+++ branches/getdata-0.7/ChangeLog 2011-03-23 11:44:27 UTC (rev 550)
@@ -1,3 +1,6 @@
+2011-03-23 D. V. Wiebe <ge...@ke...> svn:550
+ * test/test.h: Write paths properly under WIN32/WIN64.
+
2011-03-23 D. V. Wiebe <ge...@ke...> svn:549
* m4/python.m4: Use the BSD `jot' if the Linux/Plan 9 `seq' is not found.
Also, look for python2.7.
Modified: branches/getdata-0.7/src/include.c
===================================================================
--- branches/getdata-0.7/src/include.c 2011-03-23 02:59:01 UTC (rev 549)
+++ branches/getdata-0.7/src/include.c 2011-03-23 11:44:27 UTC (rev 550)
@@ -164,7 +164,6 @@
dreturn("%i", -1);
return -1;
}
- dwatch("%s", D->fragment[D->n_fragment - 1].sname);
*ref_name = _GD_ParseFragment(new_fp, D, D->n_fragment - 1, standards, flags);
Modified: branches/getdata-0.7/test/parse_include_absolute.c
===================================================================
--- branches/getdata-0.7/test/parse_include_absolute.c 2011-03-23 02:59:01 UTC (rev 549)
+++ branches/getdata-0.7/test/parse_include_absolute.c 2011-03-23 11:44:27 UTC (rev 550)
@@ -39,7 +39,7 @@
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
write(fd, format_data1, strlen(format_data1));
- write(fd, cwd, strlen(cwd));
+ gd_pathwrite(fd, cwd);
write(fd, format_data2, strlen(format_data2));
close(fd);
Modified: branches/getdata-0.7/test/parse_include_absrel.c
===================================================================
--- branches/getdata-0.7/test/parse_include_absrel.c 2011-03-23 02:59:01 UTC (rev 549)
+++ branches/getdata-0.7/test/parse_include_absrel.c 2011-03-23 11:44:27 UTC (rev 550)
@@ -41,7 +41,7 @@
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
write(fd, format_data1, strlen(format_data1));
- write(fd, cwd, strlen(cwd));
+ gd_pathwrite(fd, cwd);
write(fd, format_data2, strlen(format_data2));
close(fd);
Modified: branches/getdata-0.7/test/parse_include_relabs.c
===================================================================
--- branches/getdata-0.7/test/parse_include_relabs.c 2011-03-23 02:59:01 UTC (rev 549)
+++ branches/getdata-0.7/test/parse_include_relabs.c 2011-03-23 11:44:27 UTC (rev 550)
@@ -47,7 +47,7 @@
fd = open(format1, O_CREAT | O_EXCL | O_WRONLY, 0666);
write(fd, format1_data1, strlen(format1_data1));
- write(fd, cwd, strlen(cwd));
+ gd_pathwrite(fd, cwd);
write(fd, format1_data2, strlen(format1_data2));
close(fd);
Modified: branches/getdata-0.7/test/test.h
===================================================================
--- branches/getdata-0.7/test/test.h 2011-03-23 02:59:01 UTC (rev 549)
+++ branches/getdata-0.7/test/test.h 2011-03-23 11:44:27 UTC (rev 550)
@@ -37,6 +37,19 @@
_mkdir(x)
#endif
+/* path munging for WIN32/64 */
+#if defined _WIN32 || defined _WIN64
+#define gd_pathwrite(x,y) do { \
+ char *ptr; \
+ for (ptr = y; *ptr != '\0'; ++ptr) { \
+ if (*ptr == '\\') write(x,ptr,1); \
+ write(x,ptr,1); \
+ } \
+} while (0)
+#else
+#define gd_pathwrite(x,y) write(x,y,strlen(y))
+#endif
+
#define CHECK(e,n,nf,vf,...) \
if (e) { r = 1; \
fprintf(stderr, #n " = " nf " (expected " vf ")\n", __VA_ARGS__); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-23 02:59:08
|
Revision: 549
http://getdata.svn.sourceforge.net/getdata/?rev=549&view=rev
Author: ketiltrout
Date: 2011-03-23 02:59:01 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
Use jot if seq isn't found.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/m4/python.m4
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-23 01:55:01 UTC (rev 548)
+++ branches/getdata-0.7/ChangeLog 2011-03-23 02:59:01 UTC (rev 549)
@@ -1,3 +1,7 @@
+2011-03-23 D. V. Wiebe <ge...@ke...> svn:549
+ * m4/python.m4: Use the BSD `jot' if the Linux/Plan 9 `seq' is not found.
+ Also, look for python2.7.
+
2011-03-23 D. V. Wiebe <ge...@ke...> svn:546
* src/include.c (_GD_Include): Handle WIN32 paths.
Modified: branches/getdata-0.7/m4/python.m4
===================================================================
--- branches/getdata-0.7/m4/python.m4 2011-03-23 01:55:01 UTC (rev 548)
+++ branches/getdata-0.7/m4/python.m4 2011-03-23 02:59:01 UTC (rev 549)
@@ -23,15 +23,21 @@
dnl Look for python. Then determine whether we can build extension modules.
AC_DEFUN([GD_PYTHON],
[
-last_python=2.6
+last_python=2.7
first_python=$1
AC_CHECK_PROGS([SEQ], [seq], [not found])
if test "x$SEQ" == "xnot found"; then
- python_prog_list="python python2"
+ AC_CHECK_PROGS([JOT], [jot], [not found])
+ if test "x$JOT" == "xnot found"; then
+ python_prog_list="python python2"
+ else
+ python_prog_list="python python2 dnl
+ `$JOT -w 'python%.1f' - $last_python $first_python -0.1`" #'
+ fi
else
-python_prog_list="python python2 dnl
-`$SEQ -f 'python%.1f' $last_python -0.1 $first_python`" #'
+ python_prog_list="python python2 dnl
+ `$SEQ -f 'python%.1f' $last_python -0.1 $first_python`" #'
fi
dnl --without-python basically does the same as --disable-python
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-23 01:55:07
|
Revision: 548
http://getdata.svn.sourceforge.net/getdata/?rev=548&view=rev
Author: ketiltrout
Date: 2011-03-23 01:55:01 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
run svn export before building the idl package to avoid packaging up anything
unwanted.
Modified Paths:
--------------
branches/getdata-0.7/Makefile.am
Modified: branches/getdata-0.7/Makefile.am
===================================================================
--- branches/getdata-0.7/Makefile.am 2011-03-23 01:47:54 UTC (rev 547)
+++ branches/getdata-0.7/Makefile.am 2011-03-23 01:55:01 UTC (rev 548)
@@ -41,18 +41,20 @@
idl_$(distdir).tar.bz2 idl_$(distdir).tar.gz: idldist
idldist: $(DISTFILES)
- rm -rf idl_getdata
- mkdir idl_getdata
- mkdir idl_getdata/m4
- mkdir idl_getdata/src
- cp bindings/idl/package/* idl_getdata
- cp -r bindings/idl/Makefile.am bindings/idl/makedlm.sh.in \
- bindings/idl/getdata.c bindings/idl/test idl_getdata/src
- cp -r bindings/make_parameters.c idl_getdata
- cp -r m4/idl.m4 m4/compiler.m4 m4/ax_compare_version.m4 m4/version.m4 \
- idl_getdata/m4
- cp -r doc/README.idl COPYING AUTHORS ChangeLog INSTALL NEWS idl_getdata
- ( cd idl_getdata && \
+ rm -rf svn_export
+ svn export . svn_export
+ ( cd svn_export && \
+ mkdir idl_getdata && \
+ mkdir idl_getdata/m4 && \
+ mkdir idl_getdata/src && \
+ cp bindings/idl/package/* idl_getdata && \
+ cp -r bindings/idl/Makefile.am bindings/idl/makedlm.sh.in \
+ bindings/idl/getdata.c bindings/idl/test idl_getdata/src && \
+ cp -r bindings/make_parameters.c idl_getdata && \
+ cp -r m4/idl.m4 m4/compiler.m4 m4/ax_compare_version.m4 m4/version.m4 \
+ idl_getdata/m4 && \
+ cp -r doc/README.idl COPYING AUTHORS ChangeLog INSTALL NEWS idl_getdata && \
+ ( cd idl_getdata && \
aclocal -I m4 && \
libtoolize && \
autoconf && \
@@ -60,9 +62,9 @@
automake --add-missing --force-missing && \
./configure && \
make dist && \
- cp idl_${distdir}* .. \
- )
- rm -rf idl_getdata
+ cp idl_${distdir}* ../.. \
+ ) )
+ rm -rf svn_export
idldistcheck: idl_$(distdir).tar.gz
tar -zxvf $<
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-23 01:48:01
|
Revision: 547
http://getdata.svn.sourceforge.net/getdata/?rev=547&view=rev
Author: ketiltrout
Date: 2011-03-23 01:47:54 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
getcwd() tests with MSVCRT.
Modified Paths:
--------------
branches/getdata-0.7/cmake/CMakeLists.txt
branches/getdata-0.7/configure.ac
branches/getdata-0.7/test/parse_include_absolute.c
branches/getdata-0.7/test/parse_include_absrel.c
branches/getdata-0.7/test/parse_include_relabs.c
branches/getdata-0.7/test/test.h
Modified: branches/getdata-0.7/cmake/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-23 00:08:36 UTC (rev 546)
+++ branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-23 01:47:54 UTC (rev 547)
@@ -49,6 +49,7 @@
-D__MSVCRT__
-D_USE_MATH_DEFINES
-DHAVE_DIRENT_H
+ -DHAVE_DIRECT_H
-DHAVE_LIBGEN_H
-DSTDC_HEADERS
-DHAVE_INTTYPES_H
@@ -59,6 +60,7 @@
-DHAVE__COMMIT
-DHAVE__STRTOI64
-DHAVE__STRTOUI64
+ -DHAVE__GETCWD
)
set(CMAKE_DEBUG_POSTFIX d)
@@ -83,11 +85,13 @@
-DHAVE_LIBGEN_H
-DHAVE_STRTOLL
-DHAVE_DIRENT_H
+ -DHAVE_DIRECT_H
-DHAVE__COMMIT
-DHAVE__STAT64
-DHAVE__STRTOI64
-DHAVE__STRTOUI64
-DHAVE_STRUCT___STAT64
+ -DHAVE__GETCWD
-DMKDIR_NO_MODE
)
endif()
Modified: branches/getdata-0.7/configure.ac
===================================================================
--- branches/getdata-0.7/configure.ac 2011-03-23 00:08:36 UTC (rev 546)
+++ branches/getdata-0.7/configure.ac 2011-03-23 01:47:54 UTC (rev 547)
@@ -512,9 +512,9 @@
dnl functions
AC_CHECK_FUNCS([_commit fchmod _fdopen fseeko fseeko64 fsync ftello ftello64 \
- getdelim gmtime_r _lseeki64 _mkdir mkstemp nan _open _read \
- _rmdir _snprintf stat64 _stat64 _strtoi64 strtoll _strtoui64 \
- strtoull _unlink _write])
+ getcwd _getcwd getdelim gmtime_r _lseeki64 _mkdir mkstemp nan \
+ _open _read _rmdir _snprintf stat64 _stat64 _strtoi64 strtoll \
+ _strtoui64 strtoull _unlink _write])
if test "x$disable_c99" = "xno"; then
AC_CHECK_FUNCS([cabs])
fi
@@ -524,7 +524,7 @@
echo
echo "*** Looking for additional header files"
echo
-AC_CHECK_HEADERS([fcntl.h libgen.h stdint.h unistd.h])
+AC_CHECK_HEADERS([direct.h fcntl.h libgen.h stdint.h unistd.h])
if test "x$disable_c99" = "xno"; then
AC_CHECK_HEADERS([complex.h])
fi
Modified: branches/getdata-0.7/test/parse_include_absolute.c
===================================================================
--- branches/getdata-0.7/test/parse_include_absolute.c 2011-03-23 00:08:36 UTC (rev 546)
+++ branches/getdata-0.7/test/parse_include_absolute.c 2011-03-23 01:47:54 UTC (rev 547)
@@ -11,6 +11,10 @@
int main(void)
{
+#if defined HAVE_GETCWD || defined HAVE__GETCWD
+#ifdef HAVE__GETCWD
+#define getcwd _getcwd
+#endif
const char *filedir = __TEST__ "dirfile";
const char *format = __TEST__ "dirfile/format";
const char *format1 = __TEST__ "dirfile/format1";
@@ -54,4 +58,7 @@
CHECKU(spf, 11);
free(cwd);
return r;
+#else
+ return 77;
+#endif
}
Modified: branches/getdata-0.7/test/parse_include_absrel.c
===================================================================
--- branches/getdata-0.7/test/parse_include_absrel.c 2011-03-23 00:08:36 UTC (rev 546)
+++ branches/getdata-0.7/test/parse_include_absrel.c 2011-03-23 01:47:54 UTC (rev 547)
@@ -11,6 +11,10 @@
int main(void)
{
+#if defined HAVE_GETCWD || defined HAVE__GETCWD
+#ifdef HAVE__GETCWD
+#define getcwd _getcwd
+#endif
const char *filedir = __TEST__ "dirfile";
const char *format = __TEST__ "dirfile/format";
const char *format1 = __TEST__ "dirfile/format1";
@@ -61,4 +65,7 @@
CHECKU(spf, 11);
free(cwd);
return r;
+#else
+ return 77;
+#endif
}
Modified: branches/getdata-0.7/test/parse_include_relabs.c
===================================================================
--- branches/getdata-0.7/test/parse_include_relabs.c 2011-03-23 00:08:36 UTC (rev 546)
+++ branches/getdata-0.7/test/parse_include_relabs.c 2011-03-23 01:47:54 UTC (rev 547)
@@ -11,6 +11,10 @@
int main(void)
{
+#if defined HAVE_GETCWD || defined HAVE__GETCWD
+#ifdef HAVE__GETCWD
+#define getcwd _getcwd
+#endif
const char *filedir = __TEST__ "dirfile";
const char *subdir = __TEST__ "dirfile/sub";
const char *format = __TEST__ "dirfile/format";
@@ -64,4 +68,7 @@
CHECKU(spf, 11);
free(cwd);
return r;
+#else
+ return 77;
+#endif
}
Modified: branches/getdata-0.7/test/test.h
===================================================================
--- branches/getdata-0.7/test/test.h 2011-03-23 00:08:36 UTC (rev 546)
+++ branches/getdata-0.7/test/test.h 2011-03-23 01:47:54 UTC (rev 547)
@@ -6,6 +6,11 @@
#include <string.h>
#include <stdlib.h>
+/* for MSVCRT _getcwd */
+#ifdef HAVE_DIRECT_H
+#include <direct.h>
+#endif
+
/* System call kludge for Win32 */
#if defined __MSVCRT__ && defined MSYS_SHELL
#include <process.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-23 00:08:42
|
Revision: 546
http://getdata.svn.sourceforge.net/getdata/?rev=546&view=rev
Author: ketiltrout
Date: 2011-03-23 00:08:36 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
Look for DOS-style paths
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/src/include.c
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-23 00:00:37 UTC (rev 545)
+++ branches/getdata-0.7/ChangeLog 2011-03-23 00:08:36 UTC (rev 546)
@@ -1,4 +1,7 @@
-2011-03-23 Peter Kümmel <syn...@gm...> svn:545
+2011-03-23 D. V. Wiebe <ge...@ke...> svn:546
+ * src/include.c (_GD_Include): Handle WIN32 paths.
+
+2011-03-23 D. V. Wiebe <ge...@ke...> svn:545
* src/add.c (_GD_Add): strdup ref_name when propagating upwards to prevent
double-free when _GD_FreeD() is called.
* test/add_raw_include.c: Added.
Modified: branches/getdata-0.7/src/include.c
===================================================================
--- branches/getdata-0.7/src/include.c 2011-03-23 00:00:37 UTC (rev 545)
+++ branches/getdata-0.7/src/include.c 2011-03-23 00:08:36 UTC (rev 546)
@@ -51,7 +51,14 @@
ref_name, linenum, me, standards, flags);
/* create the format filename */
- if (ename[0] == '/') {
+ if (
+ /* check for absolute path */
+#if defined _WIN32 || defined _WIN64
+ ename[0] != '\0' && ename[1] == ':'
+#else
+ ename[0] == '/'
+#endif
+ ) {
strncpy(temp_buf1, ename, FILENAME_MAX - 1);
temp_buf1[FILENAME_MAX - 1] = '\0';
abs = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-23 00:00:45
|
Revision: 545
http://getdata.svn.sourceforge.net/getdata/?rev=545&view=rev
Author: ketiltrout
Date: 2011-03-23 00:00:37 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
* Fix Ross's gd_add autoreference subfragment bug (with test for same).
* Inherit encoding in gd_include if not specified and needed.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/NEWS
branches/getdata-0.7/src/add.c
branches/getdata-0.7/src/include.c
branches/getdata-0.7/test/Makefile.am
Added Paths:
-----------
branches/getdata-0.7/test/add_raw_include.c
Property Changed:
----------------
branches/getdata-0.7/
branches/getdata-0.7/test/
Property changes on: branches/getdata-0.7
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.log
config.guess
config.status
config.sub
configure
depcomp
getdata-*.tar.gz
getdata-*.tar.bz2
getdata-*.sig
idl_getdata-*.tar.gz
idl_getdata-*.tar.bz2
idl_getdata-*.sig
install-sh
libtool
ltmain.sh
missing
*.swp
libltdl
README.txt
config.lt
compile
+ Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.log
config.guess
config.status
config.sub
configure
depcomp
getdata_win-*.zip
getdata_win-*.sig
getdata-*.tar.gz
getdata-*.tar.bz2
getdata-*.sig
idl_getdata-*.tar.gz
idl_getdata-*.tar.bz2
idl_getdata-*.sig
install-sh
libtool
ltmain.sh
missing
*.swp
libltdl
README.txt
config.lt
compile
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-22 22:54:06 UTC (rev 544)
+++ branches/getdata-0.7/ChangeLog 2011-03-23 00:00:37 UTC (rev 545)
@@ -1,3 +1,11 @@
+2011-03-23 Peter Kümmel <syn...@gm...> svn:545
+ * src/add.c (_GD_Add): strdup ref_name when propagating upwards to prevent
+ double-free when _GD_FreeD() is called.
+ * test/add_raw_include.c: Added.
+
+ * src/include.c (gd_include): If GD_CREAT is specified, but no encoding,
+ inherit encoding from parent.
+
2011-03-22 Peter Kümmel <syn...@gm...> svn:535-541
* backport MSVC support
* finish strtoll/strtoull replacement with gd_* functions
Modified: branches/getdata-0.7/NEWS
===================================================================
--- branches/getdata-0.7/NEWS 2011-03-22 22:54:06 UTC (rev 544)
+++ branches/getdata-0.7/NEWS 2011-03-23 00:00:37 UTC (rev 545)
@@ -5,10 +5,14 @@
* If built with modules, the plugin shared objects will now be installed in
a separate directory (by default "${libdir}/getdata", but see the
--with-module-dir option in ./configure).
+ * If called with GD_CREAT but no encoding specified, gd_include() now will
+ duplicate the encoding of the parent fragment (if any).
* BUG FIX: When using modules, a missing plugin no longer results in a lock up
the second time an attempt is made to find it.
* BUG FIX: GetData now properly processes /INCLUDE directives with absolute
paths, as the documentation insists it should.
+ * BUG FIX: gd_add()ing the first raw field in a dirfile to a subfragment no
+ longer results in memory corruption when calling gd_close().
Miscellaneous
Modified: branches/getdata-0.7/src/add.c
===================================================================
--- branches/getdata-0.7/src/add.c 2011-03-22 22:54:06 UTC (rev 544)
+++ branches/getdata-0.7/src/add.c 2011-03-23 00:00:37 UTC (rev 545)
@@ -477,7 +477,7 @@
/* This is the first raw field in this fragment; propagate it upwards */
for (i = E->fragment_index; i != -1; i = D->fragment[i].parent) {
if (D->fragment[i].ref_name == NULL) {
- D->fragment[i].ref_name = (char *)new_ref;
+ D->fragment[i].ref_name = strdup(new_ref);
D->fragment[i].modified = 1;
} else
break;
Modified: branches/getdata-0.7/src/include.c
===================================================================
--- branches/getdata-0.7/src/include.c 2011-03-22 22:54:06 UTC (rev 544)
+++ branches/getdata-0.7/src/include.c 2011-03-23 00:00:37 UTC (rev 545)
@@ -212,6 +212,11 @@
return -1;
}
+ /* if the caller specified no encoding scheme, but we were asked to create
+ * the fragment, inherit it from the parent */
+ if ((flags & (GD_ENCODING | GD_CREAT)) == GD_CREAT)
+ flags |= D->flags & GD_ENCODING;
+
new_fragment = _GD_Include(D, file, "dirfile_include()", 0, &ref_name,
fragment_index, &standards, &flags);
Property changes on: branches/getdata-0.7/test
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
*.o
*.odirfile
*.swp
*.exe
.deps
.libs
convert_uint8_int8
convert_uint8_uint16
convert_uint8_int16
convert_uint8_uint32
convert_uint8_int32
convert_uint8_float32
convert_uint8_uint64
convert_uint8_int64
convert_uint8_float64
convert_int8_uint8
convert_int8_uint16
convert_int8_int16
convert_int8_uint32
convert_int8_int32
convert_int8_float32
convert_int8_uint64
convert_int8_int64
convert_int8_float64
convert_uint16_uint8
convert_uint16_int8
convert_uint16_int16
convert_uint16_uint32
convert_uint16_int32
convert_uint16_float32
convert_uint16_uint64
convert_uint16_int64
convert_uint16_float64
convert_int16_uint8
convert_int16_int8
convert_int16_uint16
convert_int16_uint32
convert_int16_int32
convert_int16_float32
convert_int16_uint64
convert_int16_int64
convert_int16_float64
convert_uint32_uint8
convert_uint32_int8
convert_uint32_uint16
convert_uint32_int16
convert_uint32_int32
convert_uint32_float32
convert_uint32_uint64
convert_uint32_int64
convert_uint32_float64
convert_int32_uint8
convert_int32_int8
convert_int32_uint16
convert_int32_int16
convert_int32_uint32
convert_int32_float32
convert_int32_uint64
convert_int32_int64
convert_int32_float64
convert_uint64_uint8
convert_uint64_int8
convert_uint64_uint16
convert_uint64_int16
convert_uint64_uint32
convert_uint64_int32
convert_uint64_float32
convert_uint64_int64
convert_uint64_float64
convert_int64_uint8
convert_int64_int8
convert_int64_uint16
convert_int64_int16
convert_int64_uint32
convert_int64_int32
convert_int64_float32
convert_int64_uint64
convert_int64_float64
convert_float32_uint8
convert_float32_int8
convert_float32_uint16
convert_float32_int16
convert_float32_uint32
convert_float32_int32
convert_float32_uint64
convert_float32_int64
convert_float32_float64
convert_float64_uint8
convert_float64_int8
convert_float64_uint16
convert_float64_int16
convert_float64_uint32
convert_float64_int32
convert_float64_float32
convert_float64_uint64
convert_float64_int64
creat
creat_excl
creat_rdonly
flist
flist_invalid
get64
get_bad_code
get_bit
get_char
get_endian8
get_endian16
get_endian32
get_endian64
get_endian_float32_big
get_endian_float32_arm
get_endian_float32_little
get_endian_float64_big
get_endian_float64_arm
get_endian_float64_little
get_ff
get_float32
get_float64
get_foffs
get_fs
get_int8
get_int16
get_int32
get_int64
get_invalid
get_lincom1
get_lincom2
get_lincom3
get_lincom_noin
get_linterp
get_linterp_noin
get_linterp_notab
get_multiply
get_multiply_noin
get_nonexistent
get_null
get_off64
get_phase
get_recurse
get_sf
get_ss
get_type
get_uint16
get_uint32
get_uint64
legacy_get
legacy_nframes
legacy_nonexistent
legacy_put
legacy_spf
nfields
nfields_invalid
nframes
nframes64
nframes_empty
nframes_invalid
nframes_off64
nframes_spf
open
open_eaccess
open_nonexistent
open_notdirfile
parse_badline
parse_bit
parse_bit4
parse_bit_bitnum
parse_bit_bitsize
parse_bit_ncols
parse_bit_numbits
parse_endian_bad
parse_endian_big
parse_endian_force
parse_endian_little
parse_foffs
parse_include
parse_include_nonexistent
parse_index
parse_lincom
parse_lincom_ncols1
parse_lincom_ncols2
parse_lincom_nfields
parse_lincom_nofields
parse_linterp
parse_linterp_ncols
parse_multiply
parse_multiply_ncols
parse_ncols
parse_phase
parse_phase_ncols
parse_raw
parse_raw_char
parse_raw_ncols
parse_raw_spf
parse_raw_type
parse_version
parse_version_include
put64
put_bad_code
put_bit
put_bof
put_char
put_endian8
put_endian16
put_endian32
put_endian64
put_endian_float32_arm
put_endian_float32_big
put_endian_float32_little
put_endian_float64_arm
put_endian_float64_big
put_endian_float64_little
put_ff
put_float32
put_float64
put_foffs
put_fs
put_int8
put_int16
put_int32
put_int64
put_invalid
put_lincom1
put_lincom2
put_lincom_noin
put_linterp
put_linterp_notab
put_multiply
put_null
put_off64
put_phase
put_phase_noin
put_rdonly
put_recurse
put_rofs
put_sf
put_ss
put_type
put_uint16
put_uint32
put_uint64
spf
spf_lincom
spf_multiply
spf_recurse
trunc
trunc_rdonly
trunc_rofs
flush_invalid
parse_version_slash
flush_all
flush
close_null
close
parse_endian_slash
error_error
parse_name
parse_include_slash
close_bad
parse_foffs_slash
flush_bad_code
dfes_bit
dfes_lincom
dfes_linterp
dfes_multiply
dfes_null
dfes_phase
dfes_raw
dfes_zero
entry_bad_code
entry_bit
entry_invalid
entry_lincom
entry_linterp
entry_multiply
entry_phase
entry_raw
legacy_get_put
legacy_get_rofs
add_phase
add_lincom_nfields
add_raw
add_multiply
add_bit_bitsize
flush_meta
add_type
add_raw_type
add_bit_bitnum
add_bit
add_format
add_raw_spf
put_linterp_noin
error_short
error
add
add_linterp
nfragments
add_duplicate
add_code
add_bit_numbits
add_lincom
add_rdonly
ascii_get
ascii_put
ascii_nframes
slim_get
slim_nframes
slim_put
add_many
add_sort
nfields_type
nfields_type_invalid
nmeta
nmeta_invalid
nmeta_parent
nmeta_type
nmeta_type_invalid
nmeta_type_parent
nmeta_vectors
nmeta_vectors_invalid
nmeta_vectors_parent
nvectors
nvectors_invalid
parse_const
parse_const_ncols
parse_duplicate
parse_meta
parse_meta_parent
parse_meta_raw
parse_quote
parse_sort
parse_string
parse_string_ncols
parse_whitespace
madd_linterp_invalid
madd_lincom_invalid
vlist_invalid
vlist_meta
add_raw_invalid
cvlist_invalid
svlist_invalid
cvlist
svlist
madd_phase_invalid
add_invalid
madd_phase
add_phase_invalid
add_spec_directive
add_string
add_linterp_invalid
madd_multiply
flist_type_invalid
clist
cvlist_meta_invalid
flist_meta_invalid
flist_type
svlist_meta_invalid
cvlist_meta
vlist_meta_invalid
svlist_meta
parse_string_null
madd_linterp
madd_lincom
vlist
add_bit_invalid
add_lincom_invalid
madd_bit_invalid
madd_bit
add_multiply_invalid
add_const
madd_multiply_invalid
madd
add_spec_invalid
flist_type_meta_invalid
add_spec
flist_type_meta
flist_meta
parse_meta_index
entry_raw_scalar_code
parse_bit_scalar
entry_raw_scalar_type
entry_lincom_scalar
entry_phase_scalar
entry_raw_scalar
parse_lincom_scalar
entry_bit_scalar
parse_raw_scalar
parse_phase_scalar
include
include_nonexistent
include_creat
include_invalid
include_accmode
include_index
madd_spec_directive
madd_spec_invalid
madd_spec
parse_quote_mismatch
parse_eol
parse_foffs_include
put_string
parse_protect_data
put_const
put_string_protect
ref
put_const_protect
parse_protect_all
ref_none
parse_ref
add_protect
parse_protect_format
parse_protect_bad
ref_two
put_protect
include_rdonly
parse_ref_nonexistent
parse_protect_none
parse_name_pedantic
parse_name_dot
parse_name_ext
parse_duplicate_ignore
gzip_get
gzip_nframes
gzip_put
gzip_get_get
bzip_get
bzip_nframes
bzip_put
bzip_get_get
global_name
open_cb_abort
open_cb_cont
open_cb_ignore
open_cb_rescan
open_cb_invalid
del_const_force
del_const
del_derived_force
del_const_deref
del_meta_force
del_data
del_meta
del
del_derived
close_discard
global_ref_set
global_ref_empty
include_ignore
global_ref
include_ref
include_auto
move
move_index
move_protect
move_data_enc_ar
bzip_move_from
gzip_move_from
move_data_foffs
move_data_enc_ra
move_data_endian
move_data_nop
alter_multiply
alter_bit_bitnum
alter_entry_recode
alter_linterp_move
alter_raw_spf
alter_entry
alter_bit_numbits
alter_lincom_slope
alter_raw_type
alter_lincom_input
alter_const
alter_phase
alter_lincom_offset
alter_linterp
foffs_get
foffs_move
foffs_alter
endian_alter
endian_move
endian_get
encode_alter
encode_get
encode_move
protect_alter
move_subdir
unclude_del
name_move
unclude
file
name
file_type
unclude_move
file_code
parent
protect_get
global_ref_get
alter_mspec
alter_spec
include_cb
include_pc
include_syntax
fragment_index
fragment_name
fragment_name_oor
entry_type
alter_polynom_coeff
get_polynom_noin
get_polynom
put_polynom_noin
madd_polynom
parse_polynom_scalar
alter_polynom_ord
parse_polynom
spf_polynom
entry_polynom_scalar
put_polynom1
put_polynom2
parse_polynom_ncols1
parse_polynom_ncols2
alter_polynom_input
add_polynom
entry_polynom
parse_lincom_non_ncols
parse_lincom_non
get_lincom_non
xz_get
xz_nframes
lzma_get
lzma_nframes
add_sbit
parse_sbit
put_sbit
get_sbit
madd_sbit
flush_spec
index_domain
madd_clincom
index
madd_const
index_range
add_clincom
add_cpolynom
get_clincom
convert_float32_complex64
convert_int32_complex128
get_endian_complex128_big
get_endian_complex128_arm
get_endian_complex128_little
convert_complex64_float64
parse_meta_index2
convert_uint16_complex128
put_endian_complex64_arm
put_endian_complex64_big
put_endian_complex64_little
convert_uint16_complex64
convert_float64_complex128
repr_int8
convert_complex64_int64
convert_uint64_complex64
convert_complex64_complex128
get_const
convert_uint8_complex128
parse_meta_implicit2
convert_float32_complex128
get_complex64
add_spec_meta
convert_float64_complex64
convert_int16_complex128
alter_cpolynom
madd_cpolynom
convert_int32_complex64
alter_lincom_23
convert_complex64_uint64
repr_uint8
put_complex128
get_endian_complex64_big
get_endian_complex64_arm
get_endian_complex64_little
alter_spec_meta
repr_real_a
repr_real_i
repr_real_m
repr_real_r
repr_int16
convert_uint8_complex64
repr_int32
madd_string
convert_complex128_float64
repr_uint16
repr_int64
put_endian_complex128_arm
put_endian_complex128_big
put_endian_complex128_little
get_complex128
repr_uint32
convert_complex128_uint64
get_const_repr
convert_complex128_int64
repr_float32
repr_uint64
convert_int16_complex64
repr_float64
put_complex64
convert_uint64_complex128
convert_int64_complex64
repr_a
repr_i
repr_m
repr_r
get_const_complex
convert_int8_complex128
convert_uint32_complex128
parse_meta_implicit
get_cpolynom
put_repr
convert_complex128_complex64
convert_int8_complex64
convert_uint32_complex64
convert_int64_complex128
move_meta
add_scalar
alter_entry_scalar2a
alter_entry_scalar2n
alter_entry_scalar3
alter_entry_scalar4
get_zero
entry_scalar_repr
header_complex
version_5_strict
parse_version_permissive
version_7_strict
version_0
version_1
version_2
version_3
version_4
version_5
version_6
version_7
version_6_strict
eof
eof_index
eof_lincom
eof_phase
bof
bof_lincom
bof_phase
put_linterp_nomono
get_linterp_sort
put_linterp_reverse
alter_lincom_32
parse_recip
parse_divide
alter_recip
dfes_recip
add_crecip89
add_divide
put_divide
madd_recip
add_crecip
get_recip_const
spf_divide
add_divide_invalid
version_8
alter_crecip89
put_recip
spf_recip
madd_crecip89
alter_divide
get_recip
alter_crecip
madd_divide
dfes_divide
madd_crecip
add_recip
get_divide
version_8_strict
version_5_write
version_0_write
version_7_write
version_2_write
version_4_write
version_6_write
version_1_write
version_8_write
version_3_write
put_carray_slice
cvlist_array_meta
del_carray
get_carray_slice
cvlist_array
del_carray_deref
nmeta_vectors_del
get_carray
parse_carray
madd_carray
add_carray
put_carray
get_carray_len
parse_carray_long
alter_carray_len
alter_carray_type
ascii_get_get
parse_include_relabs
parse_include_absrel
parse_include_relrel
parse_include_absolute
+ Makefile
Makefile.in
*.o
*.odirfile
*.swp
*.exe
.deps
.libs
convert_uint8_int8
convert_uint8_uint16
convert_uint8_int16
convert_uint8_uint32
convert_uint8_int32
convert_uint8_float32
convert_uint8_uint64
convert_uint8_int64
convert_uint8_float64
convert_int8_uint8
convert_int8_uint16
convert_int8_int16
convert_int8_uint32
convert_int8_int32
convert_int8_float32
convert_int8_uint64
convert_int8_int64
convert_int8_float64
convert_uint16_uint8
convert_uint16_int8
convert_uint16_int16
convert_uint16_uint32
convert_uint16_int32
convert_uint16_float32
convert_uint16_uint64
convert_uint16_int64
convert_uint16_float64
convert_int16_uint8
convert_int16_int8
convert_int16_uint16
convert_int16_uint32
convert_int16_int32
convert_int16_float32
convert_int16_uint64
convert_int16_int64
convert_int16_float64
convert_uint32_uint8
convert_uint32_int8
convert_uint32_uint16
convert_uint32_int16
convert_uint32_int32
convert_uint32_float32
convert_uint32_uint64
convert_uint32_int64
convert_uint32_float64
convert_int32_uint8
convert_int32_int8
convert_int32_uint16
convert_int32_int16
convert_int32_uint32
convert_int32_float32
convert_int32_uint64
convert_int32_int64
convert_int32_float64
convert_uint64_uint8
convert_uint64_int8
convert_uint64_uint16
convert_uint64_int16
convert_uint64_uint32
convert_uint64_int32
convert_uint64_float32
convert_uint64_int64
convert_uint64_float64
convert_int64_uint8
convert_int64_int8
convert_int64_uint16
convert_int64_int16
convert_int64_uint32
convert_int64_int32
convert_int64_float32
convert_int64_uint64
convert_int64_float64
convert_float32_uint8
convert_float32_int8
convert_float32_uint16
convert_float32_int16
convert_float32_uint32
convert_float32_int32
convert_float32_uint64
convert_float32_int64
convert_float32_float64
convert_float64_uint8
convert_float64_int8
convert_float64_uint16
convert_float64_int16
convert_float64_uint32
convert_float64_int32
convert_float64_float32
convert_float64_uint64
convert_float64_int64
creat
creat_excl
creat_rdonly
flist
flist_invalid
get64
get_bad_code
get_bit
get_char
get_endian8
get_endian16
get_endian32
get_endian64
get_endian_float32_big
get_endian_float32_arm
get_endian_float32_little
get_endian_float64_big
get_endian_float64_arm
get_endian_float64_little
get_ff
get_float32
get_float64
get_foffs
get_fs
get_int8
get_int16
get_int32
get_int64
get_invalid
get_lincom1
get_lincom2
get_lincom3
get_lincom_noin
get_linterp
get_linterp_noin
get_linterp_notab
get_multiply
get_multiply_noin
get_nonexistent
get_null
get_off64
get_phase
get_recurse
get_sf
get_ss
get_type
get_uint16
get_uint32
get_uint64
legacy_get
legacy_nframes
legacy_nonexistent
legacy_put
legacy_spf
nfields
nfields_invalid
nframes
nframes64
nframes_empty
nframes_invalid
nframes_off64
nframes_spf
open
open_eaccess
open_nonexistent
open_notdirfile
parse_badline
parse_bit
parse_bit4
parse_bit_bitnum
parse_bit_bitsize
parse_bit_ncols
parse_bit_numbits
parse_endian_bad
parse_endian_big
parse_endian_force
parse_endian_little
parse_foffs
parse_include
parse_include_nonexistent
parse_index
parse_lincom
parse_lincom_ncols1
parse_lincom_ncols2
parse_lincom_nfields
parse_lincom_nofields
parse_linterp
parse_linterp_ncols
parse_multiply
parse_multiply_ncols
parse_ncols
parse_phase
parse_phase_ncols
parse_raw
parse_raw_char
parse_raw_ncols
parse_raw_spf
parse_raw_type
parse_version
parse_version_include
put64
put_bad_code
put_bit
put_bof
put_char
put_endian8
put_endian16
put_endian32
put_endian64
put_endian_float32_arm
put_endian_float32_big
put_endian_float32_little
put_endian_float64_arm
put_endian_float64_big
put_endian_float64_little
put_ff
put_float32
put_float64
put_foffs
put_fs
put_int8
put_int16
put_int32
put_int64
put_invalid
put_lincom1
put_lincom2
put_lincom_noin
put_linterp
put_linterp_notab
put_multiply
put_null
put_off64
put_phase
put_phase_noin
put_rdonly
put_recurse
put_rofs
put_sf
put_ss
put_type
put_uint16
put_uint32
put_uint64
spf
spf_lincom
spf_multiply
spf_recurse
trunc
trunc_rdonly
trunc_rofs
flush_invalid
parse_version_slash
flush_all
flush
close_null
close
parse_endian_slash
error_error
parse_name
parse_include_slash
close_bad
parse_foffs_slash
flush_bad_code
dfes_bit
dfes_lincom
dfes_linterp
dfes_multiply
dfes_null
dfes_phase
dfes_raw
dfes_zero
entry_bad_code
entry_bit
entry_invalid
entry_lincom
entry_linterp
entry_multiply
entry_phase
entry_raw
legacy_get_put
legacy_get_rofs
add_phase
add_lincom_nfields
add_raw
add_multiply
add_bit_bitsize
flush_meta
add_type
add_raw_type
add_bit_bitnum
add_bit
add_format
add_raw_spf
put_linterp_noin
error_short
error
add
add_linterp
nfragments
add_duplicate
add_code
add_bit_numbits
add_lincom
add_rdonly
ascii_get
ascii_put
ascii_nframes
slim_get
slim_nframes
slim_put
add_many
add_sort
nfields_type
nfields_type_invalid
nmeta
nmeta_invalid
nmeta_parent
nmeta_type
nmeta_type_invalid
nmeta_type_parent
nmeta_vectors
nmeta_vectors_invalid
nmeta_vectors_parent
nvectors
nvectors_invalid
parse_const
parse_const_ncols
parse_duplicate
parse_meta
parse_meta_parent
parse_meta_raw
parse_quote
parse_sort
parse_string
parse_string_ncols
parse_whitespace
madd_linterp_invalid
madd_lincom_invalid
vlist_invalid
vlist_meta
add_raw_invalid
cvlist_invalid
svlist_invalid
cvlist
svlist
madd_phase_invalid
add_invalid
madd_phase
add_phase_invalid
add_spec_directive
add_string
add_linterp_invalid
madd_multiply
flist_type_invalid
clist
cvlist_meta_invalid
flist_meta_invalid
flist_type
svlist_meta_invalid
cvlist_meta
vlist_meta_invalid
svlist_meta
parse_string_null
madd_linterp
madd_lincom
vlist
add_bit_invalid
add_lincom_invalid
madd_bit_invalid
madd_bit
add_multiply_invalid
add_const
madd_multiply_invalid
madd
add_spec_invalid
flist_type_meta_invalid
add_spec
flist_type_meta
flist_meta
parse_meta_index
entry_raw_scalar_code
parse_bit_scalar
entry_raw_scalar_type
entry_lincom_scalar
entry_phase_scalar
entry_raw_scalar
parse_lincom_scalar
entry_bit_scalar
parse_raw_scalar
parse_phase_scalar
include
include_nonexistent
include_creat
include_invalid
include_accmode
include_index
madd_spec_directive
madd_spec_invalid
madd_spec
parse_quote_mismatch
parse_eol
parse_foffs_include
put_string
parse_protect_data
put_const
put_string_protect
ref
put_const_protect
parse_protect_all
ref_none
parse_ref
add_protect
parse_protect_format
parse_protect_bad
ref_two
put_protect
include_rdonly
parse_ref_nonexistent
parse_protect_none
parse_name_pedantic
parse_name_dot
parse_name_ext
parse_duplicate_ignore
gzip_get
gzip_nframes
gzip_put
gzip_get_get
bzip_get
bzip_nframes
bzip_put
bzip_get_get
global_name
open_cb_abort
open_cb_cont
open_cb_ignore
open_cb_rescan
open_cb_invalid
del_const_force
del_const
del_derived_force
del_const_deref
del_meta_force
del_data
del_meta
del
del_derived
close_discard
global_ref_set
global_ref_empty
include_ignore
global_ref
include_ref
include_auto
move
move_index
move_protect
move_data_enc_ar
bzip_move_from
gzip_move_from
move_data_foffs
move_data_enc_ra
move_data_endian
move_data_nop
alter_multiply
alter_bit_bitnum
alter_entry_recode
alter_linterp_move
alter_raw_spf
alter_entry
alter_bit_numbits
alter_lincom_slope
alter_raw_type
alter_lincom_input
alter_const
alter_phase
alter_lincom_offset
alter_linterp
foffs_get
foffs_move
foffs_alter
endian_alter
endian_move
endian_get
encode_alter
encode_get
encode_move
protect_alter
move_subdir
unclude_del
name_move
unclude
file
name
file_type
unclude_move
file_code
parent
protect_get
global_ref_get
alter_mspec
alter_spec
include_cb
include_pc
include_syntax
fragment_index
fragment_name
fragment_name_oor
entry_type
alter_polynom_coeff
get_polynom_noin
get_polynom
put_polynom_noin
madd_polynom
parse_polynom_scalar
alter_polynom_ord
parse_polynom
spf_polynom
entry_polynom_scalar
put_polynom1
put_polynom2
parse_polynom_ncols1
parse_polynom_ncols2
alter_polynom_input
add_polynom
entry_polynom
parse_lincom_non_ncols
parse_lincom_non
get_lincom_non
xz_get
xz_nframes
lzma_get
lzma_nframes
add_sbit
parse_sbit
put_sbit
get_sbit
madd_sbit
flush_spec
index_domain
madd_clincom
index
madd_const
index_range
add_clincom
add_cpolynom
get_clincom
convert_float32_complex64
convert_int32_complex128
get_endian_complex128_big
get_endian_complex128_arm
get_endian_complex128_little
convert_complex64_float64
parse_meta_index2
convert_uint16_complex128
put_endian_complex64_arm
put_endian_complex64_big
put_endian_complex64_little
convert_uint16_complex64
convert_float64_complex128
repr_int8
convert_complex64_int64
convert_uint64_complex64
convert_complex64_complex128
get_const
convert_uint8_complex128
parse_meta_implicit2
convert_float32_complex128
get_complex64
add_spec_meta
convert_float64_complex64
convert_int16_complex128
alter_cpolynom
madd_cpolynom
convert_int32_complex64
alter_lincom_23
convert_complex64_uint64
repr_uint8
put_complex128
get_endian_complex64_big
get_endian_complex64_arm
get_endian_complex64_little
alter_spec_meta
repr_real_a
repr_real_i
repr_real_m
repr_real_r
repr_int16
convert_uint8_complex64
repr_int32
madd_string
convert_complex128_float64
repr_uint16
repr_int64
put_endian_complex128_arm
put_endian_complex128_big
put_endian_complex128_little
get_complex128
repr_uint32
convert_complex128_uint64
get_const_repr
convert_complex128_int64
repr_float32
repr_uint64
convert_int16_complex64
repr_float64
put_complex64
convert_uint64_complex128
convert_int64_complex64
repr_a
repr_i
repr_m
repr_r
get_const_complex
convert_int8_complex128
convert_uint32_complex128
parse_meta_implicit
get_cpolynom
put_repr
convert_complex128_complex64
convert_int8_complex64
convert_uint32_complex64
convert_int64_complex128
move_meta
add_scalar
alter_entry_scalar2a
alter_entry_scalar2n
alter_entry_scalar3
alter_entry_scalar4
get_zero
entry_scalar_repr
header_complex
version_5_strict
parse_version_permissive
version_7_strict
version_0
version_1
version_2
version_3
version_4
version_5
version_6
version_7
version_6_strict
eof
eof_index
eof_lincom
eof_phase
bof
bof_lincom
bof_phase
put_linterp_nomono
get_linterp_sort
put_linterp_reverse
alter_lincom_32
parse_recip
parse_divide
alter_recip
dfes_recip
add_crecip89
add_divide
put_divide
madd_recip
add_crecip
get_recip_const
spf_divide
add_divide_invalid
version_8
alter_crecip89
put_recip
spf_recip
madd_crecip89
alter_divide
get_recip
alter_crecip
madd_divide
dfes_divide
madd_crecip
add_recip
get_divide
version_8_strict
version_5_write
version_0_write
version_7_write
version_2_write
version_4_write
version_6_write
version_1_write
version_8_write
version_3_write
put_carray_slice
cvlist_array_meta
del_carray
get_carray_slice
cvlist_array
del_carray_deref
nmeta_vectors_del
get_carray
parse_carray
madd_carray
add_carray
put_carray
get_carray_len
parse_carray_long
alter_carray_len
alter_carray_type
ascii_get_get
parse_include_relabs
parse_include_absrel
parse_include_relrel
parse_include_absolute
add_raw_include
Modified: branches/getdata-0.7/test/Makefile.am
===================================================================
--- branches/getdata-0.7/test/Makefile.am 2011-03-22 22:54:06 UTC (rev 544)
+++ branches/getdata-0.7/test/Makefile.am 2011-03-23 00:00:37 UTC (rev 545)
@@ -48,9 +48,10 @@
add_duplicate add_format add_invalid add_lincom add_lincom_invalid \
add_lincom_nfields add_linterp add_linterp_invalid add_multiply \
add_multiply_invalid add_phase add_phase_invalid add_polynom \
- add_protect add_raw add_raw_invalid add_raw_spf add_raw_type \
- add_rdonly add_recip add_sbit add_scalar add_sort add_spec \
- add_spec_directive add_spec_invalid add_spec_meta add_string add_type
+ add_protect add_raw add_raw_include add_raw_invalid add_raw_spf \
+ add_raw_type add_rdonly add_recip add_sbit add_scalar add_sort \
+ add_spec add_spec_directive add_spec_invalid add_spec_meta \
+ add_string add_type
ALTER_TESTS=alter_bit_bitnum alter_bit_numbits alter_carray_len \
alter_carray_type alter_const alter_cpolynom alter_crecip \
Added: branches/getdata-0.7/test/add_raw_include.c
===================================================================
--- branches/getdata-0.7/test/add_raw_include.c (rev 0)
+++ branches/getdata-0.7/test/add_raw_include.c 2011-03-23 00:00:37 UTC (rev 545)
@@ -0,0 +1,49 @@
+/* Add a RAW field */
+#include "test.h"
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
+int main(void)
+{
+ const char* filedir = __TEST__ "dirfile";
+ const char* format = __TEST__ "dirfile/format";
+ const char* format1 = __TEST__ "dirfile/format1";
+ const char* data = __TEST__ "dirfile/data";
+ gd_entry_t e;
+ int error, r = 0;
+
+ DIRFILE* D = gd_open(filedir, GD_RDWR | GD_CREAT | GD_UNENCODED | GD_VERBOSE);
+ int frag = gd_include(D, "format1", 0, GD_CREAT);
+
+ gd_add_raw(D, "data", GD_UINT8, 2, 1);
+ error = gd_error(D);
+
+ /* check */
+ gd_entry(D, "data", &e);
+ if (gd_error(D))
+ r = 1;
+ else {
+ CHECKI(e.field_type, GD_RAW_ENTRY);
+ CHECKI(e.fragment_index, 1);
+ CHECKI(e.EN(raw,spf), 2);
+ CHECKI(e.EN(raw,data_type), GD_UINT8);
+ gd_free_entry_strings(&e);
+ }
+
+ gd_close(D);
+
+ if (unlink(data))
+ r = 1;
+ unlink(format1);
+ unlink(format);
+ rmdir(filedir);
+
+ CHECKI(error, GD_E_OK);
+ return r;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-22 22:54:12
|
Revision: 544
http://getdata.svn.sourceforge.net/getdata/?rev=544&view=rev
Author: ketiltrout
Date: 2011-03-22 22:54:06 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
Revert some inadvertant changes from r537.
Modified Paths:
--------------
branches/getdata-0.7/cmake/CMakeLists.txt
branches/getdata-0.7/src/getdata.h.in
Modified: branches/getdata-0.7/cmake/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-22 11:08:06 UTC (rev 543)
+++ branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-22 22:54:06 UTC (rev 544)
@@ -29,6 +29,20 @@
-DPACKAGE_BUGREPORT=\"get...@li...\")
+## Substitutions needed to build getdata.h
+# build in ANSI C mode
+set(DEFINE_GD_NO_C99_API "#define GD_NO_C99_API")
+
+# kst2 doesn't need the legacy API
+set(DEFINE_GD_LEGACY_API "/* #undef GD_LEGACY_API */")
+
+# MSVCRT integer types
+set(DEFINE_gd_int16_t "#define gd_int16_t short int")
+set(DEFINE_gd_uint16_t "#define gd_int16_t unsigned short int")
+set(DEFINE_gd_int64_t "#define gd_int64_t __int64")
+
+
+
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
add_definitions(
@@ -45,7 +59,6 @@
-DHAVE__COMMIT
-DHAVE__STRTOI64
-DHAVE__STRTOUI64
- -DGD_NO_C99_API
)
set(CMAKE_DEBUG_POSTFIX d)
Modified: branches/getdata-0.7/src/getdata.h.in
===================================================================
--- branches/getdata-0.7/src/getdata.h.in 2011-03-22 11:08:06 UTC (rev 543)
+++ branches/getdata-0.7/src/getdata.h.in 2011-03-22 22:54:06 UTC (rev 544)
@@ -56,7 +56,7 @@
#include <sys/types.h>
/* If this symbol is defined here, the C99-API is not present in the library */
-#undef GD_NO_C99_API /**/
+@DEFINE_GD_NO_C99_API@
#if defined(GD_NO_C99_API) && ! defined(GD_C89_API)
# define GD_C89_API
@@ -227,15 +227,9 @@
/* GD_NO_ENTRY is not part of this count */
#define GD_N_ENTYPES 14
-#if defined(__MINGW32__) || defined(_MSC_VER)
-typedef short _gd_int16_t;
-typedef unsigned short _gd_uint16_t;
-typedef __int64 _gd_int64_t;
-#else
-#undef _gd_int16_t /**/
-#undef _gd_uint16_t /**/
-#undef _gd_int64_t /**/
-#endif
+@DEFINE_gd_int16_t@
+@DEFINE_gd_uint16_t@
+@DEFINE_gd_int64_t@
#if ! defined GD_C89_API
# include <inttypes.h>
@@ -247,9 +241,9 @@
#else
# define GD_DCOMPLEXM(v) double v[2]
# define GD_DCOMPLEXP(v) double *v
-typedef _gd_int16_t gd_bit_t;
-typedef _gd_uint16_t gd_spf_t;
-typedef _gd_int64_t gd_shift_t;
+typedef gd_int16_t gd_bit_t;
+typedef gd_uint16_t gd_spf_t;
+typedef gd_int64_t gd_shift_t;
#endif
/* Data types -- No valid type may set 0x40 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-22 11:08:12
|
Revision: 543
http://getdata.svn.sourceforge.net/getdata/?rev=543&view=rev
Author: syntheticpp
Date: 2011-03-22 11:08:06 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
update change log
Modified Paths:
--------------
trunk/getdata/ChangeLog
Modified: trunk/getdata/ChangeLog
===================================================================
--- trunk/getdata/ChangeLog 2011-03-22 11:05:01 UTC (rev 542)
+++ trunk/getdata/ChangeLog 2011-03-22 11:08:06 UTC (rev 543)
@@ -1,8 +1,12 @@
-2010-03-17 Peter Kümmel <syn...@gm...>
+2011-03-22 Peter Kümmel <syn...@gm...> svn:538
+ * merge from 0.7 branch strtoll/strtoull replacement with gd_* functions
+
+2011-03-17 Peter Kümmel <syn...@gm...>
* use _stat64 and struct _stat64 with msvc
* fix tests by removing the content of dirfile
* guard definitions of macros in C++ binding
- * build tests with C89 API
+ * build tests with C89 API
+
2011-03-03 D. V. Wiebe <ge...@ke...> svn:510
* m4/idl.m4: Munge IDL_LIBS to convert "-m <arg>" into "-m<arg>" since
libtool seems to delete <arg> if that's not the case.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-22 11:05:10
|
Revision: 542
http://getdata.svn.sourceforge.net/getdata/?rev=542&view=rev
Author: syntheticpp
Date: 2011-03-22 11:05:01 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
update change log
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-22 11:00:42 UTC (rev 541)
+++ branches/getdata-0.7/ChangeLog 2011-03-22 11:05:01 UTC (rev 542)
@@ -1,3 +1,9 @@
+2011-03-22 Peter Kümmel <syn...@gm...> svn:535-541
+ * backport MSVC support
+ * finish strtoll/strtoull replacement with gd_* functions
+ * update CMake instructions
+ * add CMake module which could be used by other CMake based projects
+
2011-03-22 D. V. Wiebe <ge...@ke...> svn:532
GetData-0.7.2rc2.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-22 11:00:48
|
Revision: 541
http://getdata.svn.sourceforge.net/getdata/?rev=541&view=rev
Author: syntheticpp
Date: 2011-03-22 11:00:42 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
add hint how GetData could be found
Modified Paths:
--------------
branches/getdata-0.7/cmake/FindGetData.cmake
Modified: branches/getdata-0.7/cmake/FindGetData.cmake
===================================================================
--- branches/getdata-0.7/cmake/FindGetData.cmake 2011-03-22 10:46:46 UTC (rev 540)
+++ branches/getdata-0.7/cmake/FindGetData.cmake 2011-03-22 11:00:42 UTC (rev 541)
@@ -78,7 +78,7 @@
message(STATUS " includes : ${GETDATA_INCLUDE_DIR}")
message(STATUS " libraries: ${GETDATA_LIBRARIES}")
ELSE()
- MESSAGE(STATUS "Not found: Getdata")
+ MESSAGE(STATUS "Not found: Getdata, set GETDATA_DIR")
ENDIF()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-22 10:46:52
|
Revision: 540
http://getdata.svn.sourceforge.net/getdata/?rev=540&view=rev
Author: syntheticpp
Date: 2011-03-22 10:46:46 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
add cmake module mit MIT license so the will be no problem getting it upstream.
Modified Paths:
--------------
branches/getdata-0.7/README.win
Added Paths:
-----------
branches/getdata-0.7/cmake/FindGetData.cmake
Modified: branches/getdata-0.7/README.win
===================================================================
--- branches/getdata-0.7/README.win 2011-03-22 10:32:10 UTC (rev 539)
+++ branches/getdata-0.7/README.win 2011-03-22 10:46:46 UTC (rev 540)
@@ -121,9 +121,10 @@
The install path could be set via the variable CMAKE_INSTALL_PREFIX.
By default it installs to <build-dir>/INSTALLED.
+The file cmake/FindGetData.cmake could be used in projects managed by
+CMake and which have to search for a GetData installation.
-
PREREQUISITES
=============
Added: branches/getdata-0.7/cmake/FindGetData.cmake
===================================================================
--- branches/getdata-0.7/cmake/FindGetData.cmake (rev 0)
+++ branches/getdata-0.7/cmake/FindGetData.cmake 2011-03-22 10:46:46 UTC (rev 540)
@@ -0,0 +1,85 @@
+# OSI-approved MIT License, http://www.opensource.org/licenses/mit-license
+#
+# Copyright (c) 2011 Peter Kümmel
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+
+include(FindPkgConfig)
+
+pkg_check_modules(PKGGETDATA QUIET getdata>=0.6.0)
+#message(STATUS "GD inc: ${PKGGETDATA_INCLUDEDIR}")
+#message(STATUS "GD libs: ${PKGGETDATA_LIBRARIES}")
+
+
+# Apple: install getdata with --prefix /opt/local
+
+# FIXME: GETDATA_INCLUDEDIR AND GETDATA_LIBRARIES are set by pkg_check_modules, but
+# GETDATA_LIBRARY_C and GETDATA_LIBRARY_CPP are not.
+# Ubuntu: maybe /usr/local/lib/pkgconfig/getdata.pc is not correct
+#if(NOT PKGGETDATA_LIBRARIES)
+ set(PKGGETDATA_LIBRARIES getdata++ getdata)
+ if (UNIX)
+ SET(PKGGETDATA_LIBRARIES ${PKGGETDATA_LIBRARIES} m)
+ endif()
+#endif()
+
+
+set(GETDATA_INCLUDEDIR GETDATA_INCLUDEDIR-NOTFOUND CACHE STRING "" FORCE)
+FIND_PATH(GETDATA_INCLUDEDIR getdata.h
+ HINTS
+ ENV GETDATA_DIR
+ PATH_SUFFIXES include/getdata include
+ PATHS ${kst_3rdparty_dir} ${GETDATA_INCLUDEDIR})
+
+foreach(it ${PKGGETDATA_LIBRARIES})
+ set(lib_release lib_release-NOTFOUND CACHE STRING "" FORCE)
+ FIND_LIBRARY(lib_release ${it}
+ HINTS ENV GETDATA_DIR PATH_SUFFIXES lib
+ PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS})
+ list(APPEND GETDATA_LIBRARIES_RELEASE ${lib_release})
+ list(APPEND GETDATA_LIBRARIES_BOTH optimized ${lib_release})
+ set(lib_debug lib_debug-NOTFOUND CACHE STRING "" FORCE)
+ FIND_LIBRARY(lib_debug ${it}d
+ HINTS ENV GETDATA_DIR PATH_SUFFIXES lib
+ PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS})
+ list(APPEND GETDATA_LIBRARIES_DEBUG ${lib_debug})
+ list(APPEND GETDATA_LIBRARIES_BOTH debug ${lib_debug})
+endforeach()
+
+if(GETDATA_LIBRARIES_DEBUG AND GETDATA_LIBRARIES_RELEASE)
+ set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_BOTH})
+else()
+ set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE})
+endif()
+
+
+IF(GETDATA_INCLUDEDIR AND GETDATA_INCLUDEDIR)
+ SET(GETDATA_INCLUDE_DIR ${GETDATA_INCLUDEDIR})
+ SET(getdata 1)
+ message(STATUS "Found GetData:")
+ message(STATUS " includes : ${GETDATA_INCLUDE_DIR}")
+ message(STATUS " libraries: ${GETDATA_LIBRARIES}")
+ELSE()
+ MESSAGE(STATUS "Not found: Getdata")
+ENDIF()
+
+
+
Property changes on: branches/getdata-0.7/cmake/FindGetData.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-22 10:32:16
|
Revision: 539
http://getdata.svn.sourceforge.net/getdata/?rev=539&view=rev
Author: syntheticpp
Date: 2011-03-22 10:32:10 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
update cmake instructions
Modified Paths:
--------------
branches/getdata-0.7/README.win
Modified: branches/getdata-0.7/README.win
===================================================================
--- branches/getdata-0.7/README.win 2011-03-22 10:09:57 UTC (rev 538)
+++ branches/getdata-0.7/README.win 2011-03-22 10:32:10 UTC (rev 539)
@@ -103,18 +103,27 @@
This package supports building GetData using either Microsoft's Visual C++ compiler
or else the free MinGW compiler, both which produce native Win32 binaries.
-To create a project file for Microsoft Visual Studio 10 execute:
+Best practice is to build out of source. Call CMake in the build folder and
+point it to the 'cmake' folder within the GetData source. For instance,
+to create a project file for Microsoft Visual Studio 10 execute:
- cmake -G"Visual Studio 10" .
+ cmake -G"Visual Studio 10" ..\getdata-0.7\cmake
-from the "cmake" subdirectory of this package. Then build the project as usual.
-The GetData test suite may be run by executing
+Then build the project as usual.
+The GetData test suit could be ebabled by setting the GD_TEST variable:
+
cmake . -DGD_TEST=1
-which will run a series of self-tests.
+In Visual Studio run the test by building the 'RUN_TESTS'. Using mingw
+or nmake run the tests by calling ctest.
+The install path could be set via the variable CMAKE_INSTALL_PREFIX.
+By default it installs to <build-dir>/INSTALLED.
+
+
+
PREREQUISITES
=============
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-22 10:10:03
|
Revision: 538
http://getdata.svn.sourceforge.net/getdata/?rev=538&view=rev
Author: syntheticpp
Date: 2011-03-22 10:09:57 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
merge strto*ll replacement from 0.7 branch
Modified Paths:
--------------
trunk/getdata/cmake/CMakeLists.txt
trunk/getdata/src/internal.h
trunk/getdata/src/msvc/inttypes.h
trunk/getdata/src/parse.c
Modified: trunk/getdata/cmake/CMakeLists.txt
===================================================================
--- trunk/getdata/cmake/CMakeLists.txt 2011-03-22 09:37:28 UTC (rev 537)
+++ trunk/getdata/cmake/CMakeLists.txt 2011-03-22 10:09:57 UTC (rev 538)
@@ -43,6 +43,8 @@
-DHAVE__STAT64
-DHAVE_STRUCT__STAT64
-DHAVE__COMMIT
+ -DHAVE__STRTOI64
+ -DHAVE__STRTOUI64
-DGD_NO_C99_API
)
set(CMAKE_DEBUG_POSTFIX d)
@@ -71,6 +73,8 @@
-DHAVE__COMMIT
-DHAVE__STAT64
-DHAVE_STRUCT___STAT64
+ -DHAVE__STRTOI64
+ -DHAVE__STRTOUI64
-DMKDIR_NO_MODE
)
endif()
Modified: trunk/getdata/src/internal.h
===================================================================
--- trunk/getdata/src/internal.h 2011-03-22 09:37:28 UTC (rev 537)
+++ trunk/getdata/src/internal.h 2011-03-22 10:09:57 UTC (rev 538)
@@ -218,12 +218,21 @@
# endif
#endif
-#ifndef HAVE_STRTOLL
-# define strtoll strtol
+
+#ifdef HAVE__STRTOI64
+# define gd_strtoll _strtoi64
+#elif defined(HAVE_STRTOLL)
+# define gd_strtoll strtoll
+#else
+# define gd_strtoll strtol
#endif
-#ifndef HAVE_STRTOULL
-# define stroull strtoul
+#ifdef HAVE__STRTOUI64
+# define gd_strtoull _strtoi64
+#elif defined(HAVE_STRTOULL)
+# define gd_strtoull strtoull
+#else
+# define gd_strtoull strtoul
#endif
#if defined __MSVCRT__ && defined HAVE__FDOPEN
Modified: trunk/getdata/src/msvc/inttypes.h
===================================================================
--- trunk/getdata/src/msvc/inttypes.h 2011-03-22 09:37:28 UTC (rev 537)
+++ trunk/getdata/src/msvc/inttypes.h 2011-03-22 10:09:57 UTC (rev 538)
@@ -302,6 +302,5 @@
#define wcstoimax _wcstoi64
#define wcstoumax _wcstoui64
-#define strtoull _strtoui64
#endif // _MSC_INTTYPES_H_ ]
Modified: trunk/getdata/src/parse.c
===================================================================
--- trunk/getdata/src/parse.c 2011-03-22 09:37:28 UTC (rev 537)
+++ trunk/getdata/src/parse.c 2011-03-22 10:09:57 UTC (rev 538)
@@ -155,7 +155,7 @@
_GD_InternalError(D);
} else if (type & GD_SIGNED) {
/* try to convert to long long int */
- long long int lli = strtoll(token, &ptr, 10);
+ long long int lli = gd_strtoll(token, &ptr, 10);
/* there were trailing characters in the long long int */
if (*ptr != '\0') {
@@ -175,7 +175,7 @@
_GD_InternalError(D);
} else {
/* try to convert to unsigned long long int */
- unsigned long long int ulli = strtoull(token, &ptr, 10);
+ unsigned long long int ulli = gd_strtoull(token, &ptr, 10);
/* there were trailing characters in the unsigned long long int */
if (*ptr != '\0') {
@@ -1742,7 +1742,7 @@
#endif
}
} else if (strcmp(ptr, "FRAMEOFFSET") == 0 && (!pedantic || *standards >= 1))
- D->fragment[me].frame_offset = strtoll(in_cols[1], NULL, 10);
+ D->fragment[me].frame_offset = gd_strtoll(in_cols[1], NULL, 10);
else if (strcmp(ptr, "INCLUDE") == 0 && (!pedantic || *standards >= 3)) {
unsigned long subflags = D->fragment[me].encoding | D->fragment[me].byte_sex
| (*flags & (GD_PEDANTIC | GD_PERMISSIVE | GD_FORCE_ENDIAN |
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-22 09:37:34
|
Revision: 537
http://getdata.svn.sourceforge.net/getdata/?rev=537&view=rev
Author: syntheticpp
Date: 2011-03-22 09:37:28 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
backport msvc fixes to 0.7.2
Modified Paths:
--------------
branches/getdata-0.7/cmake/CMakeLists.txt
branches/getdata-0.7/src/getdata.h.in
Modified: branches/getdata-0.7/cmake/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-22 09:32:12 UTC (rev 536)
+++ branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-22 09:37:28 UTC (rev 537)
@@ -28,19 +28,7 @@
-DPACKAGE_VERSION=\"0.7.2\"
-DPACKAGE_BUGREPORT=\"get...@li...\")
-## Substitutions needed to build getdata.h
-# build in ANSI C mode
-set(DEFINE_GD_NO_C99_API "#define GD_NO_C99_API")
-# kst2 doesn't need the legacy API
-set(DEFINE_GD_LEGACY_API "/* #undef GD_LEGACY_API */")
-
-# MSVCRT integer types
-set(DEFINE_gd_int16_t "#define gd_int16_t short int")
-set(DEFINE_gd_uint16_t "#define gd_int16_t unsigned short int")
-set(DEFINE_gd_int64_t "#define gd_int64_t __int64")
-
-
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
add_definitions(
@@ -55,8 +43,9 @@
-DHAVE__STAT64
-DHAVE_STRUCT__STAT64
-DHAVE__COMMIT
- -DHAVE__STRTOI64
- -DHAVE__STRTOUI64
+ -DHAVE__STRTOI64
+ -DHAVE__STRTOUI64
+ -DGD_NO_C99_API
)
set(CMAKE_DEBUG_POSTFIX d)
@@ -83,8 +72,8 @@
-DHAVE_DIRENT_H
-DHAVE__COMMIT
-DHAVE__STAT64
- -DHAVE__STRTOI64
- -DHAVE__STRTOUI64
+ -DHAVE__STRTOI64
+ -DHAVE__STRTOUI64
-DHAVE_STRUCT___STAT64
-DMKDIR_NO_MODE
)
Modified: branches/getdata-0.7/src/getdata.h.in
===================================================================
--- branches/getdata-0.7/src/getdata.h.in 2011-03-22 09:32:12 UTC (rev 536)
+++ branches/getdata-0.7/src/getdata.h.in 2011-03-22 09:37:28 UTC (rev 537)
@@ -56,7 +56,7 @@
#include <sys/types.h>
/* If this symbol is defined here, the C99-API is not present in the library */
-@DEFINE_GD_NO_C99_API@
+#undef GD_NO_C99_API /**/
#if defined(GD_NO_C99_API) && ! defined(GD_C89_API)
# define GD_C89_API
@@ -227,9 +227,15 @@
/* GD_NO_ENTRY is not part of this count */
#define GD_N_ENTYPES 14
-@DEFINE_gd_int16_t@
-@DEFINE_gd_uint16_t@
-@DEFINE_gd_int64_t@
+#if defined(__MINGW32__) || defined(_MSC_VER)
+typedef short _gd_int16_t;
+typedef unsigned short _gd_uint16_t;
+typedef __int64 _gd_int64_t;
+#else
+#undef _gd_int16_t /**/
+#undef _gd_uint16_t /**/
+#undef _gd_int64_t /**/
+#endif
#if ! defined GD_C89_API
# include <inttypes.h>
@@ -241,9 +247,9 @@
#else
# define GD_DCOMPLEXM(v) double v[2]
# define GD_DCOMPLEXP(v) double *v
-typedef gd_int16_t gd_bit_t;
-typedef gd_uint16_t gd_spf_t;
-typedef gd_int64_t gd_shift_t;
+typedef _gd_int16_t gd_bit_t;
+typedef _gd_uint16_t gd_spf_t;
+typedef _gd_int64_t gd_shift_t;
#endif
/* Data types -- No valid type may set 0x40 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-22 09:32:18
|
Revision: 536
http://getdata.svn.sourceforge.net/getdata/?rev=536&view=rev
Author: syntheticpp
Date: 2011-03-22 09:32:12 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
fix wrong usage of gd_strtoull, replace strtoull
Modified Paths:
--------------
branches/getdata-0.7/src/parse.c
Modified: branches/getdata-0.7/src/parse.c
===================================================================
--- branches/getdata-0.7/src/parse.c 2011-03-22 09:16:34 UTC (rev 535)
+++ branches/getdata-0.7/src/parse.c 2011-03-22 09:32:12 UTC (rev 536)
@@ -154,7 +154,7 @@
_GD_InternalError(D);
} else if (type & GD_SIGNED) {
/* try to convert to long long int */
- long long int lli = gd_strtoull(token, &ptr, 10);
+ long long int lli = gd_strtoll(token, &ptr, 10);
/* there were trailing characters in the long long int */
if (*ptr != '\0') {
@@ -174,7 +174,7 @@
_GD_InternalError(D);
} else {
/* try to convert to unsigned long long int */
- unsigned long long int ulli = strtoull(token, &ptr, 10);
+ unsigned long long int ulli = gd_strtoull(token, &ptr, 10);
/* there were trailing characters in the unsigned long long int */
if (*ptr != '\0') {
@@ -1738,7 +1738,7 @@
#endif
}
} else if (strcmp(ptr, "FRAMEOFFSET") == 0 && (!pedantic || *standards >= 1))
- D->fragment[me].frame_offset = gd_strtoull(in_cols[1], NULL, 10);
+ D->fragment[me].frame_offset = gd_strtoll(in_cols[1], NULL, 10);
else if (strcmp(ptr, "INCLUDE") == 0 && (!pedantic || *standards >= 3)) {
unsigned long subflags = D->fragment[me].encoding | D->fragment[me].byte_sex
| (*flags & (GD_PEDANTIC | GD_PERMISSIVE | GD_FORCE_ENDIAN |
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
