mirror of
https://github.com/vector-im/element-desktop.git
synced 2024-09-09 22:05:10 +00:00
Merge pull request #63 from vector-im/jryans/extract-versions-to-hak
Extract dep versions out to hak.json
This commit is contained in:
commit
e975a1af50
3 changed files with 20 additions and 13 deletions
|
@ -31,7 +31,8 @@ module.exports = async function(hakEnv, moduleInfo) {
|
||||||
};
|
};
|
||||||
|
|
||||||
async function buildOpenSslWin(hakEnv, moduleInfo) {
|
async function buildOpenSslWin(hakEnv, moduleInfo) {
|
||||||
const openSslDir = path.join(moduleInfo.moduleDotHakDir, 'openssl-1.1.1d');
|
const version = moduleInfo.dependencies.openssl;
|
||||||
|
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';
|
||||||
|
|
||||||
|
@ -132,7 +133,8 @@ async function buildOpenSslWin(hakEnv, moduleInfo) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function buildSqlCipherWin(hakEnv, moduleInfo) {
|
async function buildSqlCipherWin(hakEnv, moduleInfo) {
|
||||||
const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, 'sqlcipher-4.3.0');
|
const version = moduleInfo.dependencies.sqlcipher;
|
||||||
|
const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
|
||||||
const buildDir = path.join(sqlCipherDir, 'bld');
|
const buildDir = path.join(sqlCipherDir, 'bld');
|
||||||
|
|
||||||
await mkdirp(buildDir);
|
await mkdirp(buildDir);
|
||||||
|
@ -168,7 +170,8 @@ async function buildSqlCipherWin(hakEnv, moduleInfo) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function buildSqlCipherUnix(hakEnv, moduleInfo) {
|
async function buildSqlCipherUnix(hakEnv, moduleInfo) {
|
||||||
const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, 'sqlcipher-4.3.0');
|
const version = moduleInfo.dependencies.sqlcipher;
|
||||||
|
const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
|
||||||
|
|
||||||
const args = [
|
const args = [
|
||||||
'--prefix=' + moduleInfo.depPrefix + '',
|
'--prefix=' + moduleInfo.depPrefix + '',
|
||||||
|
|
|
@ -33,7 +33,8 @@ module.exports = async function(hakEnv, moduleInfo) {
|
||||||
};
|
};
|
||||||
|
|
||||||
async function getSqlCipher(hakEnv, moduleInfo) {
|
async function getSqlCipher(hakEnv, moduleInfo) {
|
||||||
const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, 'sqlcipher-4.3.0');
|
const version = moduleInfo.dependencies.sqlcipher;
|
||||||
|
const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
|
||||||
|
|
||||||
let haveSqlcipher;
|
let haveSqlcipher;
|
||||||
try {
|
try {
|
||||||
|
@ -45,7 +46,7 @@ async function getSqlCipher(hakEnv, moduleInfo) {
|
||||||
|
|
||||||
if (haveSqlcipher) return;
|
if (haveSqlcipher) return;
|
||||||
|
|
||||||
const sqlCipherTarball = path.join(moduleInfo.moduleDotHakDir, 'sqlcipher-4.3.0.tar.gz');
|
const sqlCipherTarball = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}.tar.gz`);
|
||||||
let haveSqlcipherTar;
|
let haveSqlcipherTar;
|
||||||
try {
|
try {
|
||||||
await fsProm.stat(sqlCipherTarball);
|
await fsProm.stat(sqlCipherTarball);
|
||||||
|
@ -54,7 +55,7 @@ async function getSqlCipher(hakEnv, moduleInfo) {
|
||||||
haveSqlcipherTar = false;
|
haveSqlcipherTar = false;
|
||||||
}
|
}
|
||||||
if (!haveSqlcipherTar) {
|
if (!haveSqlcipherTar) {
|
||||||
const bob = needle('get', 'https://github.com/sqlcipher/sqlcipher/archive/v4.3.0.tar.gz', {
|
const bob = needle('get', `https://github.com/sqlcipher/sqlcipher/archive/v${version}.tar.gz`, {
|
||||||
follow: 10,
|
follow: 10,
|
||||||
output: sqlCipherTarball,
|
output: sqlCipherTarball,
|
||||||
});
|
});
|
||||||
|
@ -70,7 +71,7 @@ async function getSqlCipher(hakEnv, moduleInfo) {
|
||||||
// On Windows, we need to patch the makefile because it forces TEMP_STORE to
|
// On Windows, we need to patch the makefile because it forces TEMP_STORE to
|
||||||
// default to files (1) but the README specifically says you '*must*' set it
|
// default to files (1) but the README specifically says you '*must*' set it
|
||||||
// set it to 2 (default to memory).
|
// set it to 2 (default to memory).
|
||||||
const patchFile = path.join(moduleInfo.moduleHakDir, 'sqlcipher-4.3.0-win.patch');
|
const patchFile = path.join(moduleInfo.moduleHakDir, `sqlcipher-${version}-win.patch`);
|
||||||
|
|
||||||
await new Promise((resolve, reject) => {
|
await new Promise((resolve, reject) => {
|
||||||
const readStream = fs.createReadStream(patchFile);
|
const readStream = fs.createReadStream(patchFile);
|
||||||
|
@ -92,9 +93,8 @@ async function getSqlCipher(hakEnv, moduleInfo) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getOpenSsl(hakEnv, moduleInfo) {
|
async function getOpenSsl(hakEnv, moduleInfo) {
|
||||||
const osslVersion = '1.1.1f';
|
const version = moduleInfo.dependencies.openssl;
|
||||||
|
const openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`);
|
||||||
const openSslDir = path.join(moduleInfo.moduleDotHakDir, 'openssl-' + osslVersion);
|
|
||||||
|
|
||||||
let haveOpenSsl;
|
let haveOpenSsl;
|
||||||
try {
|
try {
|
||||||
|
@ -106,7 +106,7 @@ async function getOpenSsl(hakEnv, moduleInfo) {
|
||||||
|
|
||||||
if (haveOpenSsl) return;
|
if (haveOpenSsl) return;
|
||||||
|
|
||||||
const openSslTarball = path.join(moduleInfo.moduleDotHakDir, 'openssl-' + osslVersion + '.tar.gz');
|
const openSslTarball = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}.tar.gz`);
|
||||||
let haveOpenSslTar;
|
let haveOpenSslTar;
|
||||||
try {
|
try {
|
||||||
await fsProm.stat(openSslTarball);
|
await fsProm.stat(openSslTarball);
|
||||||
|
@ -115,7 +115,7 @@ async function getOpenSsl(hakEnv, moduleInfo) {
|
||||||
haveOpenSslTar = false;
|
haveOpenSslTar = false;
|
||||||
}
|
}
|
||||||
if (!haveOpenSslTar) {
|
if (!haveOpenSslTar) {
|
||||||
await needle('get', 'https://www.openssl.org/source/openssl-' + osslVersion + '.tar.gz', {
|
await needle('get', `https://www.openssl.org/source/openssl-${version}.tar.gz`, {
|
||||||
follow: 10,
|
follow: 10,
|
||||||
output: openSslTarball,
|
output: openSslTarball,
|
||||||
});
|
});
|
||||||
|
|
|
@ -5,5 +5,9 @@
|
||||||
"build": "build.js"
|
"build": "build.js"
|
||||||
},
|
},
|
||||||
"prune": "native",
|
"prune": "native",
|
||||||
"copy": "native/index.node"
|
"copy": "native/index.node",
|
||||||
|
"dependencies": {
|
||||||
|
"openssl": "1.1.1f",
|
||||||
|
"sqlcipher": "4.3.0"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue