stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trunk: build system updates 

* version number set to "4.1-unstable" in the configure.ac file
* the configure script generates dynare_version.m
* the configure script generates windows/dynare-version.nsi, for the windows installer


git-svn-id: https://www.dynare.org/svn/dynare/trunk@2735 ac1d8469-bf42-47a9-8791-bf33cf982152
time-shift
sebastien 2009-06-08 16:43:24 +00:00
parent b710347869
commit cd49809994
5 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for dynare 4.1-Prerelease. # Generated by GNU Autoconf 2.63 for dynare 4.1-unstable.
# #
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='dynare' PACKAGE_NAME='dynare'
PACKAGE_TARNAME='dynare' PACKAGE_TARNAME='dynare'
PACKAGE_VERSION='4.1-Prerelease' PACKAGE_VERSION='4.1-unstable'
PACKAGE_STRING='dynare 4.1-Prerelease' PACKAGE_STRING='dynare 4.1-unstable'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
ac_unique_file="preprocessor/DynareMain.cc" ac_unique_file="preprocessor/DynareMain.cc"
@ -1264,7 +1264,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures dynare 4.1-Prerelease to adapt to many kinds of systems. \`configure' configures dynare 4.1-unstable to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1329,7 +1329,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of dynare 4.1-Prerelease:";; short | recursive ) echo "Configuration of dynare 4.1-unstable:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1408,7 +1408,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
dynare configure 4.1-Prerelease dynare configure 4.1-unstable
generated by GNU Autoconf 2.63 generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1422,7 +1422,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by dynare $as_me 4.1-Prerelease, which was It was created by dynare $as_me 4.1-unstable, which was
generated by GNU Autoconf 2.63. Invocation command line was generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@ $ $0 $@
@ -3955,7 +3955,7 @@ $as_echo "$as_me: WARNING: The creation of the HTML version will be very slow! Y
fi fi
fi fi
ac_config_files="$ac_config_files Makefile preprocessor/Makefile doc/Makefile doc/preprocessor/Makefile doc/macroprocessor/Makefile doc/userguide/Makefile" ac_config_files="$ac_config_files Makefile preprocessor/Makefile doc/Makefile doc/preprocessor/Makefile doc/macroprocessor/Makefile doc/userguide/Makefile matlab/dynare_version.m windows/dynare-version.nsi"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
@ -4413,7 +4413,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by dynare $as_me 4.1-Prerelease, which was This file was extended by dynare $as_me 4.1-unstable, which was
generated by GNU Autoconf 2.63. Invocation command line was generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -4463,7 +4463,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\ ac_cs_version="\\
dynare config.status 4.1-Prerelease dynare config.status 4.1-unstable
configured by $0, generated by GNU Autoconf 2.63, configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -4572,6 +4572,8 @@ do
"doc/preprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES doc/preprocessor/Makefile" ;; "doc/preprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES doc/preprocessor/Makefile" ;;
"doc/macroprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES doc/macroprocessor/Makefile" ;; "doc/macroprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES doc/macroprocessor/Makefile" ;;
"doc/userguide/Makefile") CONFIG_FILES="$CONFIG_FILES doc/userguide/Makefile" ;; "doc/userguide/Makefile") CONFIG_FILES="$CONFIG_FILES doc/userguide/Makefile" ;;
"matlab/dynare_version.m") CONFIG_FILES="$CONFIG_FILES matlab/dynare_version.m" ;;
"windows/dynare-version.nsi") CONFIG_FILES="$CONFIG_FILES windows/dynare-version.nsi" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

11
configure.ac
View File

@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([dynare], [4.1-Prerelease]) AC_INIT([dynare], [4.1-unstable])
AC_CONFIG_SRCDIR([preprocessor/DynareMain.cc]) AC_CONFIG_SRCDIR([preprocessor/DynareMain.cc])
AC_PROG_CXX AC_PROG_CXX
@ -61,6 +61,13 @@ then
fi fi
fi fi
AC_CONFIG_FILES([Makefile preprocessor/Makefile doc/Makefile doc/preprocessor/Makefile doc/macroprocessor/Makefile doc/userguide/Makefile]) AC_CONFIG_FILES([Makefile
preprocessor/Makefile
doc/Makefile
doc/preprocessor/Makefile
doc/macroprocessor/Makefile
doc/userguide/Makefile
matlab/dynare_version.m
windows/dynare-version.nsi])
AC_OUTPUT AC_OUTPUT

2
matlab/dynare_version.m → matlab/dynare_version.m.in
View File

@ -28,4 +28,4 @@ function v = dynare_version
% You should have received a copy of the GNU General Public License % You should have received a copy of the GNU General Public License
% along with Dynare. If not, see <http://www.gnu.org/licenses/>. % along with Dynare. If not, see <http://www.gnu.org/licenses/>.
v = '4.1-Prerelease'; v = '@PACKAGE_VERSION@';

3
windows/dynare-version.nsi.in Normal file
View File

@ -0,0 +1,3 @@
# This file is processed by the configure script to create dynare-version.nsi
!define VERSION "@PACKAGE_VERSION@"

2
windows/dynare.nsi
View File

@ -10,7 +10,7 @@
# - run "makensis dynare.nsi" to create the installer # - run "makensis dynare.nsi" to create the installer
# - if there is no failure, this will create a file "dynare-VERSION-win32.exe" in the current directory # - if there is no failure, this will create a file "dynare-VERSION-win32.exe" in the current directory
!define VERSION "4.svn20080629" !include dynare-version.nsi
Name "Dynare ${VERSION}" Name "Dynare ${VERSION}"