|
[yoda-svn] yoda: 6 new changesetsYODA Mercurial yoda at projects.hepforge.orgWed Sep 27 16:30:02 BST 2017
details: https://yoda.hepforge.org/hg/yoda/rev/b8887d9b2b29 branches: release-1-6 changeset: 1407:b8887d9b2b29 user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Sun Sep 24 16:00:33 2017 +0100 description: Fix missing util cimport details: https://yoda.hepforge.org/hg/yoda/rev/10b94a8dfab2 branches: release-1-6 changeset: 1408:10b94a8dfab2 user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Sun Sep 24 16:39:28 2017 +0100 description: Use fix-out-of-source also for yoda1. details: https://yoda.hepforge.org/hg/yoda/rev/016aa39ff72f branches: release-1-6 changeset: 1409:016aa39ff72f user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Wed Sep 27 10:37:27 2017 +0200 description: Start to rationalize pyext building. Distcheck not working yet details: https://yoda.hepforge.org/hg/yoda/rev/e46196eece71 branches: release-1-6 changeset: 1410:e46196eece71 user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Wed Sep 27 11:50:56 2017 +0200 description: Distcheck works (I think...) details: https://yoda.hepforge.org/hg/yoda/rev/a697521211e6 branches: release-1-6 changeset: 1411:a697521211e6 user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Wed Sep 27 16:54:52 2017 +0200 description: Fix make check without installing first details: https://yoda.hepforge.org/hg/yoda/rev/cc26f5a5532d branches: release-1-6 changeset: 1412:cc26f5a5532d user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Wed Sep 27 16:17:40 2017 +0100 description: Fix lib64 handling on uninstall diffs (truncated from 438 to 50 lines): --- a/.hgignore Tue Sep 19 21:29:42 2017 +0100 +++ b/.hgignore Wed Sep 27 16:17:40 2017 +0100 @@ -43,6 +43,7 @@ ^pyext/yoda/util\.cpp$ ^pyext/yoda/rootcompat\.cpp$ ^pyext/yoda/fix-out-of-source$ +^pyext/yoda1/fix-out-of-source$ ^pyext/yoda/include/Bin.D_.*\.pyx$ ^pyext/yoda/made_pyx_templates$ ^pyext/.*/generated$ --- a/configure.ac Tue Sep 19 21:29:42 2017 +0100 +++ b/configure.ac Wed Sep 27 16:17:40 2017 +0100 @@ -12,8 +12,8 @@ prefix=/usr/local fi -dnl AC_CONFIG_SRCDIR([src/Bin1D.cc]) -AM_INIT_AUTOMAKE([subdir-objects -Wall dist-bzip2]) +AC_CONFIG_SRCDIR([src/Counter.cc]) +AM_INIT_AUTOMAKE([subdir-objects -Wall dist-bzip2 1.10]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AC_CONFIG_MACRO_DIR([m4]) @@ -157,6 +157,13 @@ AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CXXFLAGS) +dnl +dnl setup.py puts its build artifacts into a labelled path +dnl this helps the test scripts to find them locally instead of +dnl having to install first +dnl +YODA_SETUP_PY_PATH=$(${PYTHON} -c 'import distutils.util as u, sys; vi=sys.version_info; print "lib.%s-%s.%s" % (u.get_platform(),vi.major, vi.minor)') +AC_SUBST(YODA_SETUP_PY_PATH) ## Build Doxygen if possible AC_PATH_PROG(DOXYGEN, doxygen) @@ -169,7 +176,10 @@ AC_CONFIG_FILES([include/Makefile include/YODA/Makefile]) AC_CONFIG_FILES([src/Makefile src/tinyxml/Makefile]) AC_CONFIG_FILES([tests/Makefile]) -AC_CONFIG_FILES([pyext/Makefile pyext/setup.py pyext/yoda/Makefile]) +AC_CONFIG_FILES([pyext/Makefile + pyext/setup.py + pyext/yoda/Makefile + ]) AC_CONFIG_FILES([bin/Makefile bin/yoda-config]) AC_CONFIG_FILES([yodaenv.sh yoda.pc]) --- a/pyext/Makefile.am Tue Sep 19 21:29:42 2017 +0100
More information about the yoda-svn mailing list |