Skip to content

Commit

Permalink
Revert "Update Dep, Copyright year, and Javadocs links"
Browse files Browse the repository at this point in the history
Currently this breaks dependencies due to version
mismatches, reverting for successful build, will
be fixed later.

This reverts commit c3d9a76.
  • Loading branch information
astrsh committed Sep 28, 2024
1 parent c3d9a76 commit 1faf896
Show file tree
Hide file tree
Showing 5 changed files with 7,476 additions and 2,218 deletions.
7 changes: 2 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# -- Project information -----------------------------------------------------

project = 'Terra'
copyright = '2021-2024, Terra Contributors'
copyright = '2021-2023, Terra Contributors'
author = 'Terra Contributors'


Expand Down Expand Up @@ -103,12 +103,9 @@

# JDLinker config
javadoc_links = {
'https://docs.oracle.com/en/java/javase/21/docs/api/java.base/': ['java'],
'https://docs.oracle.com/en/java/javase/17/docs/api/java.base/': ['java'],
'https://ci.codemc.io/job/PolyhedralDev/job/Terra/javadoc/': ['com.dfsek.terra'],
'https://ci.codemc.io/job/PolyhedralDev/job/Tectonic/javadoc/': ['com.dfsek.tectonic'],
'https://ci.codemc.io/job/PolyhedralDev/job/Paralithic/javadoc/': ['com.dfsek.paralithic'],
'https://ci.solo-studios.ca/job/solo-studios/job/Strata/job/master/javadoc/': ['ca.solostudios.strata'],
'https://www.javadoc.io/doc/com.github.ben-manes.caffeine/caffeine/latest/': ['com.github.benmanes.caffeine.cache'],
'https://www.slf4j.org/apidocs/': ['org.slf4j'],
}

Expand Down
52 changes: 23 additions & 29 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,54 +1,48 @@
'use strict';

import gulp from 'gulp';
import pluginerror from 'plugin-error';
import browsersync from 'browser-sync';
import {deleteAsync} from 'del';
import { spawn } from 'child_process';
const gulp = require('gulp');
const pluginerror = require('plugin-error');
const browsersync = require('browser-sync').create();
const del = require('del');
const spawn = require('child_process').spawn;

const docsDir = "docs";
const ignoredPaths = [
"config/documentation/objects",
"config/documentation/configs",
"install/versions.rst",
"install/versions/platforms",
];
]

function shell(plugin, command, args) {
return (done) => {
const child = spawn(command, args, { stdio: 'inherit' });

child.on('error', (err) => {
done(new pluginerror(plugin, err));
});

child.on('exit', (code) => {
if (code === 0) {
// Process completed successfully
done();
} else {
done(new pluginerror(plugin, `Process failed with exit code ${code}`));
}
});
};
return (done) =>
spawn(command, args, {stdio: 'inherit'})
.on('error', (err) => {
done(new pluginerror(plugin, err))
})
.on('exit', (code) => {
if (code === 0) {
// Process completed successfully
done()
} else {
done(new pluginerror(plugin, `Process failed with exit code ${code}`));
}
})
}

function webserver(done) {
const server = browsersync.create();

server.init({
browsersync.init({
watch: true,
server: "./build/dev/html/"
}, function () {
this.server.on('close', done);
});
}, function () { this.server.on('close', done) })
}


function watch() {
gulp.watch([`./${docsDir}/**`, ...ignoredPaths.map(dir => `!./${docsDir}/${dir}`)], gulp.series('sphinx:dev'));
}

gulp.task('clean', () => deleteAsync(['build']));
gulp.task('clean', () => del(['build']));

gulp.task('sphinx', shell(
'sphinx', 'sphinx-build', ['-W', '-d', 'build/doctrees', docsDir, 'build/html']
Expand Down
Loading

0 comments on commit 1faf896

Please sign in to comment.