Changeset 761


Ignore:
Timestamp:
May 12, 2006 4:17:01 PM (15 years ago)
Author:
andreasw
Message:

renamed CoinBase? to CoinUtils?

Location:
trunk
Files:
3 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        22Data/Netlib   https://www.coin-or.org/svn/Data/trunk/Netlib
        33Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
        4 CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
         4CoinUtils     https://www.coin-or.org/svn/CoinUtils/trunk/CoinUtils
  • trunk/Clp/Makefile.in

    r754 r761  
    105105CLPOBJDIR = @CLPOBJDIR@
    106106CLPSRCDIR = @CLPSRCDIR@
    107 COINBASEOBJDIR = @COINBASEOBJDIR@
    108 COINBASESRCDIR = @COINBASESRCDIR@
     107COINUTILSOBJDIR = @COINUTILSOBJDIR@
     108COINUTILSSRCDIR = @COINUTILSSRCDIR@
    109109COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    110110COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
    111111COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    112112COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    113 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    114 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     113COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     114COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    115115CPP = @CPP@
    116116CPPFLAGS = @CPPFLAGS@
  • trunk/Clp/configure

    r758 r761  
    474474#endif"
    475475
    476 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CXXDEFS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL pkg_lib_dir pkg_include_dir pkg_bin_dir COINBASESRCDIR COINBASEOBJDIR COIN_HAS_COINBASE_TRUE COIN_HAS_COINBASE_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE LIBOBJS LTLIBOBJS'
     476ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CXXDEFS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL pkg_lib_dir pkg_include_dir pkg_bin_dir COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE LIBOBJS LTLIBOBJS'
    477477ac_subst_files=''
    478478
     
    1950819508#############################################################################
    1950919509
    19510 echo "$as_me:$LINENO: checking for COIN project CoinBase" >&5
    19511 echo $ECHO_N "checking for COIN project CoinBase... $ECHO_C" >&6
     19510echo "$as_me:$LINENO: checking for COIN project CoinUtils" >&5
     19511echo $ECHO_N "checking for COIN project CoinUtils... $ECHO_C" >&6
    1951219512
    1951319513# First check, if the sub-project is actually available (ToDo: allow
    1951419514# other locations)
    1951519515
    19516 coin_has_coinbase=unavailable
    19517 if test $PACKAGE_TARNAME = coinbase; then
    19518   coin_has_coinbase=.
    19519 else
    19520   if test -d $srcdir/../CoinBase; then
    19521     coin_has_coinbase=../CoinBase
     19516coin_has_coinutils=unavailable
     19517if test $PACKAGE_TARNAME = coinutils; then
     19518  coin_has_coinutils=.
     19519else
     19520  if test -d $srcdir/../CoinUtils; then
     19521    coin_has_coinutils=../CoinUtils
    1952219522  fi
    1952319523fi
    1952419524
    19525 if test $coin_has_coinbase != unavailable; then
     19525if test $coin_has_coinutils != unavailable; then
    1952619526  # Set the #define if the component is available
    1952719527
    1952819528cat >>confdefs.h <<\_ACEOF
    19529 #define COIN_HAS_COINBASE 1
     19529#define COIN_HAS_COINUTILS 1
    1953019530_ACEOF
    1953119531
     
    1953319533  # Set the variables for source and object code location
    1953419534
    19535   COINBASESRCDIR=`cd $srcdir/$coin_has_coinbase; pwd`
    19536 
    19537   COINBASEOBJDIR=`pwd`/$coin_has_coinbase
     19535  COINUTILSSRCDIR=`cd $srcdir/$coin_has_coinutils; pwd`
     19536
     19537  COINUTILSOBJDIR=`pwd`/$coin_has_coinutils
    1953819538fi
    1953919539
     
    1954119541
    1954219542
    19543 if test $coin_has_coinbase != unavailable; then
    19544   COIN_HAS_COINBASE_TRUE=
    19545   COIN_HAS_COINBASE_FALSE='#'
    19546 else
    19547   COIN_HAS_COINBASE_TRUE='#'
    19548   COIN_HAS_COINBASE_FALSE=
    19549 fi
    19550 
    19551 echo "$as_me:$LINENO: result: $coin_has_coinbase" >&5
    19552 echo "${ECHO_T}$coin_has_coinbase" >&6
     19543if test $coin_has_coinutils != unavailable; then
     19544  COIN_HAS_COINUTILS_TRUE=
     19545  COIN_HAS_COINUTILS_FALSE='#'
     19546else
     19547  COIN_HAS_COINUTILS_TRUE='#'
     19548  COIN_HAS_COINUTILS_FALSE=
     19549fi
     19550
     19551echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
     19552echo "${ECHO_T}$coin_has_coinutils" >&6
    1955319553
    1955419554echo "$as_me:$LINENO: checking for COIN project Clp" >&5
     
    2005520055   { (exit 1); exit 1; }; }
    2005620056fi
    20057 if test -z "${COIN_HAS_COINBASE_TRUE}" && test -z "${COIN_HAS_COINBASE_FALSE}"; then
    20058   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINBASE\" was never defined.
     20057if test -z "${COIN_HAS_COINUTILS_TRUE}" && test -z "${COIN_HAS_COINUTILS_FALSE}"; then
     20058  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
    2005920059Usually this means the macro was only invoked conditionally." >&5
    20060 echo "$as_me: error: conditional \"COIN_HAS_COINBASE\" was never defined.
     20060echo "$as_me: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
    2006120061Usually this means the macro was only invoked conditionally." >&2;}
    2006220062   { (exit 1); exit 1; }; }
     
    2069020690s,@pkg_include_dir@,$pkg_include_dir,;t t
    2069120691s,@pkg_bin_dir@,$pkg_bin_dir,;t t
    20692 s,@COINBASESRCDIR@,$COINBASESRCDIR,;t t
    20693 s,@COINBASEOBJDIR@,$COINBASEOBJDIR,;t t
    20694 s,@COIN_HAS_COINBASE_TRUE@,$COIN_HAS_COINBASE_TRUE,;t t
    20695 s,@COIN_HAS_COINBASE_FALSE@,$COIN_HAS_COINBASE_FALSE,;t t
     20692s,@COINUTILSSRCDIR@,$COINUTILSSRCDIR,;t t
     20693s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
     20694s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
     20695s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
    2069620696s,@CLPSRCDIR@,$CLPSRCDIR,;t t
    2069720697s,@CLPOBJDIR@,$CLPOBJDIR,;t t
  • trunk/Clp/configure.ac

    r754 r761  
    5959#############################################################################
    6060
    61 AC_COIN_HAS_PROJECT(CoinBase)
     61AC_COIN_HAS_PROJECT(CoinUtils)
    6262AC_COIN_HAS_PROJECT(Clp)
    6363
  • trunk/Clp/inc/config_clp.h.in

    r754 r761  
    77#undef COIN_HAS_CLP
    88
    9 /* Define to 1 if the CoinBase package is used */
    10 #undef COIN_HAS_COINBASE
     9/* Define to 1 if the CoinUtils package is used */
     10#undef COIN_HAS_COINUTILS
    1111
    1212/* Define to 1 if readline is available */
  • trunk/Clp/src/Makefile.am

    r760 r761  
    8282# List all additionally required COIN libraries
    8383clp_solver_LDADD = libClp.la \
    84         $(COINBASEOBJDIR)/src/libCoinBase.la
     84        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    8585
    86 # And finally we add all missing libraries.  ADDLIBS is set by configure to
    87 # include all libraries that are determined to be necessary (such as -lgz).
    88 # We also need to list the additional libraries for the other COIN libraries
    89 # used.  Finally, the -rpath flag is used by libtool to make sure that
    90 # the shared library is found (in the lib install directory) when we are
    91 # using dynamic libraries.
    92 clp_solver_LDFLAGS = $(ADDLIBS) `cat $(COINBASEOBJDIR)/coinbase_addlibs.txt` \
    93         -rpath $(libdir)
     86# Here we add additional libraries
     87LIBS += $(ADDLIBS) `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
     88
     89# Finally, the -rpath flag is used by libtool to make sure that the shared
     90# library is found (in the lib install directory) when we are using dynamic
     91# libraries.
     92clp_solver_LDFLAGS = -rpath $(libdir)
    9493
    9594########################################################################
     
    102101# being compiled.
    103102CXXFLAGS += \
    104         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src`
     103        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src`
    105104
    106105########################################################################
  • trunk/Clp/src/Makefile.in

    r760 r761  
    9191clp_solver_OBJECTS = $(am_clp_solver_OBJECTS)
    9292clp_solver_DEPENDENCIES = libClp.la \
    93         $(COINBASEOBJDIR)/src/libCoinBase.la
     93        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    9494DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    9595depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    138138CLPOBJDIR = @CLPOBJDIR@
    139139CLPSRCDIR = @CLPSRCDIR@
    140 COINBASEOBJDIR = @COINBASEOBJDIR@
    141 COINBASESRCDIR = @COINBASESRCDIR@
     140COINUTILSOBJDIR = @COINUTILSOBJDIR@
     141COINUTILSSRCDIR = @COINUTILSSRCDIR@
    142142COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    143143COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
    144144COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    145145COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    146 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    147 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     146COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     147COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    148148CPP = @CPP@
    149149CPPFLAGS = @CPPFLAGS@
     
    161161# "top_srcdir" refers to the basic directory for the main package that is
    162162# being compiled.
    163 CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(COINBASESRCDIR)/src`
     163CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src`
    164164CYGPATH_W = @CYGPATH_W@
    165165DEFS = @DEFS@
     
    181181LDFLAGS = @LDFLAGS@
    182182LIBOBJS = @LIBOBJS@
    183 LIBS = @LIBS@
     183
     184# Here we add additional libraries
     185LIBS = @LIBS@ $(ADDLIBS) `cat \
     186        $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    184187LIBTOOL = @LIBTOOL@
    185188LIBTOOLM4 = @LIBTOOLM4@
     
    322325# List all additionally required COIN libraries
    323326clp_solver_LDADD = libClp.la \
    324         $(COINBASEOBJDIR)/src/libCoinBase.la
    325 
    326 
    327 # And finally we add all missing libraries.  ADDLIBS is set by configure to
    328 # include all libraries that are determined to be necessary (such as -lgz).
    329 # We also need to list the additional libraries for the other COIN libraries
    330 # used.  Finally, the -rpath flag is used by libtool to make sure that
    331 # the shared library is found (in the lib install directory) when we are
    332 # using dynamic libraries.
    333 clp_solver_LDFLAGS = $(ADDLIBS) `cat $(COINBASEOBJDIR)/coinbase_addlibs.txt` \
    334         -rpath $(libdir)
    335 
     327        $(COINUTILSOBJDIR)/src/libCoinUtils.la
     328
     329
     330# Finally, the -rpath flag is used by libtool to make sure that the shared
     331# library is found (in the lib install directory) when we are using dynamic
     332# libraries.
     333clp_solver_LDFLAGS = -rpath $(libdir)
    336334
    337335########################################################################
  • trunk/Clp/test/Makefile.in

    r755 r761  
    7474CLPOBJDIR = @CLPOBJDIR@
    7575CLPSRCDIR = @CLPSRCDIR@
    76 COINBASEOBJDIR = @COINBASEOBJDIR@
    77 COINBASESRCDIR = @COINBASESRCDIR@
     76COINUTILSOBJDIR = @COINUTILSOBJDIR@
     77COINUTILSSRCDIR = @COINUTILSSRCDIR@
    7878COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    7979COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
    8080COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    8181COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    82 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    83 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     82COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     83COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    8484CPP = @CPP@
    8585CPPFLAGS = @CPPFLAGS@
  • trunk/Externals

    r754 r761  
    22Data/Netlib   https://www.coin-or.org/svn/Data/trunk/Netlib
    33Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
    4 CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
     4CoinUtils     https://www.coin-or.org/svn/CoinUtils/trunk/CoinUtils
  • trunk/Makefile.am

    r754 r761  
    2323########################################################################
    2424
    25 test:
     25test: all
    2626        cd Clp; make test
    2727
  • trunk/Makefile.in

    r754 r761  
    580580########################################################################
    581581
    582 test:
     582test: all
    583583        cd Clp; make test
    584584
     
    626626@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    627627
    628 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@distclean-local:
     628@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     629@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
     630
     631@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@distclean-local: clean-externals-stamp
     632
     633@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@clean-externals-stamp:
    629634@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     rm -f .Externals-stamp
    630635
  • trunk/configure

    r759 r761  
    283283ac_unique_file="configure.ac"
    284284ac_default_prefix=`pwd`
    285 ac_subdirs_all="$ac_subdirs_all CoinBase"
     285ac_subdirs_all="$ac_subdirs_all CoinUtils"
    286286ac_subdirs_all="$ac_subdirs_all Data/Netlib"
    287287ac_subdirs_all="$ac_subdirs_all Data/Sample"
     
    20652065
    20662066coin_subdirs=
    2067 echo "$as_me:$LINENO: checking whether directory CoinBase is available" >&5
    2068 echo $ECHO_N "checking whether directory CoinBase is available... $ECHO_C" >&6
    2069                 if test -r $srcdir/CoinBase/configure; then
    2070                   coin_subdirs="$coin_subdirs CoinBase"
     2067echo "$as_me:$LINENO: checking whether directory CoinUtils is available" >&5
     2068echo $ECHO_N "checking whether directory CoinUtils is available... $ECHO_C" >&6
     2069                if test -r $srcdir/CoinUtils/configure; then
     2070                  coin_subdirs="$coin_subdirs CoinUtils"
    20712071                  echo "$as_me:$LINENO: result: yes" >&5
    20722072echo "${ECHO_T}yes" >&6
    20732073
    20742074
    2075 subdirs="$subdirs CoinBase"
     2075subdirs="$subdirs CoinUtils"
    20762076
    20772077                else
  • trunk/configure.ac

    r759 r761  
    4444#############################################################################
    4545
    46 AC_COIN_MAIN_SUBDIRS(CoinBase)
     46AC_COIN_MAIN_SUBDIRS(CoinUtils)
    4747AC_COIN_MAIN_SUBDIRS(Data/Netlib)
    4848AC_COIN_MAIN_SUBDIRS(Data/Sample)
Note: See TracChangeset for help on using the changeset viewer.