Ignore:
Timestamp:
12/07/08 11:31:50 (5 years ago)
Author:
wehart
Message:

Merged revisions 5285-6010 via svnmerge from
 https://software.sandia.gov/svn/public/acro/acro-pico/trunk

........

r5300 | wehart | 2008-02-17 16:44:57 -0700 (Sun, 17 Feb 2008) | 2 lines


Adding pyacro external.

........

r5302 | wehart | 2008-02-17 16:50:21 -0700 (Sun, 17 Feb 2008) | 2 lines


Misc

........

r5314 | wehart | 2008-02-27 13:14:05 -0700 (Wed, 27 Feb 2008) | 2 lines


Updates to config/makefile fragements due to the sacache integration.

........

r5318 | wehart | 2008-02-29 17:10:07 -0700 (Fri, 29 Feb 2008) | 2 lines


Update to use coopr.

........

r5319 | wehart | 2008-02-29 17:10:46 -0700 (Fri, 29 Feb 2008) | 2 lines


Removal of pyacro.

........

r5329 | wehart | 2008-03-02 11:53:01 -0700 (Sun, 02 Mar 2008) | 2 lines


Updates to core config fragments

........

r5331 | wehart | 2008-03-02 11:54:50 -0700 (Sun, 02 Mar 2008) | 2 lines


Adding cxxtest external

........

r5373 | lafisk | 2008-05-22 16:39:39 -0600 (Thu, 22 May 2008) | 2 lines


Add directory cxxtest to the distribution list

........

r5383 | wehart | 2008-05-28 18:57:48 -0600 (Wed, 28 May 2008) | 2 lines


Moving tpl in acro-pico

........

r5390 | wehart | 2008-05-31 20:49:06 -0600 (Sat, 31 May 2008) | 2 lines


Updates due to TPL update.

........

r5394 | wehart | 2008-06-02 08:47:48 -0600 (Mon, 02 Jun 2008) | 2 lines


Update to acro-pico makefile fragments

........

r5409 | wehart | 2008-06-05 15:20:39 -0600 (Thu, 05 Jun 2008) | 2 lines


Update of COIN TPL to use CBC Tag 1.1.0

........

r5411 | wehart | 2008-06-06 07:46:48 -0600 (Fri, 06 Jun 2008) | 2 lines


Fixing COIN external. I copied the wrong one when I updated PICO.

........

r5414 | jeckstei | 2008-06-06 09:29:16 -0600 (Fri, 06 Jun 2008) | 3 lines


Bill's change of COIN version to 2.0 stable

........

r5415 | wehart | 2008-06-06 09:33:33 -0600 (Fri, 06 Jun 2008) | 2 lines


Bug fix. This should have been 1.1 (which is really CBC 2.0).

........

r5485 | wehart | 2008-08-04 14:31:09 -0600 (Mon, 04 Aug 2008) | 2 lines


Rework of Coopr externals to segregate Python and non-Python components.

........

r5496 | wehart | 2008-08-04 23:14:49 -0600 (Mon, 04 Aug 2008) | 2 lines


Misc fix.

........

r5517 | lafisk | 2008-08-22 11:56:01 -0600 (Fri, 22 Aug 2008) | 13 lines


In tpl/glpk, the acro makefile creates an executable glpsol
using the third party library libglpk, which is built with
glpk's own configure/make setup before we build glpsol.


glpk's configure script determines whether libgmp is available
on the platform, and then builds with it if it is. We don't
so the same thing. I have libgmp on my machine, so libglpk
is using it. But when acro builds glpsol, it doesn't link in
libgmp so it fails.


I changed acro's configure.ac to figure out if libgmp is available
on the platform, and add "-lgmp" to the LIBS variable.

........

r5541 | lafisk | 2008-09-04 19:16:48 -0600 (Thu, 04 Sep 2008) | 2 lines


fix for make dist

........

r5543 | lafisk | 2008-09-04 20:33:34 -0600 (Thu, 04 Sep 2008) | 3 lines


needs to match bootstrap/root/configure.ac

........

r5545 | lafisk | 2008-09-05 13:53:53 -0600 (Fri, 05 Sep 2008) | 2 lines


fixing external links to revision to freeze release code

........

r5546 | lafisk | 2008-09-05 13:56:24 -0600 (Fri, 05 Sep 2008) | 2 lines


fix External links for release 2.1

........

r5547 | lafisk | 2008-09-05 14:04:40 -0600 (Fri, 05 Sep 2008) | 2 lines


removing revision, hopefully tagged directories don't change

........

r5554 | lafisk | 2008-09-08 13:10:56 -0600 (Mon, 08 Sep 2008) | 3 lines


Do not fix top level external links in the trunk
I'll create branches/stable_2008_September with fixed external links

........

r5663 | wehart | 2008-10-28 15:01:42 -0700 (Tue, 28 Oct 2008) | 2 lines


Revising the acro-pico externals to use the new Python packages and cxxtest external.

........

r5664 | wehart | 2008-10-28 15:09:57 -0700 (Tue, 28 Oct 2008) | 3 lines


Fixing the COIN-CBC external. It points to TPL because that includes a Makefile.am
wrapper.

........

r5673 | wehart | 2008-10-28 16:51:15 -0700 (Tue, 28 Oct 2008) | 5 lines


Reverting cbc/glpk externals to an earlier version.


The new CBC stable branch requires a newwer version of GLPK, which
doesn't want to be autoreconf'd. :(

........

r5696 | wehart | 2008-10-29 21:33:36 -0700 (Wed, 29 Oct 2008) | 3 lines


Fixing the ordering of AMPL construction and the copying of AMPL
data.

........

r5698 | wehart | 2008-10-29 21:34:13 -0700 (Wed, 29 Oct 2008) | 2 lines


Misc updates of config/Makefiles...

........

r5765 | wehart | 2008-11-09 23:38:16 -0700 (Sun, 09 Nov 2008) | 5 lines


Misc updates for config/makefile fragments.


Fixing revision of UTILIB within the acro-pico trunk, to
limit the impact of ongoing changes within UTILIB.

........

r5780 | wehart | 2008-11-11 01:15:35 -0700 (Tue, 11 Nov 2008) | 5 lines


Misc update of config/makefile fragments.


Update of Externals to use the UTILIB trunk. Also, sacache is
removed from acro-pico since it's not being used.

........

r5879 | wehart | 2008-11-24 20:25:00 -0700 (Mon, 24 Nov 2008) | 2 lines


Updating CBC and GLPK externals.

........

r5882 | wehart | 2008-11-25 01:25:24 -0700 (Tue, 25 Nov 2008) | 2 lines


Updates from acro-root.

........

r5892 | lafisk | 2008-12-01 10:59:16 -0700 (Mon, 01 Dec 2008) | 2 lines


add some "-p"s to the mkdirs, plus small fix for out-of-source builds

........

r5893 | lafisk | 2008-12-01 10:59:50 -0700 (Mon, 01 Dec 2008) | 2 lines


add "@" to make command silent

........

r5894 | lafisk | 2008-12-01 13:20:24 -0700 (Mon, 01 Dec 2008) | 2 lines


fixes for out of source builds

........

r5898 | lafisk | 2008-12-01 14:51:27 -0700 (Mon, 01 Dec 2008) | 2 lines


out of source fix

........

r5900 | wehart | 2008-12-01 19:42:22 -0700 (Mon, 01 Dec 2008) | 2 lines


Update from bootstrap files.

........

r5912 | wehart | 2008-12-02 16:16:27 -0700 (Tue, 02 Dec 2008) | 3 lines


Revise the cxxtest external to point to the mirror on
software.sandia.gov.

........

r5921 | wehart | 2008-12-03 01:14:28 -0700 (Wed, 03 Dec 2008) | 2 lines


Updates from acro-root.

........

r5923 | wehart | 2008-12-03 01:19:38 -0700 (Wed, 03 Dec 2008) | 2 lines


Update from acro-root.

........

r5960 | lafisk | 2008-12-05 17:32:02 -0700 (Fri, 05 Dec 2008) | 2 lines


fixes for out of source builds

........

Location:
acro-pico/stable/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • acro-pico/stable/1.3

    • Property svn:externals
      •  

        old new  
        1 admin   -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.2/admin 
        2 bin     -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.2/bin 
        3 bootstrap       -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.2/bootstrap 
        4 config  -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.2/config 
        5 doc     -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.2/doc 
        6 include -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.2/include 
        7 mvs     -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.2/mvs 
        8 test    -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.2/test 
        9 userapps -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.2/userapps 
         1admin    https://software.sandia.gov/svn/public/acro/acro-root/trunk/admin 
         2bin      https://software.sandia.gov/svn/public/acro/acro-root/trunk/bin 
         3bootstrap       https://software.sandia.gov/svn/public/acro/acro-root/trunk/bootstrap 
         4config   https://software.sandia.gov/svn/public/acro/acro-root/trunk/config 
         5doc      https://software.sandia.gov/svn/public/acro/acro-root/trunk/doc 
         6include  https://software.sandia.gov/svn/public/acro/acro-root/trunk/include 
         7mvs      https://software.sandia.gov/svn/public/acro/acro-root/trunk/mvs 
         8test     https://software.sandia.gov/svn/public/acro/acro-root/trunk/test 
         9userapps  https://software.sandia.gov/svn/public/acro/acro-root/trunk/userapps 
    • Property svnmerge-integrated changed
      /acro-pico/trunkmerged: 5300,​5302,​5314,​5318-5319,​5329,​5331,​5373,​5383,​5390,​5394,​5409,​5411,​5414-5415,​5485,​5496,​5517,​5541,​5543,​5545-5547,​5554,​5663-5664,​5673,​5696,​5698,​5765,​5780,​5879,​5882,​5892-5894,​5898,​5900,​5912,​5921,​5923,​5960
  • acro-pico/stable/1.3/packages

    • Property svn:externals
      •  

        old new  
        1 dummy   -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.1/packages/dummy 
        2 exact   -r1708 https://software.sandia.gov/svn/public/exact/exact/stable/1.2 
        3 fast    -r1702 https://software.sandia.gov/svn/public/exact/fast/stable/1.2 
        4 pebbl   -r5424 https://software.sandia.gov/svn/public/acro/pebbl/stable/1.3 
        5 pico    -r5424 https://software.sandia.gov/svn/public/acro/pico/stable/1.3 
        6 sundry  -r5424 https://software.sandia.gov/svn/public/acro/sundry/stable/1.1 
        7 utilib  -r1428 https://software.sandia.gov/svn/public/utilib/utilib/stable/3.4 
         1coopr   https://software.sandia.gov/svn/public/coopr/coopr/branches/coopr_dev 
         2dummy   https://software.sandia.gov/svn/public/acro/acro-root/trunk/packages/dummy 
         3fast    https://software.sandia.gov/svn/public/fast/fast/trunk 
         4pebbl   https://software.sandia.gov/svn/public/acro/pebbl/trunk 
         5pico    https://software.sandia.gov/svn/public/acro/pico/trunk 
         6pyutilib https://software.sandia.gov/svn/public/pyutilib/trunk 
         7#sacache https://software.sandia.gov/svn/public/sacache/trunk 
         8sundry  https://software.sandia.gov/svn/public/acro/sundry/trunk 
         9utilib  https://software.sandia.gov/svn/public/utilib/utilib/trunk 
  • acro-pico/stable/1.3/packages/Externals

    r5867 r6011  
    1 dummy   -r5424 https://software.sandia.gov/svn/public/acro/acro-root/stable/1.1/packages/dummy 
    2 exact   -r1708 https://software.sandia.gov/svn/public/exact/exact/stable/1.2 
    3 fast    -r1702 https://software.sandia.gov/svn/public/exact/fast/stable/1.2 
    4 pebbl   -r5424 https://software.sandia.gov/svn/public/acro/pebbl/stable/1.3 
    5 pico    -r5424 https://software.sandia.gov/svn/public/acro/pico/stable/1.3 
    6 sundry  -r5424 https://software.sandia.gov/svn/public/acro/sundry/stable/1.1 
    7 utilib  -r1428 https://software.sandia.gov/svn/public/utilib/utilib/stable/3.4 
     1coopr   https://software.sandia.gov/svn/public/coopr/coopr/branches/coopr_dev 
     2dummy   https://software.sandia.gov/svn/public/acro/acro-root/trunk/packages/dummy 
     3fast    https://software.sandia.gov/svn/public/fast/fast/trunk 
     4pebbl   https://software.sandia.gov/svn/public/acro/pebbl/trunk 
     5pico    https://software.sandia.gov/svn/public/acro/pico/trunk 
     6pyutilib https://software.sandia.gov/svn/public/pyutilib/trunk 
     7#sacache https://software.sandia.gov/svn/public/sacache/trunk 
     8sundry  https://software.sandia.gov/svn/public/acro/sundry/trunk 
     9utilib  https://software.sandia.gov/svn/public/utilib/utilib/trunk 
Note: See TracChangeset for help on using the changeset viewer.