koffi 2.1.3 → 2.1.4

package/{qemu → src/koffi/qemu}/qemu.js

@@ -20,7 +20,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const util = require('util');
-const { spawn, spawnSync } = require('child_process');
+const { spawn, spawnSync, execFileSync } = require('child_process');
 const { NodeSSH } = require('node-ssh');
 const chalk = require('chalk');
 const minimatch = require('minimatch');
@@ -43,7 +43,7 @@ main();
 
 async function main() {
     script_dir = fs.realpathSync(__dirname);
-    root_dir = fs.realpathSync(script_dir + '/../..');
+    root_dir = fs.realpathSync(script_dir + '/../../..');
 
     // All the code assumes we are working from the script directory
     process.chdir(script_dir);
@@ -53,11 +53,16 @@ async function main() {
 
     // Parse options
     {
+        if (process.argv[2] == '--help') {
+            print_usage();
+            return;
+        }
         if (process.argv.length < 3 || process.argv[2][0] == '-')
             throw new Error(`Missing command, use --help`);
 
         switch (process.argv[2]) {
             case 'pack': { command = pack; } break;
+            case 'publish': { command = publish; } break;
             case 'test': { command = test; } break;
             case 'start': { command = start; } break;
             case 'stop': { command = stop; } break;
@@ -198,7 +203,8 @@ function print_usage() {
 
 Commands:
     test                         Run the machines and perform the tests (default)
-    pack                         Use machines to package prebuilt Koffi binaries
+    pack                         Create NPM package with prebuilt Koffi binaries
+    publish                      Publish NPM package with prebuilt Koffi binaries
 
     start                        Start the machines but don't run anythingh
     stop                         Stop running machines
@@ -208,7 +214,7 @@ Commands:
     reset                        Reset initial disk snapshot
 
 Options:
-        --no-accel               Disable QEMU acceleration
+        --no_accel               Disable QEMU acceleration
 `;
 
     console.log(help);
@@ -283,9 +289,36 @@ async function start(detach = true) {
 }
 
 async function pack() {
-    let success = true;
+    let pack_dir = script_dir + '/../build';
+    let dist_dir = script_dir + '/../build/dist';
+
+    let success = await prepare(dist_dir);
+    if (!success)
+        return false;
+
+    execFileSync('npm', ['pack', '--pack-destination', pack_dir], {
+        cwd: dist_dir,
+        stdio: 'inherit',
+    });
+}
+
+async function publish() {
+    let dist_dir = script_dir + '/../build/dist';
+
+    let success = await prepare(dist_dir);
+    if (!success)
+        return false;
+
+    execFileSync('npm', ['publish'], {
+        cwd: dist_dir,
+        stdio: 'inherit'
+    });
+}
+
+async function prepare(dist_dir) {
+    let snapshot_dir = snapshot();
 
-    let json = fs.readFileSync(root_dir + '/koffi/package.json', { encoding: 'utf-8' });
+    let json = fs.readFileSync(root_dir + '/src/koffi/package.json', { encoding: 'utf-8' });
     let version = JSON.parse(json).version;
 
     console.log('>> Version:', version);
@@ -296,7 +329,7 @@ async function pack() {
         for (let suite in machine.builds) {
             let build = machine.builds[suite];
 
-            let archive_filename = root_dir + `/koffi/build/qemu/${version}/koffi_${machine.platform}_${build.arch}.tar.gz`;
+            let archive_filename = root_dir + `/src/koffi/build/qemu/${version}/koffi_${machine.platform}_${build.arch}.tar.gz`;
 
             if (fs.existsSync(archive_filename)) {
                 log(machine, `${suite} > Status`, chalk.bold.green(`[ok]`));
@@ -314,142 +347,183 @@ async function pack() {
     }
 
     let ready = ignore.size;
+    let artifacts = [];
 
-    if (ready >= machines.length) {
-        console.log('>> Nothing to do!');
-        return true;
-    }
-
-    success &= await start(false);
-    success &= await copy(machine => Object.values(machine.builds).map(build => build.directory));
-
-    console.log('>> Run build commands...');
-    await Promise.all(machines.map(async machine => {
-        if (ignore.has(machine))
-            return;
-
-        await Promise.all(Object.keys(machine.builds).map(async suite => {
-            let build = machine.builds[suite];
-
-            let cmd = build.build;
-            let cwd = build.directory + '/koffi';
-
-            let start = process.hrtime.bigint();
-            let ret = await exec_remote(machine, cmd, cwd);
-            let time = Number((process.hrtime.bigint() - start) / 1000000n);
-
-            if (ret.code == 0) {
-                log(machine, `${suite} > Build`, chalk.bold.green(`[${(time / 1000).toFixed(2)}s]`));
-            } else {
-                log(machine, `${suite} > Build`, chalk.bold.red('[error]'));
+    // Run machine commands
+    {
+        let success = true;
 
-                if (ret.stdout || ret.stderr)
-                    console.error('');
+        if (ready < machines.length) {
+            success &= await start(false);
+            success &= await upload(snapshot_dir, machine => Object.values(machine.builds).map(build => build.directory));
 
-                let align = log.align + 9;
-                if (ret.stdout) {
-                    let str = ' '.repeat(align) + 'Standard output:\n' +
-                              chalk.yellow(ret.stdout.replace(/^/gm, ' '.repeat(align + 4))) + '\n';
-                    console.error(str);
-                }
-                if (ret.stderr) {
-                    let str = ' '.repeat(align) + 'Standard error:\n' +
-                              chalk.yellow(ret.stderr.replace(/^/gm, ' '.repeat(align + 4))) + '\n';
-                    console.error(str);
-                }
+            console.log('>> Run build commands...');
+            await Promise.all(machines.map(async machine => {
+                if (ignore.has(machine))
+                    return;
 
-                ignore.add(machine);
-                success = false;
-            }
-        }));
-    }));
+                await Promise.all(Object.keys(machine.builds).map(async suite => {
+                    let build = machine.builds[suite];
+
+                    let cmd = build.build;
+                    let cwd = build.directory + '/src/koffi';
+
+                    let start = process.hrtime.bigint();
+                    let ret = await exec_remote(machine, cmd, cwd);
+                    let time = Number((process.hrtime.bigint() - start) / 1000000n);
+
+                    if (ret.code == 0) {
+                        log(machine, `${suite} > Build`, chalk.bold.green(`[${(time / 1000).toFixed(2)}s]`));
+                    } else {
+                        log(machine, `${suite} > Build`, chalk.bold.red('[error]'));
+
+                        if (ret.stdout || ret.stderr)
+                            console.error('');
+
+                        let align = log.align + 9;
+                        if (ret.stdout) {
+                            let str = ' '.repeat(align) + 'Standard output:\n' +
+                                      chalk.yellow(ret.stdout.replace(/^/gm, ' '.repeat(align + 4))) + '\n';
+                            console.error(str);
+                        }
+                        if (ret.stderr) {
+                            let str = ' '.repeat(align) + 'Standard error:\n' +
+                                      chalk.yellow(ret.stderr.replace(/^/gm, ' '.repeat(align + 4))) + '\n';
+                            console.error(str);
+                        }
+
+                        ignore.add(machine);
+                        success = false;
+                    }
+                }));
+            }));
+        }
 
-    console.log('>> Get build artifacts');
-    {
-        let build_dir = root_dir + '/koffi/build/qemu';
+        console.log('>> Get build artifacts');
+        {
+            let build_dir = root_dir + '/src/koffi/build/qemu';
+
+            await Promise.all(machines.map(async machine => {
+                let copied = true;
+
+                await Promise.all(Object.keys(machine.builds).map(async suite => {
+                    let build = machine.builds[suite];
+
+                    let src_dir = build.directory + '/src/koffi/build';
+                    let dest_dir = build_dir + `/${version}/koffi_${machine.platform}_${build.arch}`;
+                    let dest_filename = dest_dir + '.tar.gz';
+
+                    artifacts.push(dest_filename);
+
+                    if (ignore.has(machine))
+                        return;
+
+                    unlink_recursive(dest_dir);
+                    fs.mkdirSync(dest_dir, { mode: 0o755, recursive: true });
+
+                    try {
+                        await machine.ssh.getDirectory(dest_dir, src_dir, {
+                            recursive: false,
+                            concurrency: 4,
+                            validate: filename => !path.basename(filename).match(/^v[0-9]+/)
+                        });
+
+                        tar.c({
+                            gzip: true,
+                            file: dest_filename,
+                            sync: true,
+                            cwd: dest_dir + '/..'
+                        }, [path.basename(dest_dir)]);
+                    } catch (err) {
+                        ignore.add(machine);
+                        success = false;
+                        copied = false;
+                    }
+                }));
 
-        // Clean up old files
-        if (fs.existsSync(build_dir)) {
-            for (let basename of fs.readdirSync(build_dir)) {
-                if (basename !== version)
-                    unlink_recursive(build_dir + '/' + basename);
-            }
+                let status = copied ? chalk.bold.green('[ok]') : chalk.bold.red('[error]');
+                log(machine, 'Pack', status);
+            }));
         }
 
-        await Promise.all(machines.map(async machine => {
-            if (ignore.has(machine))
-                return;
+        if (machines.some(machine => machine.started))
+            success &= await stop(false);
+        success &= (ignore.size == ready);
 
-            let copied = true;
+        if (!success) {
+            console.log('');
+            console.log('>> Status: ' + chalk.bold.red('FAILED'));
+            return false;
+        }
+    }
 
-            await Promise.all(Object.keys(machine.builds).map(async suite => {
-                let build = machine.builds[suite];
+    console.log('>> Prepare NPM package');
+    {
+        let build_dir = dist_dir + '/src/koffi/build/' + version;
 
-                let src_dir = build.directory + '/koffi/build';
-                let dest_dir = build_dir + `/${version}/koffi_${machine.platform}_${build.arch}`;
-                let dest_filename = dest_dir + '.tar.gz';
+        unlink_recursive(dist_dir);
+        fs.mkdirSync(dist_dir, { mode: 0o755, recursive: true });
 
-                unlink_recursive(dest_dir);
-                fs.mkdirSync(dest_dir, { mode: 0o755, recursive: true });
+        copy_recursive(snapshot_dir, dist_dir);
+        fs.mkdirSync(build_dir, { mode: 0o755, recursive: true });
 
-                try {
-                    await machine.ssh.getDirectory(dest_dir, src_dir, {
-                        recursive: false,
-                        concurrency: 4,
-                        validate: filename => !path.basename(filename).match(/^v[0-9]+/)
-                    });
-
-                    tar.c({
-                        gzip: true,
-                        file: dest_filename,
-                        sync: true,
-                        cwd: dest_dir + '/..'
-                    }, [path.basename(dest_dir)]);
-                } catch (err) {
-                    ignore.add(machine);
-                    success = false;
-                    copied = false;
-                }
-            }));
+        for (let artifact of artifacts) {
+            let dest_filename = build_dir + '/' + path.basename(artifact);
+            fs.copyFileSync(artifact, dest_filename);
+        }
 
-            let status = copied ? chalk.bold.green('[ok]') : chalk.bold.red('[error]');
-            log(machine, 'Pack', status);
-        }));
-    }
+        let pkg = JSON.parse(json);
 
-    if (machines.some(machine => machine.started))
-        success &= await stop(false);
-    success &= (ignore.size == ready);
+        pkg.main = "src/koffi/src/index.js";
+        pkg.scripts = {
+            install: "cnoke --prebuild -d src/koffi",
+            test: "node src/koffi/qemu/qemu.js test"
+        };
+        pkg.cnoke.prebuild = "src/koffi/" + pkg.cnoke.prebuild;
+        pkg.cnoke.require = "./src/koffi/build/koffi.node";
 
-    console.log('');
-    if (success) {
-        console.log('>> Status: ' + chalk.bold.green('SUCCESS'));
-    } else {
-        console.log('>> Status: ' + chalk.bold.red('FAILED'));
+        fs.writeFileSync(dist_dir + '/package.json', JSON.stringify(pkg, null, 4));
+        fs.unlinkSync(dist_dir + '/src/koffi/package.json', '');
+        fs.unlinkSync(dist_dir + '/src/koffi/.gitignore', '');
     }
 
-    return success;
+    return true;
 }
 
-async function copy(func) {
-    let success = true;
+function snapshot() {
+    let snapshot_dir = script_dir + '/../build/snapshot';
 
-    let snapshot_dir = fs.mkdtempSync(path.join(os.tmpdir(), 'luigi_'));
-    process.on('exit', () => unlink_recursive(snapshot_dir));
+    unlink_recursive(snapshot_dir);
+    fs.mkdirSync(snapshot_dir, { mode: 0o755, recursive: true });
 
     console.log('>> Snapshot code...');
     copy_recursive(root_dir, snapshot_dir, filename => {
-        let basename = path.basename(filename);
-
-        return basename !== '.git' &&
-               basename !== 'qemu' && !basename.startsWith('qemu_') &&
-               basename !== 'node_modules' &&
-               basename !== 'node' &&
-               basename !== 'build' &&
-               basename !== 'luiggi';
+        let parts = filename.split(/[\/\\]/);
+
+        if (parts[0] == 'src' && parts[1] == 'core') {
+            return parts[2] == null || parts[2] == 'libcc';
+        } else if (parts[0] == 'src') {
+            return parts[1] == null || parts[1] == 'cnoke' ||
+                                       parts[1] == 'koffi';
+        } else if (parts[0] == 'vendor') {
+            return parts[1] == null || parts[1] == 'brotli' ||
+                                       parts[1] == 'dragonbox' ||
+                                       parts[1] == 'miniz' ||
+                                       parts[1] == 'node-addon-api' ||
+                                       parts[1] == 'raylib' ||
+                                       parts[1] == 'sqlite3mc';
+        } else {
+            return false;
+        }
     });
 
-    console.log('>> Copy source code...');
+    return snapshot_dir;
+}
+
+async function upload(snapshot_dir, func) {
+    let success = true;
+
+    console.log('>> Upload source code...');
     await Promise.all(machines.map(async machine => {
         if (ignore.has(machine))
             return;
@@ -489,10 +563,12 @@ async function copy(func) {
 }
 
 async function test() {
+    let snapshot_dir = snapshot();
+
     let success = true;
 
     success &= await start(false);
-    success &= await copy(machine => Object.values(machine.tests).map(test => test.directory));
+    success &= await upload(snapshot_dir, machine => Object.values(machine.tests).map(test => test.directory));
 
     console.log('>> Run test commands...');
     await Promise.all(machines.map(async machine => {
@@ -508,7 +584,7 @@ async function test() {
 
             for (let name in commands) {
                 let cmd = commands[name];
-                let cwd = test.directory + '/koffi';
+                let cwd = test.directory + '/src/koffi';
 
                 let start = process.hrtime.bigint();
                 let ret = await exec_remote(machine, cmd, cwd);
@@ -651,7 +727,7 @@ async function reset() {
             return;
 
         let dirname = `qemu/${machine.key}`;
-        let disk = dirname + '/disk.qcow2';
+        let disk = dirname + '/' + machine.qemu.disk;
 
         if (!fs.existsSync(dirname)) {
             log(machine, 'Missing files', chalk.bold.gray('[ignore]'));
@@ -706,20 +782,30 @@ function check_qemu() {
 }
 
 function copy_recursive(src, dest, validate = filename => true) {
-    let entries = fs.readdirSync(src, { withFileTypes: true });
+    let proc = spawnSync('git', ['ls-files', '-i', '-o', '--exclude-standard', '--directory'], { cwd: src });
+    let ignored = new Set(proc.stdout.toString().split('\n').map(it => it.trim().replace(/[\\\/+]$/, '')).filter(it => it));
 
-    for (let entry of entries) {
-        let filename = path.join(src, entry.name);
-        let destname = path.join(dest, entry.name);
+    recurse(src, dest, '');
 
-        if (!validate(filename))
-            continue;
+    function recurse(src, dest, nice) {
+        let entries = fs.readdirSync(src, { withFileTypes: true });
+
+        for (let entry of entries) {
+            let src_filename = path.join(src, entry.name);
+            let dest_filename = path.join(dest, entry.name);
+            let filename = path.join(nice, entry.name);
 
-        if (entry.isDirectory()) {
-            fs.mkdirSync(destname, { mode: 0o755 });
-            copy_recursive(filename, destname, validate);
-        } else if (entry.isFile()) {
-            fs.copyFileSync(filename, destname);
+            if (ignored.has(filename))
+                continue;
+            if (!validate(filename))
+                continue;
+
+            if (entry.isDirectory()) {
+                fs.mkdirSync(dest_filename, { mode: 0o755 });
+                recurse(src_filename, dest_filename, filename);
+            } else if (entry.isFile()) {
+                fs.copyFileSync(src_filename, dest_filename);
+            }
         }
     }
 }

package/{qemu → src/koffi/qemu}/registry/machines.json

@@ -8,6 +8,8 @@
             "arguments": ["-M", "virt", "-cpu", "cortex-a15", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-armmp-lpae", "-initrd", "initrd.img-5.10.0-12-armmp-lpae", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22201-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:11"],
             "version": 3,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22201,
             "vnc_port": 5911,
 
@@ -51,6 +53,8 @@
             "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-arm64", "-initrd", "initrd.img-5.10.0-12-arm64", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22202-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:12"],
             "version": 3,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22202,
             "vnc_port": 5912,
 
@@ -94,6 +98,8 @@
             "arguments": ["-cpu", "max", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-686-pae", "-initrd", "initrd.img-5.10.0-12-686-pae", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22203-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:13"],
             "version": 3,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22203,
             "vnc_port": 5913,
 
@@ -137,6 +143,8 @@
             "arguments": ["-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-amd64", "-initrd", "initrd.img-5.10.0-12-amd64", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22204-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:14"],
             "version": 3,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22204,
             "vnc_port": 5914,
 
@@ -180,6 +188,8 @@
             "arguments": ["-m", "3G", "-smp", 4, "-rtc", "clock=host,base=localtime", "-bios", "bios.bin", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22205-:22", "-device", "e1000,netdev=mynet", "-vga", "std", "-device", "qemu-xhci", "-device", "usb-tablet", "-vnc", "127.0.0.1:15"],
             "version": 11,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22205,
             "vnc_port": 5915,
 
@@ -249,6 +259,8 @@
             "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22206-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:16"],
             "version": 3,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22206,
             "vnc_port": 5916,
 
@@ -292,6 +304,8 @@
             "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22207-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:17"],
             "version": 3,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22207,
             "vnc_port": 5917,
 
@@ -335,6 +349,8 @@
             "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-drive", "if=pflash,format=raw,file=QEMU_EFI.img", "-drive", "if=pflash,file=varstore.img", "-drive", "if=virtio,file=disk.qcow2,format=qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22208-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:18"],
             "version": 3,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22208,
             "vnc_port": 5918,
 
@@ -378,6 +394,8 @@
             "arguments": ["-m", "3G", "-machine", "q35", "-smp", 2, "-cpu", "Penryn,vendor=GenuineIntel,kvm=on,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+avx2,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc", "-device", "isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc", "-smbios", "type=2", "-drive", "if=pflash,format=raw,readonly=on,file=OVMF_CODE.fd", "-drive", "if=pflash,format=raw,file=OVMF_VARS-1024x768.fd", "-vga", "qxl", "-device", "ich9-intel-hda", "-device", "hda-output", "-usb", "-device", "usb-kbd", "-device", "usb-tablet", "-netdev", "user,id=net0,hostfwd=tcp::22209-:22", "-device", "e1000-82545em,netdev=net0,id=net0,mac=52:54:00:c9:18:27", "-device", "ich9-ahci,id=sata", "-drive", "id=ESP,if=none,format=qcow2,file=ESP.qcow2", "-device", "ide-hd,bus=sata.2,drive=ESP", "-drive", "id=SystemDisk,if=none,file=macOS.qcow2", "-device", "ide-hd,bus=sata.4,drive=SystemDisk", "-vnc", "127.0.0.1:19"],
             "version": 2,
 
+            "disk": "macOS.qcow2",
+
             "ssh_port": 22209,
             "vnc_port": 5919,
 
@@ -426,6 +444,8 @@
             "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22210-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:20"],
             "version": 2,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22210,
             "vnc_port": 5920,
 
@@ -469,6 +489,8 @@
             "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22211-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:21"],
             "version": 3,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22211,
             "vnc_port": 5921,
 
@@ -512,6 +534,8 @@
             "arguments": ["-machine", "virt", "-cpu", "rv64", "-m", "1G", "-smp", 2, "-device", "virtio-blk-device,drive=hd", "-drive", "file=disk.qcow2,if=none,id=hd", "-device", "virtio-net-device,netdev=net", "-netdev", "user,id=net,hostfwd=tcp::22212-:22", "-bios", "fw_jump.elf", "-kernel", "uboot.elf", "-append", "root=LABEL=rootfs console=ttyS0", "-vnc", "127.0.0.1:22"],
             "version": 1,
 
+            "disk": "disk.qcow2",
+
             "ssh_port": 22212,
             "vnc_port": 5912,
 

package/src/{abi_arm32.cc → koffi/src/abi_arm32.cc}

@@ -13,7 +13,7 @@
 
 #if defined(__arm__) || (defined(__M_ARM) && !defined(_M_ARM64))
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"

package/src/{abi_arm64.cc → koffi/src/abi_arm64.cc}

@@ -13,7 +13,7 @@
 
 #if defined(__aarch64__) || defined(_M_ARM64)
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"

package/src/{abi_riscv64.cc → koffi/src/abi_riscv64.cc}

@@ -13,7 +13,7 @@
 
 #if __riscv_xlen == 64
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"

package/src/{abi_x64_sysv.cc → koffi/src/abi_x64_sysv.cc}

@@ -13,7 +13,7 @@
 
 #if defined(__x86_64__) && !defined(_WIN32)
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"

package/src/{abi_x64_win.cc → koffi/src/abi_x64_win.cc}

@@ -13,7 +13,7 @@
 
 #if defined(_WIN32) && (defined(__x86_64__) || defined(_M_AMD64))
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"

package/src/{abi_x86.cc → koffi/src/abi_x86.cc}

@@ -13,7 +13,7 @@
 
 #if defined(__i386__) || defined(_M_IX86)
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"