Changeset 13


Ignore:
Timestamp:
Jul 19, 2006 1:25:17 AM (13 years ago)
Author:
andreasw
Message:

copy (instead of ln -s) input files for unit test for VPATH configuration

Location:
trunk/Bonmin
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/Makefile.in

    r1 r13  
    259259VOLOBJDIR = @VOLOBJDIR@
    260260VOLSRCDIR = @VOLSRCDIR@
     261VPATH_CONFIG_FALSE = @VPATH_CONFIG_FALSE@
     262VPATH_CONFIG_TRUE = @VPATH_CONFIG_TRUE@
    261263VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    262264XPRINCDIR = @XPRINCDIR@
  • trunk/Bonmin/configure

    r1 r13  
    473473#endif"
    474474
    475 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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX 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 CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_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 LT_LDFLAGS RPATH_FLAGS CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE IPOPTSRCDIR IPOPTOBJDIR COIN_HAS_IPOPT_TRUE COIN_HAS_IPOPT_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE BCPSRCDIR BCPOBJDIR COIN_HAS_BCP_TRUE COIN_HAS_BCP_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE BUILD_FP_TRUE BUILD_FP_FALSE ASTYLE ASTYLEFLAGS LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
     475ac_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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX 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 CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_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 LT_LDFLAGS RPATH_FLAGS CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE IPOPTSRCDIR IPOPTOBJDIR COIN_HAS_IPOPT_TRUE COIN_HAS_IPOPT_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE BCPSRCDIR BCPOBJDIR COIN_HAS_BCP_TRUE COIN_HAS_BCP_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE BUILD_FP_TRUE BUILD_FP_FALSE ASTYLE ASTYLEFLAGS VPATH_CONFIG_TRUE VPATH_CONFIG_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2179821798#############################################################################
    2179921799
     21800#AC_COIN_VPATH_LINK(test/bonmin.opt)
     21801#AC_COIN_VPATH_LINK(test/mytoy.nl)
     21802# FIXME
    2180021803echo "$as_me:$LINENO: checking whether this is a VPATH configuration" >&5
    2180121804echo $ECHO_N "checking whether this is a VPATH configuration... $ECHO_C" >&6
     
    2181021813
    2181121814if test $coin_vpath_config = yes; then
    21812   coin_vpath_link_files="$coin_vpath_link_files test/bonmin.opt"
    21813 fi
     21815  coin_vpath_link_files="$coin_vpath_link_files "
     21816fi
     21817
    2181421818
    2181521819
    2181621820if test $coin_vpath_config = yes; then
    21817   coin_vpath_link_files="$coin_vpath_link_files test/mytoy.nl"
     21821  VPATH_CONFIG_TRUE=
     21822  VPATH_CONFIG_FALSE='#'
     21823else
     21824  VPATH_CONFIG_TRUE='#'
     21825  VPATH_CONFIG_FALSE=
    2181821826fi
    2181921827
     
    2211222120Usually this means the macro was only invoked conditionally." >&5
    2211322121echo "$as_me: error: conditional \"BUILD_FP\" was never defined.
     22122Usually this means the macro was only invoked conditionally." >&2;}
     22123   { (exit 1); exit 1; }; }
     22124fi
     22125if test -z "${VPATH_CONFIG_TRUE}" && test -z "${VPATH_CONFIG_FALSE}"; then
     22126  { { echo "$as_me:$LINENO: error: conditional \"VPATH_CONFIG\" was never defined.
     22127Usually this means the macro was only invoked conditionally." >&5
     22128echo "$as_me: error: conditional \"VPATH_CONFIG\" was never defined.
    2211422129Usually this means the macro was only invoked conditionally." >&2;}
    2211522130   { (exit 1); exit 1; }; }
     
    2283522850s,@ASTYLE@,$ASTYLE,;t t
    2283622851s,@ASTYLEFLAGS@,$ASTYLEFLAGS,;t t
     22852s,@VPATH_CONFIG_TRUE@,$VPATH_CONFIG_TRUE,;t t
     22853s,@VPATH_CONFIG_FALSE@,$VPATH_CONFIG_FALSE,;t t
    2283722854s,@LIBEXT@,$LIBEXT,;t t
    2283822855s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t
  • trunk/Bonmin/configure.ac

    r1 r13  
    111111#############################################################################
    112112
    113 AC_COIN_VPATH_LINK(test/bonmin.opt)
    114 AC_COIN_VPATH_LINK(test/mytoy.nl)
     113#AC_COIN_VPATH_LINK(test/bonmin.opt)
     114#AC_COIN_VPATH_LINK(test/mytoy.nl)
     115# FIXME
     116AC_COIN_VPATH_LINK
     117AM_CONDITIONAL(VPATH_CONFIG, test $coin_vpath_config = yes)
    115118AC_CONFIG_LINKS([test/MyBonmin.cpp:examples/CppExample/MyBonmin.cpp
    116119                 test/MyTMINLP.cpp:examples/CppExample/MyTMINLP.cpp
  • trunk/Bonmin/experimental/Bcp/Makefile.in

    r1 r13  
    258258VOLOBJDIR = @VOLOBJDIR@
    259259VOLSRCDIR = @VOLSRCDIR@
     260VPATH_CONFIG_FALSE = @VPATH_CONFIG_FALSE@
     261VPATH_CONFIG_TRUE = @VPATH_CONFIG_TRUE@
    260262VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    261263XPRINCDIR = @XPRINCDIR@
  • trunk/Bonmin/experimental/FP/Makefile.in

    r1 r13  
    261261VOLOBJDIR = @VOLOBJDIR@
    262262VOLSRCDIR = @VOLSRCDIR@
     263VPATH_CONFIG_FALSE = @VPATH_CONFIG_FALSE@
     264VPATH_CONFIG_TRUE = @VPATH_CONFIG_TRUE@
    263265VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    264266XPRINCDIR = @XPRINCDIR@
  • trunk/Bonmin/src/Apps/Makefile.in

    r1 r13  
    277277VOLOBJDIR = @VOLOBJDIR@
    278278VOLSRCDIR = @VOLSRCDIR@
     279VPATH_CONFIG_FALSE = @VPATH_CONFIG_FALSE@
     280VPATH_CONFIG_TRUE = @VPATH_CONFIG_TRUE@
    279281VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    280282XPRINCDIR = @XPRINCDIR@
  • trunk/Bonmin/src/BonminAmplInterface/Makefile.am

    r12 r13  
    4040        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    4141        -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    42         -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` \
    43 
     42        -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface`
    4443
    4544AM_CPPFLAGS += $(ASL_CPPFLAGS)
  • trunk/Bonmin/src/BonminAmplInterface/Makefile.in

    r1 r13  
    244244VOLOBJDIR = @VOLOBJDIR@
    245245VOLSRCDIR = @VOLSRCDIR@
     246VPATH_CONFIG_FALSE = @VPATH_CONFIG_FALSE@
     247VPATH_CONFIG_TRUE = @VPATH_CONFIG_TRUE@
    246248VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    247249XPRINCDIR = @XPRINCDIR@
     
    318320# Here list all include flags, relative to this "srcdir" directory.  This
    319321# "cygpath" stuff is necessary to compile with native compilers on Windows
    320 AM_CPPFLAGS = \
    321         -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    322         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    323         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg` \
    324         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Algorithm` \
    325         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` \
    326         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Apps/AmplSolver` \
    327         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    328         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    329         -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    330         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    331         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    332         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    333         -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` \
    334         $(ASL_CPPFLAGS)
    335 
     322AM_CPPFLAGS = -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` -I`$(CYGPATH_W) \
     323        $(IPOPTSRCDIR)/src/Common` -I`$(CYGPATH_W) \
     324        $(IPOPTSRCDIR)/src/LinAlg` -I`$(CYGPATH_W) \
     325        $(IPOPTSRCDIR)/src/Algorithm` -I`$(CYGPATH_W) \
     326        $(IPOPTSRCDIR)/src/Interfaces` -I`$(CYGPATH_W) \
     327        $(IPOPTSRCDIR)/src/Apps/AmplSolver` -I`$(CYGPATH_W) \
     328        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
     329        $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
     330        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) \
     331        $(CLPOBJDIR)/inc` -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     332        -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` $(ASL_CPPFLAGS)
    336333
    337334# This line is necessary to allow VPATH compilation with MS compilers
  • trunk/Bonmin/src/CbcBonmin/Makefile.in

    r1 r13  
    248248VOLOBJDIR = @VOLOBJDIR@
    249249VOLSRCDIR = @VOLSRCDIR@
     250VPATH_CONFIG_FALSE = @VPATH_CONFIG_FALSE@
     251VPATH_CONFIG_TRUE = @VPATH_CONFIG_TRUE@
    250252VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    251253XPRINCDIR = @XPRINCDIR@
  • trunk/Bonmin/src/IpoptInterface/Makefile.in

    r1 r13  
    246246VOLOBJDIR = @VOLOBJDIR@
    247247VOLSRCDIR = @VOLSRCDIR@
     248VPATH_CONFIG_FALSE = @VPATH_CONFIG_FALSE@
     249VPATH_CONFIG_TRUE = @VPATH_CONFIG_TRUE@
    248250VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    249251XPRINCDIR = @XPRINCDIR@
  • trunk/Bonmin/src/OaInterface/Makefile.in

    r1 r13  
    237237VOLOBJDIR = @VOLOBJDIR@
    238238VOLSRCDIR = @VOLSRCDIR@
     239VPATH_CONFIG_FALSE = @VPATH_CONFIG_FALSE@
     240VPATH_CONFIG_TRUE = @VPATH_CONFIG_TRUE@
    239241VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    240242XPRINCDIR = @XPRINCDIR@
  • trunk/Bonmin/test/Makefile.am

    r1 r13  
    8383DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
    8484
    85 test: unitTest$(EXEEXT) CppExample$(EXEEXT)
     85test: unitTest$(EXEEXT) CppExample$(EXEEXT) bonmin.opt mytoy.nl
    8686        ./unitTest$(EXEEXT)
    8787        ./CppExample$(EXEEXT)
     88
     89if VPATH_CONFIG
     90bonmin.opt mytoy.nl: $(srcdir)/$@
     91        cp $(srcdir)/$@ .
     92endif
    8893
    8994.PHONY: test
  • trunk/Bonmin/test/Makefile.in

    r1 r13  
    261261VOLOBJDIR = @VOLOBJDIR@
    262262VOLSRCDIR = @VOLSRCDIR@
     263VPATH_CONFIG_FALSE = @VPATH_CONFIG_FALSE@
     264VPATH_CONFIG_TRUE = @VPATH_CONFIG_TRUE@
    263265VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    264266XPRINCDIR = @XPRINCDIR@
     
    634636
    635637
    636 test: unitTest$(EXEEXT) CppExample$(EXEEXT)
     638test: unitTest$(EXEEXT) CppExample$(EXEEXT) bonmin.opt mytoy.nl
    637639        ./unitTest$(EXEEXT)
    638640        ./CppExample$(EXEEXT)
     641
     642@VPATH_CONFIG_TRUE@bonmin.opt mytoy.nl: $(srcdir)/$@
     643@VPATH_CONFIG_TRUE@     cp $(srcdir)/$@ .
    639644
    640645.PHONY: test
Note: See TracChangeset for help on using the changeset viewer.