Merged from upstream/master

2 files changed, 33 insertions, 14 deletions

diff --git a/xmake/scripts/cmake_importfiles/xxxTargets.cmake b/xmake/scripts/cmake_importfiles/xxxTargets.cmake
index 7ade9f919..bdf2774e9 100644
--- a/xmake/scripts/cmake_importfiles/xxxTargets.cmake
+++ b/xmake/scripts/cmake_importfiles/xxxTargets.cmake
@@ -1,4 +1,4 @@
-# Generated by CMake
+# Generated by XMake
 
 if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
    message(FATAL_ERROR "CMake >= 2.6.0 required")
diff --git a/xmake/scripts/xrepo-hook.psm1 b/xmake/scripts/xrepo-hook.psm1
index 902ef3b16..2a2c24c05 100644
--- a/xmake/scripts/xrepo-hook.psm1
+++ b/xmake/scripts/xrepo-hook.psm1
@@ -10,25 +10,44 @@
 #>
 function Enter-XrepoEnvironment {
     [CmdletBinding()]
-    param();
+    param(
+        [string]$bnd
+    );
 
     begin {
         $script:xrepoOldEnvs = (Get-ChildItem -Path Env:);
 
-        & $Env:XMAKE_EXE lua private.xrepo.action.env.info config;
-        if (-not $?) {
-            Exit 1;
-        }
+        if ($bnd -eq $Null) {
+            & $Env:XMAKE_EXE lua private.xrepo.action.env.info config;
+            if (-not $?) {
+                Exit 1;
+            }
 
-        $xmakeColorTermBackup, $Env:XMAKE_COLORTERM = $Env:XMAKE_COLORTERM, "nocolor";
-        $xrepoPrompt = (& $Env:XMAKE_EXE lua private.xrepo.action.env.info prompt | Out-String);
-        $Env:XMAKE_COLORTERM = $xmakeColorTermBackup;
-        if (-not $xrepoPrompt.StartsWith("[")) {
-            Write-Host $xrepoPrompt;
-            Exit 1;
-        }
+            $xmakeColorTermBackup, $Env:XMAKE_COLORTERM = $Env:XMAKE_COLORTERM, "nocolor";
+            $xrepoPrompt = (& $Env:XMAKE_EXE lua --quiet private.xrepo.action.env.info prompt | Out-String);
+            $Env:XMAKE_COLORTERM = $xmakeColorTermBackup;
+            if (-not $xrepoPrompt.StartsWith("[")) {
+                Write-Host "error: xmake.lua not found!";
+                Exit 1;
+            }
 
-        $activateCommand = (& $Env:XMAKE_EXE lua private.xrepo.action.env.info script.powershell | Out-String);
+            $activateCommand = (& $Env:XMAKE_EXE lua --quiet private.xrepo.action.env.info script.powershell | Out-String);
+        } else {
+            & $Env:XMAKE_EXE lua private.xrepo.action.env.info config $bnd;
+            if (-not $?) {
+                Exit 1;
+            }
+
+            $xmakeColorTermBackup, $Env:XMAKE_COLORTERM = $Env:XMAKE_COLORTERM, "nocolor";
+            $xrepoPrompt = (& $Env:XMAKE_EXE lua --quiet private.xrepo.action.env.info prompt $bnd | Out-String);
+            $Env:XMAKE_COLORTERM = $xmakeColorTermBackup;
+            if (-not $xrepoPrompt.StartsWith("[")) {
+                Write-Host "error: invalid environment!";
+                Exit 1;
+            }
+
+            $activateCommand = (& $Env:XMAKE_EXE lua --quiet private.xrepo.action.env.info script.powershell $bnd | Out-String);
+        }
 
         Write-Verbose "[xrepo env script.powershell]`n$activateCommand";
         Invoke-Expression -Command $activateCommand;