13
0

More cassowary cleanup.

git-svn-id: svn://localhost/trunk/ardour2@10 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2005-05-17 20:26:10 +00:00
parent 41ab4dfbce
commit 0935e8ec72
4 changed files with 3 additions and 264 deletions

View File

@ -1,3 +1,6 @@
Tue May 17 16:24:00 2005 Taybin Rutkin <taybin@earthlink.net>
* Moved cassowary from autotools to scons.
Fri Mar 18 15:41:00 2005 Taybin Rutkin <taybin@earthlink.net>
* Removed ClSet.h, ClMap.h.
* ClReader.l includes ClReader.cc.h instead of ClReader.hh. The

View File

@ -1,102 +0,0 @@
#!/bin/sh
# Modified from gtk-config
# --09/07/99 gjb
# gotten from LDADD in c++/Makefile.am
cassowary_gtllibs=""
cassowary_libs="-L/usr/local/lib $cassowary_gtllibs"
cassowary_cflags="-I/usr/local/include "
prefix=/usr/local
exec_prefix=${prefix}
exec_prefix_set=no
usage()
{
cat <<EOF
Usage: cassowary-config [OPTIONS]
Options:
[--prefix[=DIR]]
[--exec-prefix[=DIR]]
[--version]
[--libs]
[--gtllibs]
[--cflags]
EOF
exit $1
}
if test $# -eq 0; then
usage 1 1>&2
fi
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;;
esac
case $1 in
--prefix=*)
prefix=$optarg
if test $exec_prefix_set = no ; then
exec_prefix=$optarg
fi
;;
--prefix)
echo_prefix=yes
;;
--exec-prefix=*)
exec_prefix=$optarg
exec_prefix_set=yes
;;
--exec-prefix)
echo_exec_prefix=yes
;;
--version)
echo 0.60
;;
--cflags)
echo_cflags=yes
;;
--libs)
echo_libs=yes
;;
--gtllibs)
echo_gtllibs=yes
;;
*)
usage 1 1>&2
;;
esac
shift
done
if test "$echo_prefix" = "yes"; then
echo $prefix
fi
if test "$echo_exec_prefix" = "yes"; then
echo $exec_prefix
fi
if test "$echo_cflags" = "yes"; then
if test ${prefix}/include != /usr/include ; then
includes=-I${prefix}/include
for i in $cassowary_cflags ; do
if test $i = -I${prefix}/include ; then
includes=""
fi
done
fi
echo $includes $cassowary_cflags
fi
if test "$echo_libs" = "yes"; then
echo -L${exec_prefix}/lib -lcassowary -lstdc++ $cassowary_libs
fi
if test "$echo_gtllibs" = "yes"; then
echo $cassowary_gtllibs
fi

View File

@ -1,84 +0,0 @@
# Note that this is NOT a relocatable package
%define ver 0.60
%define rel 2
%define prefix /usr
Name: cassowary-nofd
Summary: A Linear Arithmetic Constraint Solving Library.
Version: %ver
Release: %rel
# This source just has a different top-level directory name
Source: http://www.cs.washington.edu/research/constraints/cassowary/cassowary-nofd-%ver.tar.gz
Group: Development/Libraries
BuildRoot: /tmp/cassowary-%ver-build
Copyright: Copyright (C) 1998,1999 Greg J. Badros
Packager: Greg J. Badros <gjb@cs.washington.edu>
URL: http://www.cs.washington.edu/research/constraints/cassowary
Requires: guile >= 1.3.2
Provides: cassowary-constraint-solver
%description
Cassowary is an advanced incremental constraint solving toolkit that
efficiently solves systems of linear equalities and inequalities.
Constraints may be either requirements or preferences. Client code
specifies the constraints to be maintained, and the solver updates the
constrained variables to have values that satisfy the constraints.
This package lacks the finite domain subsolver. The cassowary RPM
contains that solver as well, but also requires the GTL (Graph
Template Library) package.
%changelog
* Tue Sep 7 1999 Greg J. Badros <gjb@cs.washington.edu)
- Added cassowary-nofd package to remove GTL dependence, added provides
virtual package "cassowary-constraint-solver" so that both this .spec
and cassowary.spec can provide it
* Sat Sep 4 1999 Greg J. Badros <gjb@cs.washington.edu)
- Use -fpermissive if it is available, fix --enable-warnings
* Wed Aug 25 1999 Greg J. Badros <gjb@cs.washington.edu>
- Rework spec file.
* Wed Apr 14 1999 Greg J. Badros <gjb@cs.washington.edu>
- Initial release of this package.
%prep
%setup
%build
ln -sf . ./c++/cassowary
%ifarch alpha
./configure --host=alpha-linux --prefix=%prefix --enable-guile-build --enable-fsstd --enable-permissive
%else
./configure --prefix=%prefix --enable-guile-build --enable-fsstd --enable-permissive
%endif
make
%install
make prefix=$RPM_BUILD_ROOT%{prefix} install-strip
%clean
rm -rf $RPM_BUILD_ROOT
%post
%postun
%files
%defattr(-, root, root)
%{prefix}/bin/*
%{prefix}/lib/*
%{prefix}/include/*
%doc ANNOUNCE AUTHORS COPYING IMPORTANT INSTALL LICENSE NEWS README THANKS
%doc ChangeLog docs/cassowary-tr.pdf docs/cassowary-tr.ps.gz
%doc guile/cassowary_scm-procedures.txt guile/cassowary_scm-variables.txt
%doc guile/cassowary_scm.sgml

View File

@ -1,78 +0,0 @@
# Note that this is NOT a relocatable package
%define ver 0.60
%define rel 1
%define prefix /usr
Name: cassowary
Summary: A Linear Arithmetic Constraint Solving Library.
Version: %ver
Release: %rel
Source: http://www.cs.washington.edu/research/constraints/cassowary/cassowary-%ver.tar.gz
Group: Development/Libraries
BuildRoot: /tmp/cassowary-%ver-build
Copyright: Copyright (C) 1998,1999 Greg J. Badros
Packager: Greg J. Badros <gjb@cs.washington.edu>
URL: http://www.cs.washington.edu/research/constraints/cassowary
Requires: guile >= 1.3.4
Requires: GTL >= 0.3.1
Provides: cassowary-constraint-solver
%description
Cassowary is an advanced incremental constraint solving toolkit that
efficiently solves systems of linear equalities and inequalities.
Constraints may be either requirements or preferences. Client code
specifies the constraints to be maintained, and the solver updates the
constrained variables to have values that satisfy the constraints.
%changelog
* Tue Sep 7 1999 Greg J. Badros <gjb@cs.washington.edu)
- added provides virtual package "cassowary-constraint-solver" so that
both this .spec and cassowary.spec can provide it
* Sat Sep 4 1999 Greg J. Badros <gjb@cs.washington.edu)
- Use -fpermissive if it is available, fix --enable-warnings
* Wed Aug 25 1999 Greg J. Badros <gjb@cs.washington.edu>
- Rework spec file.
* Wed Apr 14 1999 Greg J. Badros <gjb@cs.washington.edu>
- Initial release of this package.
%prep
%setup
%build
ln -sf . ./c++/cassowary
%ifarch alpha
fake_root_for_install=$RPM_BUILD_ROOT ./configure --host=alpha-linux --prefix=%prefix --with-gtl=%prefix --enable-fd-solver --enable-fsstd --enable-permissive
%else
fake_root_for_install=$RPM_BUILD_ROOT ./configure --prefix=%prefix --with-gtl=%prefix --enable-fd-solver --enable-fsstd --enable-permissive
%endif
make
%install
make prefix=$RPM_BUILD_ROOT%{prefix} fake_root_for_install=$RPM_BUILD_ROOT install-strip
%clean
rm -rf $RPM_BUILD_ROOT
%post
%postun
%files
%defattr(-, root, root)
%{prefix}/bin/*
%{prefix}/lib/*
%{prefix}/include/*
%doc ANNOUNCE AUTHORS COPYING IMPORTANT INSTALL LICENSE NEWS README THANKS
%doc ChangeLog docs/cassowary-tr.pdf docs/cassowary-tr.ps.gz
%doc guile/cassowary_scm-procedures.txt guile/cassowary_scm-variables.txt
%doc guile/cassowary_scm.sgml