diff --git a/src/components/options/options.scss b/src/components/options/options.scss
index 2ab48cf..db4451f 100644
--- a/src/components/options/options.scss
+++ b/src/components/options/options.scss
@@ -16,7 +16,8 @@
> .content {
width: 100%;
- overflow-x: hidden;
+ height: 100%;
+ overflow: hidden;
display: flex;
flex-direction: column;
@@ -32,7 +33,9 @@
grid-template-columns: 1fr 10px 1fr 10px 1fr;
grid-template-rows: 1fr 10px 1fr 10px 1fr;
grid-template-areas: "ul . . . ur" ". . . . ." "ll . lc . lr" "f f f f f" "bl fl bc fr br""jeol jeol jeol jeol jeol";
- height: 200px;
+ min-height: 140px;
+ max-height: 200px;
+ height: 30%;
width: calc(90% - 4px);
margin-left: 5%;
border-radius: 4px;
@@ -223,7 +226,7 @@
> ul {
overflow-y: hidden !important;
- height: 100%;
+ height: max-content;
}
}
diff --git a/src/components/options/optionslist.jsx b/src/components/options/optionslist.jsx
index 247c3bc..d243940 100644
--- a/src/components/options/optionslist.jsx
+++ b/src/components/options/optionslist.jsx
@@ -23,7 +23,7 @@ module.exports = class OptionsList extends Component {
}
}
- componentWillUpdate(nextProps, nextState, nextContext) {
+ UNSAFE_componentWillUpdate(nextProps, nextState, nextContext) {
const selectedUuid = generalStore.get('selectedUuid');
let image = generalStore.get('images').get(selectedUuid);
image = image ? image : generalStore.get('safebox').get(selectedUuid);
diff --git a/src/components/settings/settings.jsx b/src/components/settings/settings.jsx
index 573fcd4..07413d1 100644
--- a/src/components/settings/settings.jsx
+++ b/src/components/settings/settings.jsx
@@ -26,6 +26,9 @@ class Settings extends Component {
}
+
);
diff --git a/src/components/sidebar/sidebar.scss b/src/components/sidebar/sidebar.scss
index 9250c20..b305102 100644
--- a/src/components/sidebar/sidebar.scss
+++ b/src/components/sidebar/sidebar.scss
@@ -49,7 +49,7 @@ p {
> .content {
width: 100%;
- overflow-x: hidden;
+ overflow: hidden;
display: flex;
flex-direction: column;
diff --git a/tests/reimagertest.js b/tests/reimagertest.js
index 8bbb1e7..8538def 100644
--- a/tests/reimagertest.js
+++ b/tests/reimagertest.js
@@ -2,50 +2,7 @@ const fs = require('fs');
const generateUuid = require('../src/backend/generateuuid');
const Reimager = require('../src/backend/children/reimager/child.js');
-
-class FakeComm {
- constructor() {
- this.data = {
- one: {
- listeners: new Map()
- },
- two: {
- listeners: new Map()
- }
- }
- }
-
- get endOne() {
- return {
- send: this.send.bind(this, 'two'),
- on: this.on.bind(this, 'one')
- }
- }
-
- get endTwo() {
- return {
- send: this.send.bind(this, 'one'),
- on: this.on.bind(this, 'two')
- }
- }
-
- send(end, message) {
- const listeners = this.data[end].listeners.get('message');
- if (listeners)
- for (const listener of listeners)
- listener(message);
- }
-
- on(end, event, listener) {
- if (typeof listener === 'function') {
- const listeners = this.data[end].listeners.get(event);
- if (listeners)
- listeners.push(listener);
- else
- this.data[end].listeners.set(event, [listener]);
- }
- }
-}
+const FakeComm = require('../src/backend/fakecomm.js');
const fakeComm = new FakeComm();
diff --git a/build.js b/util/build.js
similarity index 100%
rename from build.js
rename to util/build.js
diff --git a/util/clean.js b/util/clean.js
new file mode 100644
index 0000000..e7fd419
--- /dev/null
+++ b/util/clean.js
@@ -0,0 +1,78 @@
+const fs = require('fs/promises');
+
+const data = {
+ distClean: {
+ build: {
+ all: true
+ },
+ dist: {
+ all: true
+ },
+ bin: {
+ all: true
+ }
+ },
+ clean: {
+ build: {
+ dirs: ['lib', 'include', 'share', 'bin', 'etc']
+ },
+ bin: {
+ files: []
+ },
+ dist: {
+ all: true
+ }
+ }
+};
+
+async function clean(type = 'clean') {
+ const dirs = (await fs.readdir('../')).map(e => {
+ if (data.clean[e] !== undefined) {
+ let dir = JSON.parse(JSON.stringify(data[type][e]));
+ dir.name = e;
+ return dir;
+ }
+ return undefined;
+ }).filter(e => e !== undefined);
+
+ let filePrefix = __dirname + '../';
+ for (const dir of dirs)
+ if (dir.all) {
+ try {
+ console.log(`Deleting ${filePrefix}${dir.name}/*`);
+ await fs.rmdir(`${filePrefix}${dir.name}`, {recursive: true});
+ await fs.mkdir(`${filePrefix}${dir.name}`);
+ } catch(e) {
+ }
+ } else {
+ if (dir.files)
+ for (const fileName of dir.files)
+ try {
+ console.log(`Deleting ${filePrefix}${dir.name}/${fileName}`);
+ await fs.unlink(`${filePrefix}${dir.name}/${fileName}`);
+ } catch(e) {
+ }
+
+ if (dir.dirs)
+ for (const dirName of dir.dirs)
+ try {
+ console.log(`Deleting ${filePrefix}${dir.name}/${dirName}`);
+ await fs.rmdir(`${filePrefix}${dir.name}/${dirName}`, {recursive: true});
+ } catch(e) {
+ }
+ }
+}
+
+async function init(amount = 'clean') {
+ switch(amount.toLowerCase()) {
+ case 'clean':
+ case 'pre-compile':
+ default:
+ return await clean('clean');
+ case 'distclean':
+ return await clean('distClean');
+ }
+}
+
+// Run the script
+init(process.argv[2]);
\ No newline at end of file
diff --git a/util/compile.js b/util/compile.js
new file mode 100644
index 0000000..dcb3fd0
--- /dev/null
+++ b/util/compile.js
@@ -0,0 +1,98 @@
+const crypto = require('crypto');
+const fs = require('fs');
+const execSync = require('child_process').execSync;
+
+const {buildPrefix, macTargetVersion, packageVersion} = require('./elcapitain/config.js');
+
+function hashFile(uri) {
+ const hash = crypto.createHash('sha256');
+ hash.update(fs.readFileSync(uri));
+ return hash.digest('hex');
+}
+
+function exec(command, cwd = './', returnResult = false, newEnv = {}) {
+ let env = JSON.parse(JSON.stringify(process.env));
+ for (const key of Array.from(Object.keys(newEnv)))
+ env[key] = newEnv[key];
+
+ const out = execSync(command, {
+ cwd,
+ stdio: returnResult ? 'pipe' : 'inherit',
+ env
+ });
+
+ if (returnResult)
+ return out.toString();
+}
+
+function copyDirSync(src, dest) {
+ src = src.endsWith('/') ? src : src + '/';
+ dest = dest.endsWith('/') ? dest : dest + '/';
+ const files = fs.readdirSync(src, {withFileTypes: true});
+ try {
+ fs.mkdirSync(dest);
+ } catch(e) {}
+
+ for (const file of files) {
+ const srcUri = `${src}${file.name}`;
+ const destUri = `${dest}${file.name}`;
+
+ if (file.isFile())
+ fs.copyFileSync(srcUri, destUri);
+ else if (file.isDirectory())
+ copyDirSync(srcUri, destUri);
+ }
+}
+
+function installPackage(packName) {
+ exec(`rm -fr ./bin/unpackaged/node_modules/${packName}`);
+ copyDirSync(`${buildPrefix}/electron/${packName}`, `./bin/unpackaged/node_modules/${packName}`);
+}
+
+console.log('Building and packaging existing code...');
+exec('npm run build-prod');
+exec('node package.js');
+
+console.log('Installing production npm packages...');
+exec('npm install --production', './bin/unpackaged');
+
+if (process.platform === 'darwin') {
+ console.log(`Preparing packages for MacOSX (${macTargetVersion}) build...`);
+ exec('npm run build-el-capitan');
+
+ console.log(`Injecting packages into MacOSX (${macTargetVersion}) build...`);
+ installPackage('sharp');
+ installPackage('canvas');
+
+ console.log('Packaging...');
+ exec('"./node_modules/.bin/electron-packager" ./bin/unpackaged --out ./bin --overwrite');
+
+ console.log(`Injecting dylibs into MacOSX (${macTargetVersion}) build...`);
+ copyDirSync(`./bin/libs`, `./bin/Probelab ReImager-darwin-x64/Probelab ReImager.app/contents/Frameworks/Electron Framework.framework/Libraries/libs`);
+
+ console.log('Building installer package for MacOS x64');
+ exec('"./node_modules/.bin/electron-builder" --pd "./bin/Probelab ReImager-darwin-x64"');
+
+ fs.renameSync(`./dist/Probelab ReImager-${packageVersion}.dmg`, `./dist/reimager-${packageVersion}.dmg`);
+ const hash = hashFile(`./dist/reimager-${packageVersion}.dmg`);
+ console.log(`sha256: ${hash}`);
+} else {
+ console.log('Rebuilding packages...');
+ exec('"../../node_modules/.bin/electron-rebuild" -f', './bin/unpackaged');
+
+ console.log('Packaging...');
+ exec('"./node_modules/.bin/electron-packager" ./bin/unpackaged --out ./bin --overwrite');
+
+ try {
+ fs.accessSync('./bin/Probelab ReImager-win32-x64', fs.constants.F_OK);
+ console.log('Building installer package for Windows x64');
+ exec('"./node_modules/.bin/electron-builder" --pd "./bin/Probelab ReImager-win32-x64"');
+ } catch(e) {}
+
+ try {
+ fs.accessSync('./bin/Probelab ReImager-linux-x64', fs.constants.F_OK);
+ console.log('Building installer package for Linux x64');
+ exec('"./node_modules/.bin/electron-builder" --pd "./bin/Probelab ReImager-linux-x64"');
+ } catch(e) {}
+}
+
diff --git a/util/elcapitain/compile.js b/util/elcapitain/compile.js
new file mode 100644
index 0000000..2b4ba5f
--- /dev/null
+++ b/util/elcapitain/compile.js
@@ -0,0 +1,152 @@
+const fs = require('fs/promises');
+
+const {buildPrefix, configureConfig, cmakeConfig, mesonConfig, exec, packages, nodeGyp, electronConfig, macTargetVersion} = require('./config.js');
+
+async function compile(pack, recompile = false) {
+ if (!pack.compiled || recompile) {
+ switch(pack.method) {
+ case 'configure':
+ console.log(`Cleaning ${pack.name} (${pack.link})`);
+ try {
+ await exec('make distclean > /dev/null', pack.name);
+ } catch(e) {
+ try {
+ await exec('make clean > /dev/null', pack.name);
+ } catch(e) {
+ }
+ }
+
+ if (pack.postClean)
+ await pack.postClean();
+
+ console.log(`Configuring ${pack.name} (${pack.link})`);
+ await exec(`./configure ${configureConfig} ${pack.args.join(' ')} > /dev/null`, pack.name);
+
+ if (pack.postConfigure)
+ await pack.postConfigure();
+
+ console.log(`Building ${pack.name} (${pack.link})`);
+ await exec('make install > /dev/null', pack.name);
+
+ break;
+ case 'cmake':
+ console.log(`Cleaning ${pack.name} (${pack.link})`);
+ try {
+ await exec('make distclean > /dev/null', pack.name);
+ } catch(e) {
+ try {
+ await exec('make clean > /dev/null', pack.name);
+ } catch(e) {
+ }
+ }
+
+ if (pack.postClean)
+ await pack.postClean();
+
+ console.log(`Configuring ${pack.name} (${pack.link})`);
+ await exec(`cmake make ${cmakeConfig} ${pack.args.join(' ')} . > /dev/null`, pack.name);
+
+ if (pack.postConfigure)
+ await pack.postConfigure();
+
+ console.log(`Building ${pack.name} (${pack.link})`);
+ await exec('cmake --build . --target install > /dev/null', pack.name);
+ break;
+ case 'meson':
+ console.log(`Cleaning ${pack.name} (${pack.link})`);
+ try {
+ await fs.rmdir(`${buildPrefix}/${pack.name}/_build`, {recursive: true});
+ } catch(e) {
+ }
+
+ if (pack.postClean)
+ await pack.postClean();
+
+ console.log(`Configuring ${pack.name} (${pack.link})`);
+ try {
+ await exec(`meson _build ${mesonConfig} ${pack.args.join(' ')}`, pack.name);
+ } catch(err) {
+ throw err.stdout.toString();
+ }
+
+ await fs.writeFile(`${buildPrefix}/${pack.name}/_build/build.ninja`, (await fs.readFile(`${buildPrefix}/${pack.name}/_build/build.ninja`, {encoding: 'utf8'}))
+ .replace('-liconv', `${buildPrefix}/lib/libiconv.dylib`)
+ .replace(/command = cc/gm, `command = cc -mmacosx-version-min=${macTargetVersion}`)
+ .replace(/command = c\+\+/gm, `command = c++ -mmacosx-version-min=${macTargetVersion}`));
+
+ if (pack.postConfigure)
+ await pack.postConfigure();
+
+ console.log(`Building ${pack.name} (${pack.link})`);
+ try {
+ await exec(`ninja -C _build install`, pack.name);
+ } catch(err) {
+ throw err.stdout.toString();
+ }
+
+ break;
+ case 'make':
+ console.log(`Cleaning ${pack.name} (${pack.link})`);
+ try {
+ await exec('make distclean > /dev/null', pack.name);
+ } catch(e) {
+ try {
+ await exec('make clean > /dev/null', pack.name);
+ } catch(e) {
+ }
+ }
+
+ if (pack.postClean)
+ await pack.postClean();
+
+ if (pack.postConfigure)
+ await pack.postConfigure();
+
+ console.log(`Building ${pack.name} (${pack.link})`);
+ await exec('make install > /dev/null', pack.name);
+
+ break;
+ case 'electron':
+ if (pack.postClean)
+ await pack.postClean();
+
+ if (pack.postConfigure)
+ await pack.postConfigure();
+
+ console.log(`Building ${pack.name} (${pack.link})`);
+ await exec(`${nodeGyp} rebuild ${electronConfig} > /dev/null`, pack.name);
+
+ console.log(`Packaging ${pack.name} (${pack.link})`);
+ await exec('npm pack > /dev/null', pack.name);
+
+ const tarballName = `${pack.name}-${require(`${buildPrefix}/${pack.name}/package.json`).version}.tgz`;
+ try {
+ await fs.rmdir(`${buildPrefix}/electron/package`, {recursive: true});
+ } catch(e) {}
+
+ await exec(`tar -C ${buildPrefix}/electron -xzf ${buildPrefix}/${pack.name}/${tarballName}`);
+ try {
+ await fs.unlink(`${buildPrefix}/${pack.name}/${tarballName}`);
+ } catch(e) {}
+
+ await fs.mkdir(`${buildPrefix}/electron/package/build/Release`, {recursive: true});
+ await fs.copyFile(`${buildPrefix}/${pack.name}/build/Release/${pack.name}.node`, `${buildPrefix}/electron/package/build/Release/${pack.name}.node`);
+ await fs.rename(`${buildPrefix}/electron/package`, `${buildPrefix}/electron/${pack.name}`);
+ await exec(`"${buildPrefix}/bin/dylibbundler" -s "${buildPrefix}/lib" -of -cd -b -d "./bin/libs" -x "${buildPrefix}/electron/${pack.name}/build/Release/${pack.name}.node" -p "@rpath/libs/"`);
+ break;
+ default:
+ break;
+ }
+
+ if (pack.postCompile)
+ await pack.postCompile();
+
+ if (pack.recompiles && pack.recompiles.length > 0)
+ for (const packName of pack.recompiles)
+ await compile(packages.get(packName), true);
+ }
+}
+
+module.exports = {
+ compile
+};
\ No newline at end of file
diff --git a/util/elcapitain/config.js b/util/elcapitain/config.js
new file mode 100644
index 0000000..c53ab49
--- /dev/null
+++ b/util/elcapitain/config.js
@@ -0,0 +1,632 @@
+const fs = require('fs/promises');
+const fsConstants = require('fs').constants;
+const execSync = require('child_process').execSync;
+
+const packageJson = require('../../package.json');
+
+const electronVersion = packageJson.devDependencies.electron;
+const packageVersion = packageJson.version;
+
+const dirPrefix = __dirname.split('/').slice(0, -2).join('/');
+const buildPrefix = dirPrefix + '/build';
+
+const macTargetVersion = '10.11';
+
+const env = {
+ LDFLAGS: `-mmacosx-version-min=${macTargetVersion}`,
+ CXXFLAGS: `-stdlib=libc++ -mmacosx-version-min=${macTargetVersion}`,
+ CPPFLAGS: `-stdlib=libc++ -mmacosx-version-min=${macTargetVersion}`,
+ CFLAGS: `-stdlib=libc++ -mmacosx-version-min=${macTargetVersion}`,
+ PATH: `${buildPrefix}:${buildPrefix}/bin:/usr/local/bin:/usr/bin:/bin`,
+ PKG_CONFIG_PATH: `${buildPrefix}/lib/pkgconfig`,
+ CMAKE_INSTALL_PREFIX: `${buildPrefix}/`,
+ HOME: process.env.HOME
+};
+
+const mesonConfig = `--prefix="${buildPrefix}/"`;
+const configureConfig = `--prefix="${buildPrefix}/"`;
+const cmakeConfig = `-f makefile.unix -DCMAKE_INSTALL_PREFIX="${buildPrefix}" -DCMAKE_SYSTEM_PREFIX_PATH="${buildPrefix}"`;
+const electronConfig = `--target=${electronVersion} --arch=x64 --dist-url=https://electronjs.org/headers`;
+
+const nodeGyp = `HOME=~/.electron-gyp "${buildPrefix}/../node_modules/.bin/node-gyp"`;
+
+const packages = new Map([
+ ['package', {
+ 'details': '',
+ 'link': '',
+ 'name': 'package',
+ 'method': '',
+ 'args': [],
+ 'requires': [
+ 'canvas',
+ 'sharp'
+ ],
+ 'recompiles': [],
+ 'makes': [],
+ 'postCompile': async () => {
+ }
+ }],
+ ['canvas', {
+ 'details': 'https://www.npmjs.com/package/canvas',
+ 'link': 'https://github.com/Automattic/node-canvas/archive/v2.7.0.tar.gz',
+ 'name': 'canvas',
+ 'method': 'electron',
+ 'args': [],
+ 'requires': [
+ 'pango',
+ 'glib',
+ 'cairo',
+ 'dylibbundler'
+ ],
+ 'recompiles': [],
+ 'makes': ['canvas']
+ }],
+ ['sharp', {
+ 'details': 'https://sharp.pixelplumbing.com',
+ 'link': 'https://github.com/lovell/sharp/archive/v0.26.2.zip',
+ 'name': 'sharp',
+ 'method': 'electron',
+ 'args': [],
+ 'requires': [
+ 'vips',
+ 'dylibbundler'
+ ],
+ 'recompiles': [],
+ 'makes': ['sharp']
+ }],
+ ['dylibbundler', {
+ 'details': 'https://pango.gnome.org/',
+ 'link': 'https://github.com/auriamg/macdylibbundler.git',
+ 'name': 'dylibbundler',
+ 'method': 'make',
+ 'args': [],
+ 'requires': [],
+ 'recompiles': [],
+ 'makes': ['dylibbundler'],
+ 'postCompile': async () => {
+ try {
+ await fs.unlink(`${buildPrefix}/bin/dylibbundler`);
+ } catch(e) {
+ }
+ await fs.symlink(`${buildPrefix}/dylibbundler/dylibbundler`, `${buildPrefix}/bin/dylibbundler`);
+ }
+ }],
+ ['rsvg', {
+ 'details': 'https://gitlab.gnome.org/GNOME/librsvg',
+ 'link': 'https://gitlab.gnome.org/GNOME/librsvg/-/archive/2.50.1/librsvg-2.50.1.tar.gz',
+ 'name': 'rsvg',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig',
+ 'pango',
+ 'cairo',
+ 'xml2',
+ 'pixbuf',
+ 'freetype',
+ 'gobject',
+ 'glib'
+ ],
+ 'recompiles': [],
+ 'makes': []
+ }],
+ ['xml2', {
+ 'details': 'http://www.xmlsoft.org/',
+ 'link': 'http://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz',
+ 'name': 'xml2',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig',
+ 'zlib',
+ 'iconv'
+ ],
+ 'recompiles': [],
+ 'makes': []
+ }],
+ ['pixbuf', {
+ 'details': 'https://gitlab.gnome.org/GNOME/gdk-pixbuf',
+ 'link': 'https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/archive/2.40.0/gdk-pixbuf-2.40.0.tar.gz',
+ 'name': 'pixbuf',
+ 'method': 'meson',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig',
+ 'pango',
+ 'cairo'
+ ],
+ 'recompiles': [],
+ 'makes': []
+ }],
+ ['pango', {
+ 'details': 'https://pango.gnome.org/',
+ 'link': 'https://download.gnome.org/sources/pango/1.47/pango-1.47.0.tar.xz',
+ 'name': 'pango',
+ 'method': 'meson',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig',
+ 'harfbuzz',
+ 'cairo'
+ ],
+ 'recompiles': [],
+ 'makes': ['libpango-1.0.dylib']
+ }],
+ ['gobject', {
+ 'details': 'https://gitlab.gnome.org/GNOME/gobject-introspection/',
+ 'link': 'https://gitlab.gnome.org/GNOME/gobject-introspection/-/archive/1.66.1/gobject-introspection-1.66.1.zip',
+ 'name': 'gobject',
+ 'method': 'meson',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig',
+ 'cairo',
+ 'ffi',
+ 'glib'
+ ],
+ 'recompiles': [],
+ 'makes': ['libgirepository-1.0.dylib']
+ }],
+ ['harfbuzz', {
+ 'details': 'https://harfbuzz.github.io/',
+ 'link': 'https://github.com/harfbuzz/harfbuzz/releases/download/2.7.2/harfbuzz-2.7.2.tar.xz',
+ 'name': 'harfbuzz',
+ 'method': 'configure',
+ 'args': ['--with-glib', '--with-gobject', '--with-freetype', '--with-fontconfig', '--with-coretext', '--with-cairo'],
+ 'requires': [
+ 'pkgconfig',
+ 'cairo',
+ 'freetype',
+ 'glib',
+ 'gobject'
+ ],
+ 'recompiles': [],
+ 'makes': ['hb-coretext.h', 'libharfbuzz.dylib'],
+ 'postCompile': async () => {
+ const files = await fs.readdir(`${buildPrefix}/include/harfbuzz/`);
+ for (const file of files)
+ try {
+ await fs.symlink(`${buildPrefix}/include/harfbuzz/${file}`, `${buildPrefix}/include/${file}`);
+ } catch(e) {
+ }
+ }
+ }],
+ ['lzo2', {
+ 'details': 'http://www.oberhumer.com/opensource/lzo',
+ 'link': 'http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz',
+ 'name': 'lzo2',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['liblzo2.a']
+ }],
+ ['freetype', {
+ 'details': 'https://www.freetype.org/download.html',
+ 'link': 'https://download.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.gz',
+ 'name': 'freetype',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['ft2build.h', 'libfreetype.dylib'],
+ 'postCompile': async () => {
+ await fs.symlink(`${buildPrefix}/include/freetype2/ft2build.h`, `${buildPrefix}/include/ft2build.h`);
+ await fs.symlink(`${buildPrefix}/include/freetype2/freetype`, `${buildPrefix}/include/freetype`);
+ }
+ }],
+ ['fontconfig', {
+ 'details': 'https://www.freedesktop.org/wiki/Software/fontconfig/',
+ 'link': 'https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.92.tar.gz',
+ 'name': 'fontconfig',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['libfontconfig.dylib']
+ }],
+ ['zlib', {
+ 'details': 'http://zlib.net/',
+ 'link': 'http://zlib.net/zlib-1.2.11.tar.gz',
+ 'name': 'zlib',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['libz.dylib']
+ }],
+ ['pixman', {
+ 'details': 'https://www.cairographics.org',
+ 'link': 'https://www.cairographics.org/releases/pixman-0.40.0.tar.gz',
+ 'name': 'pixman',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['libpixman-1.dylib']
+ }],
+ ['cairo', {
+ 'details': 'https://www.cairographics.org',
+ 'link': 'https://www.cairographics.org/releases/cairo-1.16.0.tar.xz',
+ 'name': 'cairo',
+ 'method': 'configure',
+ 'args': ['--enable-gtk-doc-html=no', '--disable-xlib'],
+ 'requires': [
+ 'pkgconfig',
+ 'pixman',
+ 'libpng',
+ 'zlib',
+ 'lzo2',
+ 'freetype',
+ 'fontconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['cairo-trace', 'libcairo.dylib']
+ }],
+ ['lcms2', {
+ 'details': 'https://github.com/mm2/Little-CMS',
+ 'link': 'https://managedway.dl.sourceforge.net/project/lcms/lcms/2.11/lcms2-2.11.tar.gz',
+ 'name': 'lcms2',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['liblcms2.dylib']
+ }],
+ ['exif', {
+ 'details': 'https://github.com/libexif/libexif',
+ 'link': 'https://github.com/libexif/libexif/releases/download/libexif-0_6_22-release/libexif-0.6.22.tar.gz',
+ 'name': 'exif',
+ 'method': 'configure',
+ 'args': ['--disable-dependency-tracking'],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': []
+ }],
+ ['orc', {
+ 'details': 'https://github.com/GStreamer/orc',
+ 'link': 'https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.32.tar.xz',
+ 'name': 'orc',
+ 'method': 'meson',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['liborc-0.4.0.dylib']
+ }],
+ ['fftw', {
+ 'details': 'http://fftw.org/index.html',
+ 'link': 'http://fftw.org/fftw-3.3.8.tar.gz',
+ 'name': 'fftw',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['libfftw3.a']
+ }],
+ ['heif', {
+ 'details': 'http://www.libheif.org/',
+ 'link': 'https://github.com/strukturag/libheif/releases/download/v1.9.1/libheif-1.9.1.tar.gz',
+ 'name': 'heif',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['libheif.dylib']
+ }],
+ ['libjpeg', {
+ 'details': 'https://www.libjpeg-turbo.org/',
+ 'link': 'https://newcontinuum.dl.sourceforge.net/project/libjpeg-turbo/2.0.5/libjpeg-turbo-2.0.5.tar.gz',
+ 'name': 'libjpeg',
+ 'method': 'cmake',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['libturbojpeg.dylib']
+ }],
+ ['libpng', {
+ 'details': 'http://www.libpng.org/pub/png/libpng.html',
+ 'link': 'https://phoenixnap.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz',
+ 'name': 'libpng',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['png.h', 'libpng.dylib']
+ }],
+ ['libspng', {
+ 'details': 'https://libspng.org',
+ 'link': 'https://github.com/randy408/libspng/archive/v0.6.1.tar.gz',
+ 'name': 'libspng',
+ 'method': 'meson',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['libspng.dylib']
+ }],
+ ['libwebp', {
+ 'details': 'https://github.com/webmproject/libwebp',
+ 'link': 'https://github.com/webmproject/libwebp/archive/v1.1.0.zip',
+ 'name': 'libwebp',
+ 'method': 'cmake',
+ 'args': ['--enable-libwebpmux', '--enable-libwebpdemux', '--enable-libwebpdecoder', '--enable-libwebpextras'],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['libwebp.a', 'libwebpdemux.a', 'libwebpdecoder.a', 'libwebpmux.a']
+ }],
+ ['libtiff', {
+ 'details': 'http://libtiff.org/',
+ 'link': 'http://download.osgeo.org/libtiff/tiff-4.1.0.zip',
+ 'name': 'libtiff',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['libtiff.dylib']
+ }],
+ ['expat', {
+ 'details': 'https://libexpat.github.io/',
+ 'link': 'https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.gz',
+ 'name': 'expat',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['expat.h', 'libexpat.dylib']
+ }],
+ ['vips', {
+ 'details': 'https://libvips.github.io/libvips/',
+ 'link': 'https://github.com/libvips/libvips/releases/download/v8.10.2/vips-8.10.2.tar.gz',
+ 'name': 'vips',
+ 'method': 'configure',
+ 'args': ['--without-rsvg', '--without-gsf', '--without-magick', '--without-OpenEXR', '--without-pdfium', '--without-poppler', '--without-openslide', '--without-matio', '--without-cfitsio', '--without-giflib', '--without-imagequant', '--without-libexif'],
+ 'requires': [
+ 'pkgconfig',
+ 'glib',
+ 'expat',
+ 'libjpeg',
+ 'libspng',
+ 'libpng',
+ 'libwebp',
+ 'libtiff',
+ 'orc',
+ 'fftw',
+// 'exif',
+ 'heif',
+ 'lcms2'
+ ],
+ 'recompiles': [],
+ 'makes': ['vips']
+ }],
+ ['glib', {
+ 'details': 'https://gitlab.gnome.org/GNOME/glib',
+ 'link': 'https://download.gnome.org/sources/glib/2.67/glib-2.67.0.tar.xz',
+ 'name': 'glib',
+ 'method': 'meson',
+ 'args': [
+ '--default-library=shared',
+ '-Dxattr=false',
+ '-Dselinux=disabled',
+ '-Ddtrace=false',
+ '-Dc_args=""',
+ '-Dsystemtap=false',
+ `-Dcpp_args="-mmacosx-version-min=${macTargetVersion}"`,
+ `-Dc_link_args="-mmacosx-version-min=${macTargetVersion}"`,
+ `-Dcpp_link_args="-mmacosx-version-min=${macTargetVersion}"`,
+ `--pkg-config-path="${env.PKG_CONFIG_PATH}"`
+ ],
+ 'requires': [
+ 'pkgconfig',
+ 'iconv',
+ 'gettext',
+ 'ffi',
+ 'pcre'
+ ],
+ 'recompiles': [],
+ 'makes': ['gio', 'libgobject-2.0.dylib', 'libgio-2.0.0.dylib', 'libglib-2.0.0.dylib'],
+ 'postConfigure': async () => {
+
+ }
+ }],
+ ['pkgconfig', {
+ 'details': 'https://pkg-config.freedesktop.org',
+ 'link': 'https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz',
+ 'name': 'pkgconfig',
+ 'method': 'configure',
+ 'args': ['--with-internal-glib'],
+ 'requires': [
+ 'iconv'
+ ],
+ 'recompiles': [],
+ 'makes': ['pkg-config']
+ }],
+ ['iconv', {
+ 'details': 'http://www.gnu.org/software/libiconv',
+ 'link': 'https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz',
+ 'name': 'iconv',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [],
+ 'recompiles': [],
+ 'makes': ['iconv.h', 'libcharset.h', 'localcharset.h', 'libiconv.dylib', 'libcharset.dylib', 'iconv']
+ }],
+ ['gettext', {
+ 'details': 'https://www.gnu.org/software/gettext/',
+ 'link': 'https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.gz',
+ 'name': 'gettext',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'iconv',
+ 'pkgconfig'
+ ],
+ 'recompiles': [
+ 'iconv'
+ ],
+ 'makes': ['gettext-po.h', 'libgettextlib.dylib', 'libgettextpo.dylib', 'libintl.dylib', 'gettext', 'gettextize']
+ }],
+ ['ffi', {
+ 'details': 'http://www.sourceware.org/libffi/',
+ 'link': 'https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz',
+ 'name': 'ffi',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['ffi.h', 'ffitarget.h', 'libffi.a', 'libffi.dylib', 'libffi.la']
+ }],
+ ['pcre', {
+ 'details': 'http://www.pcre.org/',
+ 'link': 'https://ftp.pcre.org/pub/pcre/pcre-8.44.zip',
+ 'name': 'pcre',
+ 'method': 'configure',
+ 'args': [],
+ 'requires': [
+ 'pkgconfig'
+ ],
+ 'recompiles': [],
+ 'makes': ['pcre.h', 'libpcre.dylib', 'libpcrecpp.dylib', 'libpcreposix.dylib']
+ }]
+]);
+
+let compileOrder = new Set();
+
+async function testForFile(fileName) {
+ let exists = false;
+
+ try {
+ await fs.access(`${buildPrefix}/bin/${fileName}`, fsConstants.F_OK);
+ exists = true;
+ } catch(e) {
+ }
+
+ try {
+ await fs.access(`${buildPrefix}/include/${fileName}`, fsConstants.F_OK);
+ exists = true;
+ } catch(e) {
+ }
+
+ try {
+ await fs.access(`${buildPrefix}/lib/${fileName}`, fsConstants.F_OK);
+ exists = true;
+ } catch(e) {
+ }
+
+ try {
+ await fs.access(`${buildPrefix}/etc/${fileName}`, fsConstants.F_OK);
+ exists = true;
+ } catch(e) {
+ }
+
+ try {
+ await fs.access(`${buildPrefix}/share/${fileName}`, fsConstants.F_OK);
+ exists = true;
+ } catch(e) {
+ }
+
+ try {
+ await fs.access(`${buildPrefix}/electron/${fileName}`, fsConstants.F_OK);
+ exists = true;
+ } catch(e) {
+ }
+
+ return exists;
+}
+
+async function prepare(packName) {
+ const pack = packages.get(packName);
+ try {
+ await fs.access(`${buildPrefix}/${packName}`, fsConstants.F_OK);
+ pack.downloaded = true;
+ } catch(e) {
+ pack.downloaded = false;
+ }
+
+ pack.compiled = false;
+ if (pack.makes && pack.makes.length > 0 && pack.downloaded)
+ try {
+ for (const file of pack.makes)
+ if (!await testForFile(file))
+ throw '';
+
+ pack.compiled = true;
+ } catch(e) {
+ }
+
+ for (const prePack of pack.requires)
+ await prepare(prePack);
+ compileOrder.add(pack.name);
+}
+
+async function exec(command, cwd = '', override = false) {
+ return execSync(command, {
+ env,
+ cwd: override ? cwd : `${buildPrefix}/${cwd}`,
+ maxBuffer: 1024 * 1024
+ });
+}
+
+module.exports = {
+ packages,
+ dirPrefix,
+ buildPrefix,
+ mesonConfig,
+ cmakeConfig,
+ configureConfig,
+ electronConfig,
+ macTargetVersion,
+ packageVersion,
+ nodeGyp,
+ electronVersion,
+ exec,
+ requirements: async () => {
+ try {
+ await fs.access(buildPrefix, fsConstants.F_OK);
+ } catch(e) {
+ await fs.mkdir(buildPrefix);
+ }
+
+ try {
+ await fs.access(`${buildPrefix}/electron`, fsConstants.F_OK);
+ } catch(e) {
+ await fs.mkdir(`${buildPrefix}/electron`);
+ }
+
+ await prepare('package');
+
+ return compileOrder;
+ }
+};
\ No newline at end of file
diff --git a/util/elcapitain/download.js b/util/elcapitain/download.js
new file mode 100644
index 0000000..951d919
--- /dev/null
+++ b/util/elcapitain/download.js
@@ -0,0 +1,93 @@
+const fs = require('fs/promises');
+
+const bent = require('bent')('buffer');
+
+const {requirements, buildPrefix, packages, exec} = require('./config.js');
+const {compile} = require('./compile.js');
+
+async function doomload(type, link, pack, name, downloadLocation, extractLocation) {
+ try {
+ await fs.writeFile(downloadLocation, await bent(link));
+ await fs.mkdir(extractLocation);
+ if (type === 'zip') {
+ let rawName = name.split('.');
+ rawName.pop();
+ rawName = rawName.join('.');
+
+ await exec(`unzip -d ${extractLocation} ${downloadLocation}`);
+ try {
+ await exec(`mv ${extractLocation}/${rawName}/* ${extractLocation}`);
+ } catch(e) {
+ try {
+ await exec(`mv ${extractLocation}/${pack.name}-${rawName}/* ${extractLocation}`);
+ } catch(e) {
+ await exec(`mv ${extractLocation}/${pack.name}-${rawName.replace('v', '')}/* ${extractLocation}`);
+ }
+ }
+ } else
+ await exec(`tar --strip-components=1 -C ${extractLocation} -${type} ${downloadLocation}`);
+ } catch(err) {
+ if (err.statusCode === 302)
+ return doomload(type, err.headers.location, pack, name, downloadLocation, extractLocation);
+ throw err;
+ }
+}
+
+async function download(pack) {
+ let type;
+ const name = pack.link.split('/').slice(-1)[0];
+ const downloadLocation = `${buildPrefix}/${name}`;
+ const extractLocation = `${buildPrefix}/${pack.name}`;
+
+ if (!pack.downloaded)
+ switch(pack.link.split('.').pop()) {
+ case 'zip':
+ if (!type) type = 'zip';
+ case 'gz':
+ if (!type) type = 'xzf';
+ case 'xz':
+ if (!type) type = 'xJf';
+ case 'bz2':
+ if (!type) type = 'xjf';
+ case 'lz':
+ if (!type) type = '-lzma -xf';
+ case 'tar':
+ if (!type) type = 'xf';
+ console.log(`Downloading ${pack.name} (${pack.link})`);
+
+ await doomload(type, pack.link, pack, name, downloadLocation, extractLocation);
+ await fs.unlink(downloadLocation);
+ pack.downloaded = true;
+ break;
+ case 'git':
+ console.log(`Cloning ${pack.name} (${pack.link})`);
+
+ await exec(`git clone ${pack.link}`);
+ await fs.rename(downloadLocation.split('.').slice(0, -1).join('.'), extractLocation);
+ pack.downloaded = true;
+ break;
+ default:
+ console.log(`Unable to download ${pack.name} (${pack.link})`);
+ break;
+ }
+}
+
+requirements().then(async compileOrder => {
+ let toCompile = new Set();
+
+ for (const packName of compileOrder) {
+ const pack = packages.get(packName);
+ if (pack.link !== '')
+ await download(pack);
+
+ if (pack.requires.filter(e => !packages.get(e).compiled).length !== 0) {
+ toCompile.add(packName);
+ } else
+ try {
+ await compile(pack);
+ pack.compiled = true;
+ } catch(err) {
+ console.log(err);
+ }
+ }
+});