Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-08-10 23:43:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #65 from vector-im/jryans/extract-versions-to-hak

Browse source 
Add cfg to access the hak.json
This commit is contained in:
J. Ryan Stinnett 2020-04-04 00:24:42 +01:00 committed by GitHub
commit 1fb8e3ab31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hak/matrix-seshat/build.js
View file

@ -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 = [

4
hak/matrix-seshat/fetchDeps.js
View file

@ -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;