Packaging fixes for rc2. UI improvements.

Author: destijl

MANIFEST.in

@@ -12,6 +12,7 @@ recursive-exclude test_data *
 recursive-exclude executables *.zip
 recursive-exclude executables/windows/installers *.exe
 recursive-exclude executables *.bin
+recursive-exclude grr/config/debian *
 
 recursive-exclude client/minicomm *
 recursive-exclude * *.pyc

executables/components/__init__.py

@@ -15,10 +15,9 @@
 
 from grr.lib import config_lib
 from grr.lib import flags
+from grr.lib import osx_launchd as testdata
 from grr.lib import test_lib
 
-from grr.test_data import osx_launchd as testdata
-
 
 class OSXClientTests(test_lib.OSSpecificClientTests):
   """OSX client action tests."""

executables/darwin/.gitignore

@@ -8,6 +8,7 @@
 from grr.client import vfs
 from grr.lib import action_mocks
 from grr.lib import aff4
+from grr.lib import client_fixture
 from grr.lib import flags
 from grr.lib import test_lib
 from grr.lib import utils
@@ -16,7 +17,6 @@
 # pylint: enable=unused-import
 from grr.lib.rdfvalues import paths as rdf_paths
 from grr.lib.rdfvalues import protodict as rdf_protodict
-from grr.test_data import client_fixture
 
 
 class WindowsActionTests(test_lib.OSSpecificClientTests):

executables/linux/.gitignore

@@ -53,7 +53,7 @@ message RekallRequest {
     }];
 }
 
-// Next field: 8
+// Next field: 9
 message RekallResponse {
   // Deprecated. Anything written in this field will be compressed and placed
   // into the compressed_json_messages field upon serialization.
@@ -79,6 +79,11 @@ message RekallResponse {
   optional string repository_version = 6 [(sem_type) = {
       description: "The version of the repository we want to use."
     }, default="v1.0"];
+
+  repeated string downloaded_files = 8 [(sem_type) = {
+      description: "A list of downloaded files.",
+      type: "RDFURN",
+    }];
 }
 
 message RekallProfile {

grr/client/client_actions/osx/osx_test.py

@@ -14,6 +14,7 @@
 from grr.config import contexts
 from grr.config import data_server
 from grr.config import data_store
+from grr.config import gui
 from grr.config import local
 from grr.config import logging
 from grr.config import output_plugins

grr/client/client_actions/windows/windows_test.py

@@ -1,21 +1,14 @@
 #!/usr/bin/env python
 """Configuration parameters for the artifact subsystem."""
 
-import os
-
 from grr.lib import config_lib
 
 
 config_lib.DEFINE_list(
     "Artifacts.artifact_dirs",
-    [
-        os.path.normpath(os.path.dirname(__file__) + "/../../grr/artifacts"),
-        os.path.normpath(
-            os.path.dirname(__file__) + "/../../grr/artifacts/" +
-            "flow_templates"),
-        os.path.normpath(
-            os.path.dirname(__file__) +
-            "/../../grr/artifacts/local")],
+    ["%(grr/artifacts|resource)",
+     "%(grr/artifacts/flow_templates|resource)",
+     "%(grr/artifacts/local|resource)"],
     "A list directories to load artifacts from.")
 
 config_lib.DEFINE_list("Artifacts.knowledge_base",

grr/client/components/rekall_support/rekall.proto

@@ -7,7 +7,6 @@
 from grr.lib import rdfvalue
 from grr.lib import type_info
 
-
 # Windows Memory driver information.
 config_lib.DEFINE_string("MemoryDriver.driver_service_name",
                          "Pmem",
@@ -105,7 +104,8 @@ def FromString(self, string):
 import os
 
 # By default build in one dir mode.
-client_path = os.path.join\(r"%(%(ClientBuilder.source)|fixpathsep)", "grr", "client", "client.py"\)
+client_path = r"%(%(grr.client.client|module_path)|fixpathsep)"
+
 a = Analysis\(
     [client_path],
     hiddenimports=[],
@@ -195,7 +195,7 @@ def FromString(self, string):
 
 config_lib.DEFINE_bytes(
     "PyInstaller.icon",
-    "%(%(ClientBuilder.source)/grr/gui/static/images/grr.ico|file)",
+    "%(%(grr/gui/static/images/grr.ico|resource)|file)",
     "The icon file contents to use for building the client.")
 
 config_lib.DEFINE_string(
@@ -231,7 +231,7 @@ def FromString(self, string):
 
 config_lib.DEFINE_option(type_info.PathTypeInfo(
     name="ClientBuilder.nanny_source_dir", must_exist=True,
-    default="%(ClientBuilder.source)/grr/client/nanny/",
+    default="%(grr.client|module_path)/nanny/",
     help="Path to the windows nanny VS solution file."))
 
 config_lib.DEFINE_option(type_info.PathTypeInfo(
@@ -263,14 +263,13 @@ def FromString(self, string):
 
 config_lib.DEFINE_option(type_info.PathTypeInfo(
     name="ClientBuilder.template_path", must_exist=False,
-    default=(
-        "%(ClientBuilder.executables_dir)/%(Client.platform)/templates/"
-        "%(PyInstaller.template_filename)"),
-    help="The full path to the executable template file."))
+    default=("%(grr-response-templates|template-resource)/"
+             "templates/%(PyInstaller.template_filename)"),
+    help="The full path to the executable template files."))
 
 config_lib.DEFINE_option(type_info.PathTypeInfo(
     name="ClientBuilder.executables_dir", must_exist=False,
-    default="%(ClientBuilder.source)/grr/executables",
+    default="%(executables|resource)",
     help="The path to the grr executables directory."))
 
 config_lib.DEFINE_option(type_info.PathTypeInfo(
@@ -381,20 +380,14 @@ def FromString(self, string):
     default="%(Client.name)",
     help="The debian package name.")
 
-
-config_lib.DEFINE_option(type_info.PathTypeInfo(
-    name="ClientBuilder.source", must_exist=False,
-    default=os.path.normpath(__file__ + "/../../.."),
-    help="The location of the source files."))
-
 config_lib.DEFINE_option(type_info.PathTypeInfo(
     name="ClientBuilder.components_source_dir",
-    default="%(ClientBuilder.source)/grr/client/components",
+    default="%(grr.client.components|module_path)",
     help="The directory that contains the component source."))
 
 config_lib.DEFINE_option(type_info.PathTypeInfo(
     name="ClientBuilder.components_dir", must_exist=False,
-    default="%(ClientBuilder.executables_dir)/components",
+    default="%(grr-response-templates|template-resource)/components",
     help="The directory that contains the components."))
 
 config_lib.DEFINE_string(