X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng_ivc%2Futils%2Fproject.py;h=bd389a59b4fb6b7257f63757b6074390fc098dad;hb=2094d6728ae830f68895da418315d6523a9815f8;hp=f508c31cd591b912ed2bbc60eeec9e3234466142;hpb=cb87ff891c9968115d151a54e93695da0ac4df02;p=deliverable%2Flttng-ivc.git

diff --git a/lttng_ivc/utils/project.py b/lttng_ivc/utils/project.py
index f508c31..bd389a5 100644
--- a/lttng_ivc/utils/project.py
+++ b/lttng_ivc/utils/project.py
@@ -6,6 +6,7 @@ import logging
 import lttng_ivc.settings as Settings
 
 from lttng_ivc.utils.utils import sha256_checksum
+from lttng_ivc.utils.utils import find_dir
 
 _logger = logging.getLogger('project')
 
@@ -34,6 +35,7 @@ class Project(object):
         self.isBuilt = False
         self.isConfigured = False
         self.isInstalled = False
+        self.skip = False
 
         self.basedir = tmpdir
         self.log_path = os.path.join(tmpdir, "log")
@@ -282,7 +284,7 @@ class Lttng_modules(Project):
     def __init__(self, label, git_path, sha1, tmpdir):
         super(Lttng_modules, self).__init__(label=label, git_path=git_path,
                                             sha1=sha1, tmpdir=tmpdir)
-        self.add_special_env_variable("MODPROBE_OPTIONS","-b {}".format(self.installation_path))
+        self.add_special_env_variable("MODPROBE_OPTIONS","-d {}".format(self.installation_path))
 
     def bootstrap(self):
         pass
@@ -312,6 +314,22 @@ class Lttng_ust(Project):
         super(Lttng_ust, self).__init__(label=label, git_path=git_path,
                                         sha1=sha1, tmpdir=tmpdir)
         self.custom_configure_flags.extend(['--disable-man-pages'])
+        self.custom_configure_flags.extend(['--enable-python-agent'])
+        self.custom_configure_flags.extend(['--enable-java-agent-jul'])
+
+        jul_path = os.path.join(self.installation_path,
+                "share/java/liblttng-ust-agent.jar")
+        classpath = ":".join([jul_path, Settings.log4j_class_path, '.'])
+        self.add_special_env_variable("CLASSPATH", classpath)
+
+    def install(self):
+        super(Lttng_ust, self).install()
+        python_path = find_dir(self.installation_path, "lttngust")
+        if python_path:
+            # Fetch the parent of lttngust folder
+            python_path = os.path.dirname(python_path)
+            self.add_special_env_variable("PYTHONPATH", python_path)
+
 
 
 class Lttng_tools(Project):