From 8cb6b81c38fcb2a65d1d77ab6b561d590739a81a Mon Sep 17 00:00:00 2001 From: tchernobog Date: Fri, 17 Feb 2006 16:31:36 +0000 Subject: [PATCH] - Check for Python distutils module presence git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@339 3ecf2c5c-341e-0410-92b4-d18e462d057c --- ChangeLog | 143 +++++++++++++++++++++++++++++++++++++++--- configure.ac | 2 +- m4/ac_python_devel.m4 | 16 ++++- 3 files changed, 151 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebb4590..131ceb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,129 @@ +2006-02-17 16:08 tchernobog + + * trunk/src/Makefile.am, trunk/src/backend/Makefile.am, + trunk/src/backend/pyloader, + trunk/src/backend/pyloader/python_policy.cc, + trunk/src/backend/pyloader/python_policy.hh, + trunk/src/backend/pyloader/python_policy_manager.cc, + trunk/src/backend/pyloader/python_policy_manager.hh, + trunk/src/main.cc, trunk/src/pyloader: - Add missing files + +2006-02-17 12:45 tchernobog + + * trunk/src/backend/Makefile.am: - Temporary hack to Makefile. To be + fixed. + +2006-02-17 12:34 tchernobog + + * trunk/src/backend/python_policy.cc, + trunk/src/backend/python_policy.hh, + trunk/src/backend/python_policy_manager.cc, + trunk/src/backend/python_policy_manager.hh: - Remove spurious + files left from previous commit (these files were moved to the + pyloader directory) + +2006-02-16 22:50 tchernobog + + * trunk/src/Makefile.am, trunk/src/backend/policy.hh, + trunk/src/backend/policy_manager.hh, + trunk/src/pyloader/Abstract.py, trunk/src/pyloader/Makefile.am, + trunk/src/pyloader/Policy.py: - Add support for abtract python + classes - Create first modules: the Policy Python class + +2006-02-16 21:29 tchernobog + + * trunk/src/Makefile.am, trunk/src/backend/Makefile.am, + trunk/src/main.cc, trunk/src/pyloader/Makefile.am: - Initial split + of libpyloader from libbackend. Will need rework in order to: - + fix wrong design - fix include paths - fix installation of header + files + +2006-02-15 22:58 fpaparel + + * trunk/src/Makefile.am, trunk/src/backend/history.cc, + trunk/src/backend/policy.hh, trunk/src/backend/python_policy.cc, + trunk/src/backend/python_policy_manager.cc, + trunk/src/backend/scheduler.cc, trunk/src/backend/scheduler.hh, + trunk/src/graphical_terminal_io.cc, + trunk/src/graphical_terminal_io.hh, trunk/src/io_manager.hh, + trunk/src/main.cc, trunk/src/simulation.cc, + trunk/src/simulation.hh, trunk/src/standard_io.cc, + trunk/src/standard_io.hh, trunk/src/text_simulation.hh: - added + few frontend classes - updated others from backend + +2006-02-14 12:55 tchernobog + + * trunk/m4/ac_python_devel.m4: - Fix typo in comment - Add extra + checks for python version: should do a better job when determining + the library name to use + +2006-02-13 16:35 tchernobog + + * trunk/configure.ac, trunk/src/Makefile.am, + trunk/src/backend/Makefile.am: - Add Python preprocessor flags to + src/ and src/backend Makefiles - Add -Wno-long-long to compiler + options in order to workaround Python types' evilness + +2006-02-13 11:32 fpaparel + + * trunk/src/backend/Makefile.am, trunk/src/backend/policy.cc, + trunk/src/backend/policy.hh, trunk/src/backend/policy_manager.cc, + trunk/src/backend/policy_manager.hh, + trunk/src/backend/policy_parameters.cc, + trunk/src/backend/policy_parameters.hh, + trunk/src/backend/python_policy.cc, + trunk/src/backend/python_policy.hh, + trunk/src/backend/python_policy_manager.cc, + trunk/src/backend/python_policy_manager.hh, + trunk/src/backend/schedulable_list.cc, + trunk/src/backend/scheduler.cc, trunk/src/backend/scheduler.hh, + trunk/src/main.cc, trunk/src/templates/parameter.tcc: - Now all + backend classes are present (not all complete) - Can't compile + when trying to link with Python + check -pedantic parameter + when + compiling main.cc there is no -I/..../Python parameter + +2006-02-12 17:12 fpaparel + + * trunk/src/Makefile.am, trunk/src/backend/Makefile.am, + trunk/src/backend/history.cc, trunk/src/backend/history.hh, + trunk/src/backend/policy.cc, trunk/src/backend/policy.hh, + trunk/src/backend/policy_parameters.cc, + trunk/src/backend/policy_parameters.hh, + trunk/src/backend/schedulable.hh, + trunk/src/backend/schedulable_list.cc, + trunk/src/backend/schedulable_list.hh, + trunk/src/backend/schedulable_status.cc, + trunk/src/backend/scheduler.cc, trunk/src/backend/scheduler.hh, + trunk/src/backend/simulation_status.cc, + trunk/src/backend/simulation_status.hh, + trunk/src/backend/slice.cc, trunk/src/backend/slice.hh, + trunk/src/main.cc, trunk/src/observer.cc, trunk/src/observer.hh: - + added scheduler and other incomplete backend classes + +2006-02-12 16:06 tchernobog + + * trunk/configure.ac, trunk/m4/Makefile.am, + trunk/m4/linkingflags.m4, trunk/src/backend/Makefile.am: - Check + for --as-needed linking flag + +2006-02-10 20:44 tchernobog + + * trunk/src/graphical_terminal_io.cc, + trunk/src/graphical_terminal_io.hh, trunk/src/io_manager.hh, + trunk/src/main.cc, trunk/src/main_window.cc, + trunk/src/start_gui.cc: - Write code for the graphical terminal + widget + +2006-02-10 11:47 tchernobog + + * trunk/src/templates/smartp.hh, trunk/src/templates/smartp.tcc: - + Add exception throwing specifications to methods - Coding style + fixes + +2006-02-09 20:18 tchernobog + + * trunk/ChangeLog, trunk/po/POTFILES.in: - Fix path + 2006-02-09 19:43 tchernobog * trunk/src/Makefile.am, trunk/src/backend/Makefile.am, @@ -58,7 +184,7 @@ trunk/src/backend/simulationStatus.cc, trunk/src/backend/simulationStatus.hh, trunk/src/backend/slice.cc, trunk/src/backend/slice.hh, trunk/src/main.cc, - trunk/src/observer.hh: - added some source code + trunk/src/observer.hh: - Added some source code 2006-02-07 20:48 tchernobog @@ -107,7 +233,8 @@ trunk/src/backend/schedulableStatus.hh, trunk/src/backend/simulationStatus.cc, trunk/src/backend/simulationStatus.hh, trunk/src/backend/slice.cc, - trunk/src/backend/slice.hh, trunk/src/main.cc: + trunk/src/backend/slice.hh, trunk/src/main.cc: - Added some source + in the backend lib 2006-02-06 12:07 tchernobog @@ -132,7 +259,7 @@ * trunk/src/Makefile.am, trunk/src/backend/Makefile.am, trunk/src/builtin-policies/Makefile.am, trunk/src/pyloader/Makefile.am, trunk/src/testsuite/Makefile.am: - - use pkgdatadir instead of datadir + pkgname + Use pkgdatadir instead of datadir + pkgname 2006-02-03 21:53 tchernobog @@ -150,11 +277,11 @@ * trunk/src/backend/Makefile.am, trunk/src/backend/Makefile.in, trunk/src/backend/process.cc, trunk/src/backend/process.hh, - trunk/src/main.cc: Can't compile source. Need help... + trunk/src/main.cc: - Can't compile source. Need help... 2006-02-02 00:39 elvez - * trunk/doc/sgpem2dman.texi: -Updated coding style with a point on + * trunk/doc/sgpem2dman.texi: - Updated coding style with a point on static non-POD objects. 2006-02-01 22:56 tchernobog @@ -173,7 +300,7 @@ 2006-01-31 21:11 tchernobog - * trunk/m4/ac_python_devel.m4: - Typo : bail out for python <= 2.1.0 + * trunk/m4/ac_python_devel.m4: - Typo: bail out for python <= 2.1.0 instead of 2.5.0 2006-01-31 20:18 tchernobog @@ -183,12 +310,12 @@ 2006-01-31 19:06 tchernobog * trunk/ChangeLog, trunk/m4/ac_python_devel.m4: - Update - ac_python_devel to check and complain about Python < 2.1.0. + ac_python_devel to check and complain about Python < 2.1.0 2006-01-31 11:59 tchernobog * trunk/src/backend/schedulable.hh, trunk/src/parseopts.hh: - Fix - api docs : aesthetics + api docs: aesthetics 2006-01-29 17:33 tchernobog diff --git a/configure.ac b/configure.ac index 1ff4a3b..95735c9 100644 --- a/configure.ac +++ b/configure.ac @@ -147,8 +147,8 @@ m4/Makefile po/Makefile.in src/Makefile src/backend/Makefile +src/backend/pyloader/Makefile src/builtin-policies/Makefile -src/pyloader/Makefile src/templates/Makefile src/testsuite/Makefile ]) diff --git a/m4/ac_python_devel.m4 b/m4/ac_python_devel.m4 index da8dfc2..90c160f 100644 --- a/m4/ac_python_devel.m4 +++ b/m4/ac_python_devel.m4 @@ -92,7 +92,21 @@ variable to configure. See ``configure --help'' for reference. ])dnl fi fi - + + # + # Check if you have distutils, else fail + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` + if test -z "$ac_distutils_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot import Python module "distutils". +Please check your Python installation. The error was: +$ac_distutils_result]) + fi + # # Check for Python include path #