@brunoluizdesiqueira/bbuilder-cli 1.0.5 → 1.0.7

package/dist/build/compiler.js

@@ -45,6 +45,7 @@ const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const output_1 = require("../ui/output");
+const delphiEnvCache = new Map();
 function buildCompilerFlags(buildType) {
     const baseDefines = 'DEBUG;ALT_CEF133_0;EUREKALOG';
     const releaseDefines = 'RELEASE;ALT_CEF133_0;EUREKALOG';
@@ -75,25 +76,55 @@ function buildDependencies(opts) {
     // dcc64 fail to resolve paths such as the Delphi runtime library.
     return opts.dependencyPaths.join(';');
 }
-function quoteForCmd(value) {
-    if (!value)
-        return '""';
-    return `"${value.replace(/"/g, '""')}"`;
+function parseWindowsEnv(output) {
+    const env = {};
+    for (const line of output.split(/\r?\n/)) {
+        const separatorIndex = line.indexOf('=');
+        if (separatorIndex <= 0)
+            continue;
+        const key = line.slice(0, separatorIndex).trim();
+        const value = line.slice(separatorIndex + 1);
+        if (!key)
+            continue;
+        env[key] = value;
+    }
+    return env;
 }
-async function runWindowsCommand(executable, args, cwd) {
-    const command = [quoteForCmd(executable), ...args.map(quoteForCmd)].join(' ');
-    await (0, execa_1.default)('cmd.exe', ['/d', '/s', '/c', command], {
-        cwd,
-        stdio: 'inherit',
-    });
+async function getDelphiEnvironment(delphiDir) {
+    const cached = delphiEnvCache.get(delphiDir);
+    if (cached) {
+        return cached;
+    }
+    const rsvarsPath = path.win32.join(delphiDir, 'bin', 'rsvars.bat');
+    if (!fs.existsSync(rsvarsPath)) {
+        (0, output_1.fatal)(`Arquivo não encontrado: ${rsvarsPath}`);
+    }
+    try {
+        const result = await (0, execa_1.default)('cmd.exe', ['/d', '/s', '/c', `call "${rsvarsPath}" >nul && set`], {
+            env: process.env,
+        });
+        const resolved = {
+            ...process.env,
+            ...parseWindowsEnv(result.stdout),
+        };
+        delphiEnvCache.set(delphiDir, resolved);
+        return resolved;
+    }
+    catch {
+        (0, output_1.fatal)('Falha ao carregar o ambiente do Delphi via rsvars.bat.');
+    }
 }
 async function runCgrc(opts, projectName) {
     const tempDir = path.join(os.tmpdir(), `BimerBuild_${projectName}`);
     const vrcFile = path.join(tempDir, `${projectName}.vrc`);
     const resFile = path.join(tempDir, `${projectName}.res`);
+    const delphiEnv = await getDelphiEnvironment(opts.delphiDir);
     (0, output_1.step)('Compilando recursos e embutindo ícone...');
     try {
-        await runWindowsCommand(path.win32.join(opts.delphiDir, 'bin', 'cgrc.exe'), [vrcFile, `-fo${resFile}`]);
+        await (0, execa_1.default)(path.win32.join(opts.delphiDir, 'bin', 'cgrc.exe'), [vrcFile, `-fo${resFile}`], {
+            env: delphiEnv,
+            stdio: 'inherit',
+        });
     }
     catch {
         (0, output_1.fatal)('Falha do compilador CGRC ao gerar o arquivo de recursos .res.');
@@ -105,6 +136,7 @@ async function runDcc64(opts, projectName, workspaceDir) {
     const deps = buildDependencies(opts);
     const exeOut = path.win32.join('C:\\Temp', opts.envVersion, 'EXE');
     const dcuOut = path.win32.join('C:\\Temp', opts.envVersion, 'DCU');
+    const delphiEnv = await getDelphiEnvironment(opts.delphiDir);
     if (!fs.existsSync(exeOut))
         fs.mkdirSync(exeOut, { recursive: true });
     if (!fs.existsSync(dcuOut))
@@ -136,7 +168,11 @@ async function runDcc64(opts, projectName, workspaceDir) {
         `${projectName}.dpr`,
     ];
     try {
-        await runWindowsCommand(dcc64, args, workspaceDir);
+        await (0, execa_1.default)(dcc64, args, {
+            cwd: workspaceDir,
+            env: delphiEnv,
+            stdio: 'inherit',
+        });
     }
     catch {
         (0, output_1.fatal)('Falha na compilação do Delphi. Verifique os logs de erro acima.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brunoluizdesiqueira/bbuilder-cli",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "CLI de build local para projetos Delphi do Bimer",
   "license": "ISC",
   "repository": {