From 8da3c976d64a5d25969b6019efa246e29186ea6f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Sat, 4 Apr 2020 00:21:52 +0100 Subject: [PATCH] Add cfg to access the hak.json --- hak/matrix-seshat/build.js | 6 +++--- hak/matrix-seshat/fetchDeps.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hak/matrix-seshat/build.js b/hak/matrix-seshat/build.js index 84fd22f..444b95c 100644 --- a/hak/matrix-seshat/build.js +++ b/hak/matrix-seshat/build.js @@ -31,7 +31,7 @@ module.exports = async function(hakEnv, moduleInfo) { }; async function buildOpenSslWin(hakEnv, moduleInfo) { - const version = moduleInfo.dependencies.openssl; + const version = moduleInfo.cfg.dependencies.openssl; const openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`); const openSslArch = hakEnv.arch === 'x64' ? 'VC-WIN64A' : 'VC-WIN32'; @@ -133,7 +133,7 @@ async function buildOpenSslWin(hakEnv, moduleInfo) { } async function buildSqlCipherWin(hakEnv, moduleInfo) { - const version = moduleInfo.dependencies.sqlcipher; + const version = moduleInfo.cfg.dependencies.sqlcipher; const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`); const buildDir = path.join(sqlCipherDir, 'bld'); @@ -170,7 +170,7 @@ async function buildSqlCipherWin(hakEnv, moduleInfo) { } async function buildSqlCipherUnix(hakEnv, moduleInfo) { - const version = moduleInfo.dependencies.sqlcipher; + const version = moduleInfo.cfg.dependencies.sqlcipher; const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`); const args = [ diff --git a/hak/matrix-seshat/fetchDeps.js b/hak/matrix-seshat/fetchDeps.js index 354a352..9114f98 100644 --- a/hak/matrix-seshat/fetchDeps.js +++ b/hak/matrix-seshat/fetchDeps.js @@ -33,7 +33,7 @@ module.exports = async function(hakEnv, moduleInfo) { }; async function getSqlCipher(hakEnv, moduleInfo) { - const version = moduleInfo.dependencies.sqlcipher; + const version = moduleInfo.cfg.dependencies.sqlcipher; const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`); let haveSqlcipher; @@ -93,7 +93,7 @@ async function getSqlCipher(hakEnv, moduleInfo) { } async function getOpenSsl(hakEnv, moduleInfo) { - const version = moduleInfo.dependencies.openssl; + const version = moduleInfo.cfg.dependencies.openssl; const openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`); let haveOpenSsl;