X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=lttng_ivc%2Futils%2Fproject.py;h=073acb19cc0c2ea7510c79abe783175613b60735;hb=2dd375bf203edfbdddf696d1bf9eed8f5d2f4e95;hp=fbd7f14ac4d5cfabbc72aa77d3677c6826c13735;hpb=e5cbfcca39522bd237e4611ffaaab8a8550640ef;p=deliverable%2Flttng-ivc.git

diff --git a/lttng_ivc/utils/project.py b/lttng_ivc/utils/project.py
index fbd7f14..073acb1 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, find_file
 
 _logger = logging.getLogger('project')
 
@@ -307,6 +308,12 @@ class Lttng_modules(Project):
         p.check_returncode()
         self.isInstalled = True
 
+    def autobuild(self):
+        try:
+            super(Lttng_modules, self).autobuild()
+        except subprocess.CalledProcessError as e:
+            self.skip = True
+
 
 class Lttng_ust(Project):
     def __init__(self, label, git_path, sha1, tmpdir):
@@ -316,8 +323,19 @@ class Lttng_ust(Project):
         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")
-        self.add_special_env_variable("CLASSPATH", "{}".format(jul_path))
+        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):
@@ -327,6 +345,15 @@ class Lttng_tools(Project):
         self.add_special_env_variable("LTTNG_SESSION_CONFIG_XSD_PATH",
                 os.path.join(self.installation_path, "share/xml/lttng/"))
 
+        # Find the mi xsd
+        for xsd in Settings.mi_xsd_file_name:
+            mi = find_file(self.source_path, xsd)
+            if mi:
+                break
+        if not mi:
+            raise Exception("MI xsd not found")
+        self.mi_xsd = mi
+
 
 class Babeltrace(Project):
     pass