Skip to content

Commit

Permalink
Changing version number, re-running autotools, preparing for release
Browse files Browse the repository at this point in the history
  • Loading branch information
tkralphs committed Jan 12, 2018
1 parent 09c69a9 commit 18bfa6a
Show file tree
Hide file tree
Showing 9 changed files with 133 additions and 135 deletions.
3 changes: 2 additions & 1 deletion Alps/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
# Authors: #
# #
# Yan Xu, Lehigh University #
# Aykut Bulut, Lehigh University #
# Ted Ralphs, Lehigh University #
# #
# Conceptual Design: #
Expand All @@ -33,7 +34,7 @@
# Matthew Saltzman, Clemson University #
# #
# #
# Copyright (C) 2001-2017, Lehigh University, Yan Xu, and Ted Ralphs. #
# Copyright (C) 2001-2018, Lehigh University, Yan Xu, and Ted Ralphs. #
# All Rights Reserved. #
#==========================================================================#

Expand Down
129 changes: 68 additions & 61 deletions Alps/configure

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Alps/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

AC_PREREQ(2.59)

AC_INIT([Alps],[trunk],[https://projects.coin-or.org/CHiPPS/newticket])
AC_INIT([Alps],[2.0.0],[https://github.com/coin-or/CHiPPS-ALPS/issues/new])

AC_COPYRIGHT([
/*===========================================================================*
Expand Down
1 change: 1 addition & 0 deletions Alps/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
# Authors: #
# #
# Yan Xu, Lehigh University #
# Aykut Bulut, Lehigh University #
# Ted Ralphs, Lehigh University #
# #
# Conceptual Design: #
Expand Down
8 changes: 4 additions & 4 deletions Alps/test/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
# Authors: #
# #
# Yan Xu, Lehigh University #
# Aykut Bulut, Lehigh University #
# Ted Ralphs, Lehigh University #
# #
# Conceptual Design: #
Expand All @@ -33,7 +34,7 @@
# Matthew Saltzman, Clemson University #
# #
# #
# Copyright (C) 2001-2017, Lehigh University, Yan Xu, and Ted Ralphs. #
# Copyright (C) 2001-2018, Lehigh University, Yan Xu, and Ted Ralphs. #
# All Rights Reserved. #
#==========================================================================#

Expand Down Expand Up @@ -329,6 +330,8 @@ AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` \

# This line is necessary to allow VPATH compilation
DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
@COIN_HAS_MPI_FALSE@UNIT_TEST_CMD = ./unitTest$(EXEEXT) -param ../examples/Abc/abc.par
@COIN_HAS_MPI_TRUE@UNIT_TEST_CMD = $MPICXX -n 2 ./unitTest$(EXEEXT) -param ../examples/Abc/abc.par

########################################################################
# Cleaning stuff #
Expand Down Expand Up @@ -597,9 +600,6 @@ uninstall-am: uninstall-info-am
uninstall-info-am


@COIN_HAS_MPI_TRUE@UNIT_TEST_CMD=$MPICXX -n 2 ./unitTest$(EXEEXT) -param ../examples/Abc/abc.par
@COIN_HAS_MPI_FALSE@UNIT_TEST_CMD=./unitTest$(EXEEXT) -param ../examples/Abc/abc.par

all: test

test: unitTest$(EXEEXT)
Expand Down
3 changes: 2 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
# Authors: #
# #
# Yan Xu, Lehigh University #
# Aykut Bulut, Lehigh University #
# Ted Ralphs, Lehigh University #
# #
# Conceptual Design: #
Expand All @@ -33,7 +34,7 @@
# Matthew Saltzman, Clemson University #
# #
# #
# Copyright (C) 2001-2017, Lehigh University, Yan Xu, and Ted Ralphs. #
# Copyright (C) 2001-2018, Lehigh University, Yan Xu, and Ted Ralphs. #
# All Rights Reserved. #
#==========================================================================#

Expand Down
13 changes: 4 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ALPS Version 2.0 README

Welcome to ALPS. Alps is distributed under the Eclipse Public License and is
freely redistributable. All source code and documentation is Copyright
2001-2017 by Lehigh University, Yan Xu, Aykut Bulut, and Ted Ralphs. This
2001-2018 by Lehigh University, Yan Xu, Aykut Bulut, and Ted Ralphs. This
README may be distributed freely.

TESTING STATUS
Expand Down Expand Up @@ -84,13 +84,8 @@ Ted Ralphs (ted@lehigh.edu), Project Manager
Laci Ladanyi (ladanyi@us.ibm.com)
Matt Saltzman (mjs@clemson.edu)

2. List Serve
2. Bug Reports and Other Issues

Alps users should use the CHiPPS mailing list. To subscribe, go to
http://list.coin-or.org/mailman/listinfo/chipps
Bug reports should be reported on the CHiPPS GitHub web site at

3. Bug Reports

Bug reports should be reported on the CHiPPS development web site at

https://projects.coin-or.org/CHiPPS/newticket
https://github.com/coin-or/CHiPPS-ALPS/issues/new
Loading

0 comments on commit 18bfa6a

Please sign in to comment.