From 38a7990e2627153caaec71ec786ac5cb78bafe68 Mon Sep 17 00:00:00 2001 From: tchernobog Date: Fri, 7 Apr 2006 19:57:58 +0000 Subject: [PATCH] - Add revision left out from last merging (Subversion has one of the worst merge systems I've seen thus far) git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@563 3ecf2c5c-341e-0410-92b4-d18e462d057c --- Makefile.am | 157 ++++++++------------------------------------------- autogen.sh | 5 ++ configure.ac | 10 +--- 3 files changed, 31 insertions(+), 141 deletions(-) diff --git a/Makefile.am b/Makefile.am index d4ac491..5244e96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,23 +22,30 @@ # extra calls .PHONY : apidox -# this should be the only recursive call -SUBDIRS = po +# this should be the only recursive call inside sgpemv2 main pkg +# please note the "." directory _has_ to come first, before plugins +SUBDIRS = . po + +# ################################# # +# Additional directories building: # +# ################################# # + +# allow building of provided plugins +# FIXME: how to make this dynamic? e.g. for plugins/* ? +SUBDIRS += plugins/pyloader # directories definition sharedir = $(pkgdatadir) policiesdir = $(sharedir)/policies plugindir = $(sharedir)/plugins -moduledir = $(plugindir)/extras localedir = @datadir@/locale -testsdir = $(pkgdatadir)/tests +aclocaldir = @datadir@/aclocal #define empty global variables bin_PROGRAMS = plugin_LTLIBRARIES = noinst_HEADERS = pkglib_LTLIBRARIES = -noinst_PYTHON = EXTRA_DIST = MAINTAINERCLEANFILES = MOSTLYCLEANFILES = @@ -52,19 +59,20 @@ CLEANFILES = ACLOCAL_AMFLAGS = -I m4 +install_macros = m4/sgpemv2-dirs.m4 macros = m4/compilerflags.m4 \ - m4/linkingflags.m4 \ - m4/ac_python_devel.m4 \ - m4/ac_pkg_swig.m4 \ - m4/ac_python_module.m4 + m4/linkingflags.m4 EXTRA_DIST += \ config/config.rpath \ config/mkinstalldirs \ configure.ac \ gettext.h \ + $(install_macros) \ $(macros) +aclocal_DATA = $(install_macros) + MAINTAINERCLEANFILES += doc/API # ############################################################ @@ -73,9 +81,8 @@ MAINTAINERCLEANFILES += doc/API # # ############################################################ -# to be written when something will go here... - - +pkgconfdir = $(libdir)/pkgconfig +pkgconf_DATA = config/sgpemv2.pc # ############################################################ # @@ -215,107 +222,17 @@ noinst_HEADERS += \ src/start_gui.hh \ src/text_simulation.hh -# ############################################################ -# -# source : libpyloader.la -# -# ############################################################ - -pyloaderdir = $(moduledir)/pyloader - -plugin_LTLIBRARIES += src/backend/pyloader/libpyloader.la - -src_backend_pyloader_libpyloader_la_CPPFLAGS = \ - -I@top_srcdir@ \ - -DMODDIR="\"$(pyloaderdir)\"" \ - -DLOCALEDIR="\"$(localedir)\"" \ - $(PYTHON_CPPFLAGS) \ - $(GLIBMM_CFLAGS) -src_backend_pyloader_libpyloader_la_CXXFLAGS = \ - $(VISIB_HIDDEN) -src_backend_pyloader_libpyloader_la_LIBADD = \ - $(PYTHON_LDFLAGS) \ - $(PYTHON_EXTRA_LIBS) \ - $(GLIBMM_LIBS) \ - src/backend/libbackend.la -src_backend_pyloader_libpyloader_la_LDFLAGS = \ - $(PYTHON_EXTRA_LDFLAGS) \ - $(LT_LDFLAGS) \ - -version-info 0:0:0 \ - -module - -# Please keep this in sorted order: -src_backend_pyloader_libpyloader_la_SOURCES = \ - src/backend/pyloader/python_policy.cc \ - src/backend/pyloader/python_policy_manager.cc \ - src/backend/pyloader/hook.cc - -noinst_HEADERS += \ - src/backend/pyloader/python_policy.hh \ - src/backend/pyloader/python_policy_manager.hh - -pyloader_PYTHON = \ - src/backend/pyloader/Abstract.py \ - src/backend/pyloader/Policy.py \ - src/backend/pyloader/ScriptAdapter.py - -# ############################################################ -# -# C++ modules -> Python loadable modules -# -# ############################################################ - -proxies = src/backend/pyloader/sgpem.py -wrappers = src/backend/pyloader/sgpem_wrap.cc - -pyloader_LTLIBRARIES = _sgpem.la -pyloader_PYTHON += $(proxies) - -# static pattern rule -$(proxies) $(wrappers) : src/backend/pyloader/sgpem.i - test -d "$(@D)" || mkdir -p -- "$(@D)" - $(SWIG) $(SWIG_PYTHON_OPT) -o $@ $< - -_sgpem_la_INTERFACES = src/backend/pyloader/sgpem.i - -_sgpem_la_CPPFLAGS = \ - -I@top_srcdir@ \ - -I@top_srcdir@/src/backend \ - $(SWIG_PYTHON_CPPFLAGS) \ - $(GLIBMM_CFLAGS) -_sgpem_la_LDFLAGS = -module -export-dynamic \ - $(GLIBMM_LDFLAGS) -_sgpem_la_LIBADD = src/backend/libbackend.la \ - $(GLIBMM_LIBS) -_sgpem_la_SOURCES = $(wrappers) - -EXTRA_DIST += $(_sgpem_la_INTERFACES) -MOSTLYCLEANFILES += $(proxies) $(wrappers) - # ############################################################ # # source : templates # # ############################################################ -EXTRA_DIST += \ - src/templates/parameter.tcc \ - src/templates/smartp.tcc - noinst_HEADERS += \ + src/templates/parameter.tcc \ + src/templates/smartp.tcc \ src/templates/smartp.hh -# ############################################################ -# -# source : builtin-policies -# -# ############################################################ - -# built-in policies -policies_PYTHON = \ - src/builtin-policies/fcfs.py \ - src/builtin-policies/sjf.py - # ############################################################ # # check : testsuite @@ -327,8 +244,7 @@ if COND_TESTS # DEJATOOL = src/testsuite/example-test.exp noinst_PROGRAMS = \ - src/testsuite/test-history \ - src/testsuite/test-python_loader + src/testsuite/test-history # disable : # src/testsuite/test-parse_command @@ -355,33 +271,6 @@ src_testsuite_test_history_SOURCES = \ # src/testsuite/test-parse_command.cc - -src_testsuite_test_python_loader_CPPFLAGS = \ - -I@top_srcdir@/src \ - -DMODDIR="\"$(pyloaderdir)\"" \ - $(PYTHON_CPPFLAGS) \ - $(GLIBMM_CFLAGS) \ - $(GTHREAD_CFLAGS) -src_testsuite_test_python_loader_DEPENDENCIES = \ - src/backend/pyloader/libpyloader.la -src_testsuite_test_python_loader_LDFLAGS = \ - src/backend/libbackend.la \ - $(GLIBMM_LIBS) $(GTHREAD_LIBS) \ - $(PYTHON_LDFLAGS) \ - $(PYTHON_EXTRA_LIBS) \ - $(PYTHON_EXTRA_LDFLAGS) -src_testsuite_test_python_loader_SOURCES = \ - src/testsuite/test-python_loader.cc \ - src/backend/pyloader/python_policy.cc \ - src/backend/pyloader/python_policy_manager.cc - -noinst_PYTHON += src/testsuite/python_loader_configure.py \ - src/testsuite/python_loader_sort_queue.py \ - src/testsuite/python_loader_is_preemptive.py \ - src/testsuite/python_loader_get_time_slice.py - - - # advice: get dummy_policy from the somewhere in the repository, and compile it in. #src_testsuite_test_stepforward_CPPFLAGS = \ # -I@top_srcdir@/src \ @@ -396,7 +285,7 @@ noinst_PYTHON += src/testsuite/python_loader_configure.py \ # Workaround an automake bug that leaves behind some files # while it's finishing the distcheck target CLEANFILES += \ - src/testsuite/.libs/test-python_loader \ src/testsuite/.libs/test-history endif #~ if COND_TESTS + diff --git a/autogen.sh b/autogen.sh index 9c70a9e..0c369b8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,6 +6,11 @@ if [ -d .svn ]; then # only recreate if we in svn repository echo "*info* creating ChangeLog from SVN history" sh ./config/svn2cl.sh + curdir=`pwd` + for i in plugins/*; do + cd "${i}" && sh ../../config/svn2cl.sh + cd ${curdir} + done fi fi touch ChangeLog diff --git a/configure.ac b/configure.ac index 023b818..3bc4a32 100644 --- a/configure.ac +++ b/configure.ac @@ -71,13 +71,8 @@ AC_PROG_INSTALL dnl make AC_PROG_MAKE_SET -dnl check for python and SWIG -AC_PYTHON_DEVEL([>= '2.3']) -AC_PROG_SWIG -SWIG_ENABLE_CXX -SWIG_PYTHON - dnl check for gtkmm & cairo +PKG_PROG_PKG_CONFIG([0.20]) PKG_CHECK_MODULES([CAIRO], [cairo >= $CAIRO_VERSION], :, AC_MSG_ERROR([$CAIRO_PKG_ERRORS])) @@ -147,8 +142,9 @@ AC_MSG_RESULT([$compile_tests]) AM_CONDITIONAL([COND_TESTS], [test "$compile_tests" = "yes"]) dnl output files -AC_CONFIG_FILES([config/Doxyfile]) +AC_CONFIG_FILES([config/Doxyfile config/sgpemv2.pc config/sgpemv2-uninstalled.pc]) AC_CONFIG_HEADERS([config.h:config.h.in]) +AC_CONFIG_SUBDIRS([plugins/pyloader]) AC_CONFIG_FILES([ Makefile