Changeset 127


Ignore:
Timestamp:
Jul 22, 2010 5:21:50 PM (9 years ago)
Author:
kulshres
Message:

Squashed merge of branch 'master' of 'gitclone' into svn

  • 'master' of 'gitclone': (5 commits) execute perms for script add script to update versions in the documentation remove deleted files from dist remove old scripts make a mechanism to update versions all over the place

Details of the commits:

commit 64edab830585174ef8f0b202e69becd20d56d34b
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Jul 22 22:40:54 2010 +0200

execute perms for script

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 181366b2473c74e676367693e5dbd78253f64d31
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Jul 22 22:37:12 2010 +0200

add script to update versions in the documentation

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 6fe63e6a17039b960d55134fbd2c3bdd55d1a515
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Jul 22 22:36:04 2010 +0200

remove deleted files from dist

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit dd0d8aae0514f60d781b1ab28e8be8f72371aca6
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Jul 22 22:34:27 2010 +0200

remove old scripts

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit ce16a4d6adc04012c95cd5e814616627a886f34c
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Jul 22 22:33:35 2010 +0200

make a mechanism to update versions all over the place

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
trunk
Files:
2 added
2 deleted
6 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/doc/adolc-manual.tex

    r115 r127  
    1 % Latex file containing the documentation of ADOL-C version 2.1.6
     1% Latex file containing the documentation of ADOL-C
    22%
    33% Copyright (C) Andrea Walther, Andreas Griewank, Andreas Kowarz,
     
    1313\usepackage{amsmath,amsthm,amssymb}
    1414\usepackage{graphicx}
     15\usepackage{datetime}
     16
     17\newdateformat{monthyear}{\monthname\ \THEYEAR}
    1518
    1619\usepackage{color}
     
    3841\setcounter{equation}{0}
    3942
     43\input{version.tex}
    4044
    4145%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     
    5559{\Large of Algorithms Written in C/C++}\\
    5660\vspace{.2in}
    57 {\large\bf  Version 2.1.6, July 2010} \\
     61{\large\bf  Version \packageversion, \monthyear\today} \\
    5862\bigskip
    5963 \mbox{Andrea Walther}\footnote{Institute of Mathematics, University
     
    33663370\end{center}
    33673371Executing this three steps from the package base directory
    3368 \verb=</SOMEPATH/ADOL-C-2.1.6>= will compile the static and the dynamic
     3372\verb=</SOMEPATH/=\texttt{\packagetar}\verb=>= will compile the static and the dynamic
    33693373ADOL-C library with default options and install the package (libraries
    33703374and headers) into the default installation directory {\tt
     
    34073411be used for linking.
    34083412 
    3409 %Then it is assumed that the ColPack library
    3410 %available at
    3411 %\verb=http://www.cscapes.org/coloringpage/software.htm= is
    3412 %located in the path \verb=<\$HOME/adolc_base/lib>=. Furthermore a
    3413 %copy of all header files of ColPack is assumed to be found in
    3414 %the directory \verb=</SOMEPATH/ADOL-C-2.1.0/ThirdParty/ColPack/include>=.
    3415 %
    34163413\subsection{Compiling and Linking the Example Programs}
    34173414%
    34183415The installation procedure described in \autoref{genlib} also
    34193416provides the \verb=Makefile=s  to compile the example programs in the
    3420 directories \verb=<ADOL-C-2.1.6>/ADOL-C/examples= and the
     3417directories \verb=<=\texttt{\packagetar}\verb=>/ADOL-C/examples= and the
    34213418additional examples in
    3422 \verb=<ADOL-C-2.1.6>/ADOL-C/examples/additional_examples=. However,
     3419\verb=<=\texttt{\packagetar}\verb=>/ADOL-C/examples/additional_examples=. However,
    34233420one has to execute the
    34243421\verb=configure= command with  appropriate options for the ADOL-C package to enable the compilation of
     
    37143711The following listings are all simplified versions of codes that
    37153712are contained in the example subdirectory
    3716 \verb=<ADOL-C-2.1.6>/ADOL-C/examples= of ADOL-C. In particular,
     3713\verb=<=\texttt{\packagetar}\verb=>/ADOL-C/examples= of ADOL-C. In particular,
    37173714we have left out timings, which are included in the complete codes.
    37183715%
  • trunk/Makefile.am

    r106 r127  
    1313AUTOMAKE_OPTIONS     = foreign
    1414
    15 EXTRA_DIST           = TODO BUGS  make_32 make_64 \
     15EXTRA_DIST           = TODO BUGS update_versions.sh \
     16                       ADOL-C/doc/version.tex.in ADOL-C/doc/version.tex \
    1617                       autoconf/shave.in autoconf/shave-libtool.in \
    1718                       autoconf/dolt.m4 autoconf/shave.m4 \
    1819                       windows/adolc.sln windows/adolc.vcxproj \
     20                       windows/sparse/config.h.in windows/nosparse/config.h.in \
     21                       windows/x64/sparse/config.h.in windows/x64/nosparse/config.h.in \
    1922                       windows/sparse/config.h windows/nosparse/config.h \
    2023                       windows/x64/sparse/config.h windows/x64/nosparse/config.h \
  • trunk/README

    r106 r127  
    11
    2      ADOL-C Version 2.1.0
     2     ADOL-C
    33
    44This new version of ADOL-C features new library functions for
  • trunk/configure.ac

    r125 r127  
    8484AC_DEFINE(ADOLC_SUBVERSION,ADOLC_SUB,[ADOL-C Subversion])
    8585AC_DEFINE(ADOLC_PATCHLEVEL,ADOLC_LVL,[ADOL-C Patchlevel])
     86ADOLC_VERSION=ADOLC_VER
     87ADOLC_SUBVERSION=ADOLC_SUB
     88ADOLC_PATCHLEVEL=ADOLC_LVL
     89AC_SUBST(ADOLC_VERSION)
     90AC_SUBST(ADOLC_SUBVERSION)
     91AC_SUBST(ADOLC_PATCHLEVEL)
    8692
    8793AC_MSG_CHECKING(whether to use ADOL-C debug mode)
     
    158164CFLAGS="$CFLAGS $COLPACK_CFLAGS"
    159165LDFLAGS="$LDFLAGS $COLPACK_LIBS"
     166echo "will test for linking with -lColPack from $colpack/${_lib}"
    160167AC_CHECK_LIB([ColPack], [_ZN7ColPack9GraphCore12GetInputFileEv], [have_colpack=yes], [have_colpack=no])
    161168CFLAGS=$save_CFLAGS
     
    328335                ADOL-C/src/sparse/Makefile
    329336                ADOL-C/src/tapedoc/Makefile
     337                ADOL-C/doc/version.tex
    330338                ADOL-C/examples/Makefile
    331339                ADOL-C/examples/additional_examples/Makefile
     
    348356                ADOL-C/examples/additional_examples/pow/Makefile
    349357                ADOL-C/examples/additional_examples/timing/Makefile
    350                 ADOL-C/test/Makefile)
     358                ADOL-C/test/Makefile
     359                windows/sparse/config.h
     360                windows/nosparse/config.h
     361                windows/x64/sparse/config.h
     362                windows/x64/nosparse/config.h
     363)
    351364
    352365AC_OUTPUT
  • trunk/windows/nosparse/config.h.in

    r125 r127  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 5
     14#define ADOLC_PATCHLEVEL @ADOLC_PATCHLEVEL@
    1515
    1616/* ADOL-C safe extern mode */
     
    1818
    1919/* ADOL-C Subversion */
    20 #define ADOLC_SUBVERSION 1
     20#define ADOLC_SUBVERSION @ADOLC_SUBVERSION@
    2121
    2222/* ADOL-C thread save errno mode */
     
    2424
    2525/* ADOL-C Version */
    26 #define ADOLC_VERSION 2
     26#define ADOLC_VERSION @ADOLC_VERSION@
    2727
    2828/* Define to 1 if you have the <dlfcn.h> header file. */
     
    108108
    109109/* Name of package */
    110 #define PACKAGE "adolc"
     110#define PACKAGE "@PACKAGE@"
    111111
    112112/* Define to the address where bug reports for this package should be sent. */
    113 #define PACKAGE_BUGREPORT "adol-c@list.coin-or.org"
     113#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
    114114
    115115/* Define to the full name of this package. */
    116 #define PACKAGE_NAME "adolc"
     116#define PACKAGE_NAME "@PACKAGE_NAME@"
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.5-trunk"
     119#define PACKAGE_STRING "@PACKAGE_STRING@"
    120120
    121121/* Define to the one symbol short name of this package. */
    122 #define PACKAGE_TARNAME "adolc"
     122#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.5-trunk"
     125#define PACKAGE_VERSION "@PACKAGE_VERSION@"
    126126
    127127/* Define to 1 if you have the ANSI C header files. */
     
    135135
    136136/* Version number of package */
    137 #define VERSION "2.1.5-trunk"
     137#define VERSION "@VERSION@"
    138138
    139139/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/windows/sparse/config.h.in

    r125 r127  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 5
     14#define ADOLC_PATCHLEVEL @ADOLC_PATCHLEVEL@
    1515
    1616/* ADOL-C safe extern mode */
     
    1818
    1919/* ADOL-C Subversion */
    20 #define ADOLC_SUBVERSION 1
     20#define ADOLC_SUBVERSION @ADOLC_SUBVERSION@
    2121
    2222/* ADOL-C thread save errno mode */
     
    2424
    2525/* ADOL-C Version */
    26 #define ADOLC_VERSION 2
     26#define ADOLC_VERSION @ADOLC_VERSION@
    2727
    2828/* Define to 1 if you have the <dlfcn.h> header file. */
     
    108108
    109109/* Name of package */
    110 #define PACKAGE "adolc"
     110#define PACKAGE "@PACKAGE@"
    111111
    112112/* Define to the address where bug reports for this package should be sent. */
    113 #define PACKAGE_BUGREPORT "adol-c@list.coin-or.org"
     113#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
    114114
    115115/* Define to the full name of this package. */
    116 #define PACKAGE_NAME "adolc"
     116#define PACKAGE_NAME "@PACKAGE@"
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.5-trunk"
     119#define PACKAGE_STRING "@PACKAGE_STRING@"
    120120
    121121/* Define to the one symbol short name of this package. */
    122 #define PACKAGE_TARNAME "adolc"
     122#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.5-trunk"
     125#define PACKAGE_VERSION "@PACKAGE_VERSION@"
    126126
    127127/* Define to 1 if you have the ANSI C header files. */
     
    135135
    136136/* Version number of package */
    137 #define VERSION "2.1.5-trunk"
     137#define VERSION "@VERSION@"
    138138
    139139/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/windows/x64/nosparse/config.h.in

    r125 r127  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 5
     14#define ADOLC_PATCHLEVEL @ADOLC_PATCHLEVEL@
    1515
    1616/* ADOL-C safe extern mode */
     
    1818
    1919/* ADOL-C Subversion */
    20 #define ADOLC_SUBVERSION 1
     20#define ADOLC_SUBVERSION @ADOLC_SUBVERSION@
    2121
    2222/* ADOL-C thread save errno mode */
     
    2424
    2525/* ADOL-C Version */
    26 #define ADOLC_VERSION 2
     26#define ADOLC_VERSION @ADOLC_VERSION@
    2727
    2828/* Define to 1 if you have the <dlfcn.h> header file. */
     
    108108
    109109/* Name of package */
    110 #define PACKAGE "adolc"
     110#define PACKAGE "@PACKAGE@"
    111111
    112112/* Define to the address where bug reports for this package should be sent. */
    113 #define PACKAGE_BUGREPORT "adol-c@list.coin-or.org"
     113#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
    114114
    115115/* Define to the full name of this package. */
    116 #define PACKAGE_NAME "adolc"
     116#define PACKAGE_NAME "@PACKAGE_NAME@"
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.5-trunk"
     119#define PACKAGE_STRING "@PACKAGE_STRING@"
    120120
    121121/* Define to the one symbol short name of this package. */
    122 #define PACKAGE_TARNAME "adolc"
     122#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.5-trunk"
     125#define PACKAGE_VERSION "@PACKAGE_VERSION@"
    126126
    127127/* Define to 1 if you have the ANSI C header files. */
     
    135135
    136136/* Version number of package */
    137 #define VERSION "2.1.5-trunk"
     137#define VERSION "@VERSION@"
    138138
    139139/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/windows/x64/sparse/config.h.in

    r125 r127  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 5
     14#define ADOLC_PATCHLEVEL @ADOLC_PATCHLEVEL@
    1515
    1616/* ADOL-C safe extern mode */
     
    1818
    1919/* ADOL-C Subversion */
    20 #define ADOLC_SUBVERSION 1
     20#define ADOLC_SUBVERSION @ADOLC_SUBVERSION@
    2121
    2222/* ADOL-C thread save errno mode */
     
    2424
    2525/* ADOL-C Version */
    26 #define ADOLC_VERSION 2
     26#define ADOLC_VERSION @ADOLC_VERSION@
    2727
    2828/* Define to 1 if you have the <dlfcn.h> header file. */
     
    108108
    109109/* Name of package */
    110 #define PACKAGE "adolc"
     110#define PACKAGE "@PACKAGE@"
    111111
    112112/* Define to the address where bug reports for this package should be sent. */
    113 #define PACKAGE_BUGREPORT "adol-c@list.coin-or.org"
     113#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
    114114
    115115/* Define to the full name of this package. */
    116 #define PACKAGE_NAME "adolc"
     116#define PACKAGE_NAME "@PACKAGE_NAME@"
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.5-trunk"
     119#define PACKAGE_STRING "@PACKAGE_STRING@"
    120120
    121121/* Define to the one symbol short name of this package. */
    122 #define PACKAGE_TARNAME "adolc"
     122#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.5-trunk"
     125#define PACKAGE_VERSION "@PACKAGE_VERSION@"
    126126
    127127/* Define to 1 if you have the ANSI C header files. */
     
    135135
    136136/* Version number of package */
    137 #define VERSION "2.1.5-trunk"
     137#define VERSION "@VERSION@"
    138138
    139139/* Define to empty if `const' does not conform to ANSI C. */
Note: See TracChangeset for help on using the changeset viewer.