Merge branch 'topic/alire_integration' into 'master'

Alire: add support for scenario variables

See merge request eng/ide/gnatstudio!484

Author: AnthonyLeonardoGracio

builder/src/build_command_manager-end_of_build.adb

@@ -235,8 +235,7 @@ package body Build_Command_Manager.End_Of_Build is
          if Directory /= No_File then
             Build.Full.Dir := Directory;
          else
-            Build.Full.Dir :=
-              Builder.Kernel.Registry.Tree.Root_Project.Project_Path.Dir;
+            Build.Full.Dir := GNATCOLL.VFS.Get_Current_Dir;
          end if;
       end if;
    end Local_Expand_Command_Line;

kernel/src/gps-kernel-remote.adb

@@ -824,7 +824,9 @@ package body GPS.Kernel.Remote is
          end if;
 
          if Active (Me) then
-            Trace (Me, "Spawning");
+            Trace
+              (Me,
+               "Spawning in directory: " & Get_Current_Dir.Display_Full_Name);
 
             if Args /= null then
                for J in Args'Range loop

share/support/core/alire.py

@@ -47,9 +47,11 @@
           <arg>--no-color</arg>
           <arg>--no-tty</arg>
           <arg>-q</arg>
+          <arg>--</arg>
+          <arg>%X</arg>
        </command-line>
        <iconname>gps-build-all-symbolic</iconname>
-       <switches command="%(tool_name)s" columns="1" lines="1">
+       <switches command="%(tool_name)s" columns="1" lines="1" sections="--">
          <title column="1" line="1" >Profiles</title>
             <radio
             line="1"
@@ -83,9 +85,11 @@
           <arg>--no-color</arg>
           <arg>--no-tty</arg>
           <arg>-q</arg>
+          <arg>--</arg>
+          <arg>%X</arg>
        </command-line>
        <iconname>gps-clean-symbolic</iconname>
-       <switches command="%(tool_name)s" columns="2" lines="1">
+       <switches command="%(tool_name)s" columns="2" lines="1" sections="--">
          <title column="1" line="1" >Options</title>
             <check label="Delete cache of releases" switch="--cache"
             tip="All downloaded dependencies will be deleted." />
@@ -103,31 +107,6 @@
        </output-parsers>
     </target-model>
 
-    <target-model name="Alire Run" category="">
-       <description>Launch an executable built by the crate</description>
-       <command-line>
-          <arg>alr</arg>
-          <arg>--non-interactive</arg>
-          <arg>--no-color</arg>
-          <arg>--no-tty</arg>
-          <arg>-q</arg>
-       </command-line>
-       <iconname>gps-run-symbolic</iconname>
-       <switches command="%(tool_name)s" columns="1" lines="1">
-         <title column="1" line="1" >Options</title>
-            <check label="Skip building step" switch="--skip-build"
-            tip="Skip the building step before running the executable(s)." />
-       </switches>
-       <output-parsers>
-         output_chopper
-         utf8_converter
-         progress_parser
-         alire_parser
-         console_writer
-         end_of_build
-       </output-parsers>
-    </target-model>
-
     <target model="Alire" category="Alire" name="Alire"
             messages_category="Alire">
        <in-toolbar>FALSE</in-toolbar>
@@ -169,6 +148,8 @@
           <arg>--no-tty</arg>
           <arg>-q</arg>
           <arg>build</arg>
+          <arg>--</arg>
+          <arg>%X</arg>
        </command-line>
     </target>
 
@@ -187,6 +168,8 @@
           <arg>--no-tty</arg>
           <arg>-q</arg>
           <arg>build</arg>
+          <arg>--</arg>
+          <arg>%X</arg>
        </command-line>
     </target>
 
@@ -204,6 +187,8 @@
           <arg>--no-tty</arg>
           <arg>-q</arg>
           <arg>clean</arg>
+          <arg>--</arg>
+          <arg>%X</arg>
        </command-line>
     </target>
 """
@@ -284,7 +269,8 @@ def display_message(timeout):
         # Alire is being ran
         timeout = GPS.Timeout(100, display_message)
         timeout.counter = 0
-    else:
+
+    elif not GPS.getenv("ALIRE"):
         # We are not loading an Alire project: unset the aliases
         # on Alire build targets.
         update_aliases_for_alire_targets(is_alire_project=False)
@@ -319,8 +305,15 @@ def on_compilation_finished(hook, category, target_name, mode_name, status, cmd)
             "Alire environment is now setup: project has been reloaded",
             importance=GPS.Message.Importance.INFORMATIONAL,
         )
+
         update_aliases_for_alire_targets(is_alire_project=True)
         GPS.MDI.information_popup("Alire project is now setup", "vcs-up-to-date")
+
+        # Change GS's current directory to Alire project's root directory.
+        GPS.Logger("ALIRE").log("Changing current directory to: %s" % root)
+        GPS.cd(root)
+        GPS.Logger("ALIRE").log("Current directory is now: %s" % GPS.pwd())
+
         project_to_reload = None
 
 
@@ -352,7 +345,7 @@ def on_project_changing(hook, file):
     root = find_alire_root(file.path)
 
     if root:
-        GPS.Logger("ALIRE").log("Alire manifest detected!")
+        GPS.Logger("ALIRE").log("Alire manifest detected at: %s" % file.path)
         project_to_reload = (file.path, root)