mirror of
https://github.com/vector-im/element-desktop.git
synced 2024-09-17 01:35:12 +00:00
Merge pull request #65 from vector-im/jryans/extract-versions-to-hak
Add cfg to access the hak.json
This commit is contained in:
commit
1fb8e3ab31
2 changed files with 5 additions and 5 deletions
|
@ -31,7 +31,7 @@ module.exports = async function(hakEnv, moduleInfo) {
|
||||||
};
|
};
|
||||||
|
|
||||||
async function buildOpenSslWin(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 openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`);
|
||||||
|
|
||||||
const openSslArch = hakEnv.arch === 'x64' ? 'VC-WIN64A' : 'VC-WIN32';
|
const openSslArch = hakEnv.arch === 'x64' ? 'VC-WIN64A' : 'VC-WIN32';
|
||||||
|
@ -133,7 +133,7 @@ async function buildOpenSslWin(hakEnv, moduleInfo) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function buildSqlCipherWin(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 sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
|
||||||
const buildDir = path.join(sqlCipherDir, 'bld');
|
const buildDir = path.join(sqlCipherDir, 'bld');
|
||||||
|
|
||||||
|
@ -170,7 +170,7 @@ async function buildSqlCipherWin(hakEnv, moduleInfo) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function buildSqlCipherUnix(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 sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
|
||||||
|
|
||||||
const args = [
|
const args = [
|
||||||
|
|
|
@ -33,7 +33,7 @@ module.exports = async function(hakEnv, moduleInfo) {
|
||||||
};
|
};
|
||||||
|
|
||||||
async function getSqlCipher(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}`);
|
const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
|
||||||
|
|
||||||
let haveSqlcipher;
|
let haveSqlcipher;
|
||||||
|
@ -93,7 +93,7 @@ async function getSqlCipher(hakEnv, moduleInfo) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getOpenSsl(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}`);
|
const openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`);
|
||||||
|
|
||||||
let haveOpenSsl;
|
let haveOpenSsl;
|
||||||
|
|
Loading…
Reference in a new issue