Skip to content
Permalink
Browse files

Added C99 snprintf library to the ThirdParty/c99_snprintf. See #2570

  • Loading branch information
iakov
iakov committed Jun 5, 2013
1 parent 825085c commit 3376da90f3cae690cd04094c5ba8373c0e832548
@@ -175,6 +175,8 @@ if(NOT FMILIB_STATIC_LIB_ONLY)
add_definitions(-DFMILIB_BUILDING_LIBRARY)
endif()

add_subdirectory(ThirdParty/c99_snprintf)

SET(CMAKE_MODULE_PATH ${FMILIBRARYHOME}/Config.cmake)

include(jmutil)
@@ -226,7 +228,7 @@ configure_file (
"${FMILibrary_BINARY_DIR}/fmilib_config.h"
)

set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} expat minizip zlib)
set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} expat minizip zlib c99snprintf)
set(FMILIB_SUBLIBS ${FMIIMPORT_LIBRARIES} ${JMUTIL_LIBRARIES} ${FMILIB_SHARED_SUBLIBS})
set(FMILIB_SHARED_SRC ${FMIIMPORTSOURCE} ${JMUTILSOURCE} ${FMIIMPORTHEADERS})

@@ -60,6 +60,8 @@ if(CYGWIN)
message("not tested")
endif(CYGWIN)

target_link_libraries(jmutils c99snprintf)

if(UNIX)
target_link_libraries(jmutils dl)
endif(UNIX)
@@ -23,3 +23,9 @@ Condition of use and distribution are the same as Zlib
The unziping is performed by using Zlib library called via \e minizip library.\n
Homepage: <http://www.zlib.net/>.\n
Zlib License: <http://www.zlib.net/zlib_license.html>.

- \b C99 snprintf \n
C99 snprintf library is used to realize the snprintf functionality staying with C89
code.\n
Homepage: http://www.jhweiss.de/software/snprintf.html \n
The code is free to use. See notice in the COPYING file included with the code.
@@ -0,0 +1,25 @@
# Copyright (C) 2012 Modelon AB

# This program is free software: you can redistribute it and/or modify
# it under the terms of the BSD style license.

# # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# FMILIB_License.txt file for more details.

# You should have received a copy of the FMILIB_License.txt file
# along with this program. If not, contact Modelon AB <http://www.modelon.com>.

if(NOT C99SNPRINTFDIR)
set(C99SNPRINTFDIR ${FMILIBRARYHOME}/ThirdParty/c99_snprintf)
set(C99SNPRINTF_LIBRARIES c99snprintf)

add_library(c99snprintf c99-snprintf_1.1/snprintf.c)

if(CYGWIN)
message("not tested")
endif(CYGWIN)

endif()

@@ -0,0 +1,9 @@
Patrick Powell <papowell@astart.com>
Brandon Long <blong@fiction.net>
Thomas Roessler <roessler@does-not-exist.org>
Michael Elkins <me@mutt.org>
Andrew Tridgell <tridge@samba.org>
Russ Allbery <rra@stanford.edu>
Hrvoje Niksic <hniksic@xemacs.org>
Damien Miller <djm@mindrot.org>
Holger Weiss <holger@jhweiss.de>
@@ -0,0 +1,3 @@
UNLESS SPECIFIED OTHERWISE IN THE INDIVIDUAL SOURCE FILES INCLUDED WITH
THIS PACKAGE, they may freely be used, modified and/or redistributed for
any purpose.
@@ -0,0 +1,57 @@
2008-01-20 Holger Weiss <holger@jhweiss.de>

* configure.ac, snprintf.c: Release 1.1.

2008-01-20 Holger Weiss <holger@jhweiss.de>

* snprintf.c: Fix typo (INTMAX_MAX vs. UINTMAX_MAX).

2008-01-19 Holger Weiss <holger@jhweiss.de>

* snprintf.c: If lc->thousands_sep is a NULL pointer, use ",".

2008-01-19 Holger Weiss <holger@jhweiss.de>

* snprintf.c: Make sure the value returned by getexponent() will be
in the range of -99 to 99 under all circumstances and omit the now
completely redundant checks for overflow of the econvert buffer
(which holds the exponent).

2008-01-19 Holger Weiss <holger@jhweiss.de>

* snprintf.c: In printsep(), make sure that lc->thousands_sep is
not a NULL pointer before using it. Also, if it points to a
multi-character separator, simply call OUTCHAR() for each
character; using fmtstr() in this case (as we did before) doesn't
gain anything.

2008-01-16 Holger Weiss <holger@jhweiss.de>

* snprintf.c: Fix the infinity detection on IRIX (and possibly
other systems).

2008-01-12 Holger Weiss <holger@jhweiss.de>

* snprintf.c: Minor comment fixes.

2008-01-12 Holger Weiss <holger@jhweiss.de>

* snprintf.c: Setting *overflow to 1 in cast() was redundant as
returning INTMAX_MAX signals overflow already (a regular conversion
to INTMAX_MAX is not supported).

2008-01-11 Holger Weiss <holger@jhweiss.de>

* test.sh: Don't force strict C89, as we want to test "long long"
support, for example.

2008-01-06 Holger Weiss <holger@jhweiss.de>

* ChangeLog: Release 1.0.

2008-01-06 Holger Weiss <holger@jhweiss.de>

* AUTHORS, COPYING, ChangeLog, INSTALL, Makefile.am, NEWS, README,
autogen.sh, configure.ac, example.c, snprintf.c, system.h, test.sh,
m4/snprintf.m4: Initial revision

@@ -0,0 +1,234 @@
Installation Instructions
*************************

Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006 Free Software Foundation, Inc.

This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.

Basic Installation
==================

Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.

The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').

It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.

If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.

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'.

The simplest way to compile this package is:

1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.

Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.

2. Type `make' to compile the package.

3. Optionally, type `make check' to run any self-tests that come with
the package.

4. Type `make install' to install the programs and any data files and
documentation.

5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.

Compilers and Options
=====================

Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.

You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:

./configure CC=c99 CFLAGS=-g LIBS=-lposix

*Note Defining Variables::, for more details.

Compiling For Multiple Architectures
====================================

You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.

With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.

Installation Names
==================

By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.

You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.

In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.

If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.

Optional Features
=================

Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.

For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.

Specifying the System Type
==========================

There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:

CPU-COMPANY-SYSTEM

where SYSTEM can have one of these forms:

OS KERNEL-OS

See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.

If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.

If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.

Sharing Defaults
================

If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.

Defining Variables
==================

Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:

./configure CC=/usr/local2/bin/gcc

causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).

Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:

CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash

`configure' Invocation
======================

`configure' recognizes the following options to control how it operates.

`--help'
`-h'
Print a summary of the options to `configure', and exit.

`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.

`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.

`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.

`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).

`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.

`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

@@ -0,0 +1,8 @@
# $Id: Makefile.am,v 1.1.1.1 2008/01/06 03:24:00 holger Exp $

bin_PROGRAMS = example
pkgdata_DATA = AUTHORS ChangeLog COPYING NEWS README
example_SOURCES = example.c system.h
example_LDADD = $(LIBOBJS)
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = autogen.sh test.sh

0 comments on commit 3376da9

Please sign in to comment.
You can’t perform that action at this time.