diff --git a/dist/index.js b/dist/index.js index 1ddc108..b3244ae 100644 --- a/dist/index.js +++ b/dist/index.js @@ -82512,6 +82512,10 @@ async function getBuildCachePath() { const projectRootPath = getProjectRootPath(); if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) { const options = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; options.cwd = projectRootPath; options.listeners = { stdout: (data) => { @@ -82599,7 +82603,12 @@ async function saveBuildCache() { await io.cp(buildCachePath, fullCachePath, { recursive: true, }); - await (0, exec_1.exec)('xmake', ['l', 'os.touch', path.join(fullCachePath, 'build_cache_saved.txt')]); + const options = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; + await (0, exec_1.exec)('xmake', ['l', 'os.touch', path.join(fullCachePath, 'build_cache_saved.txt')], options); await cache.saveCache([buildCacheFolder], buildCacheKey); } } @@ -82801,6 +82810,10 @@ async function getPackageCacheKey() { const projectRootPath = getProjectRootPath(); if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) { const options = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; options.cwd = projectRootPath; options.listeners = { stdout: (data) => { @@ -82816,6 +82829,10 @@ async function getPackageCacheKey() { async function getPackageCachePath() { let packageCachePath = ''; const options = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; options.listeners = { stdout: (data) => { packageCachePath += data.toString(); @@ -82880,6 +82897,12 @@ async function savePackageCache() { await io.cp(packageCachePath, fullCachePath, { recursive: true, }); + const options = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; + await (0, exec_1.exec)('xmake', ['l', 'os.touch', path.join(fullCachePath, 'package_cache_saved.txt')], options); await cache.saveCache([packageCacheFolder], packageCacheKey); } } diff --git a/src/build-cache.ts b/src/build-cache.ts index 679c8be..e4cc56e 100644 --- a/src/build-cache.ts +++ b/src/build-cache.ts @@ -56,6 +56,10 @@ async function getBuildCachePath(): Promise { const projectRootPath = getProjectRootPath(); if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) { const options: ExecOptions = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; options.cwd = projectRootPath; options.listeners = { stdout: (data: Buffer) => { @@ -153,7 +157,12 @@ export async function saveBuildCache(): Promise { await io.cp(buildCachePath, fullCachePath, { recursive: true, }); - await exec('xmake', ['l', 'os.touch', path.join(fullCachePath, 'build_cache_saved.txt')]); + const options: ExecOptions = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; + await exec('xmake', ['l', 'os.touch', path.join(fullCachePath, 'build_cache_saved.txt')], options); await cache.saveCache([buildCacheFolder], buildCacheKey); } } diff --git a/src/package-cache.ts b/src/package-cache.ts index 819fcec..9564f88 100644 --- a/src/package-cache.ts +++ b/src/package-cache.ts @@ -27,6 +27,10 @@ async function getPackageCacheKey(): Promise { const projectRootPath = getProjectRootPath(); if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) { const options: ExecOptions = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; options.cwd = projectRootPath; options.listeners = { stdout: (data: Buffer) => { @@ -43,6 +47,10 @@ async function getPackageCacheKey(): Promise { async function getPackageCachePath(): Promise { let packageCachePath = ''; const options: ExecOptions = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; options.listeners = { stdout: (data: Buffer) => { packageCachePath += data.toString(); @@ -112,6 +120,12 @@ export async function savePackageCache(): Promise { await io.cp(packageCachePath, fullCachePath, { recursive: true, }); + const options: ExecOptions = {}; + options.env = { + ...process.env, + XMAKE_ROOT: 'y', + }; + await exec('xmake', ['l', 'os.touch', path.join(fullCachePath, 'package_cache_saved.txt')], options); await cache.saveCache([packageCacheFolder], packageCacheKey); } } diff --git a/tests/sample/xmake.lua b/tests/sample/xmake.lua index 8c88caf..b9afdb9 100644 --- a/tests/sample/xmake.lua +++ b/tests/sample/xmake.lua @@ -1,9 +1,9 @@ add_rules("mode.debug", "mode.release") -add_requires("libpng", "libogg", {system = false}) +add_requires("libpng", "libogg", "libplist", {system = false}) target("sample") set_kind("binary") add_files("src/*.cpp") - add_packages("libpng", "libogg") + add_packages("libpng", "libogg", "libplist")