jessebrault/ssg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

AbstractBuildCommand now uses BuildScriptRunner correctly.

Browse Source
This commit is contained in:
JesseBrault0709 2023-04-30 12:53:55 +02:00
parent 7ec9107165
commit 2dbbe53a10
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
View File

@ -21,7 +21,6 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
) )
protected Collection<String> requestedBuilds = ['default'] protected Collection<String> requestedBuilds = ['default']
// TODO: fix URLs for script, etc.
@CommandLine.Option( @CommandLine.Option(
names = ['-s', '--script', '--buildScript'], names = ['-s', '--script', '--buildScript'],
description = 'The build script file to execute.', description = 'The build script file to execute.',
@ -34,7 +33,11 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
if (buildScriptFile.exists()) { if (buildScriptFile.exists()) {
logger.info('found buildScriptFile: {}', buildScriptFile) logger.info('found buildScriptFile: {}', buildScriptFile)
def configuratorFactory = new DefaultBuildScriptConfiguratorFactory() def configuratorFactory = new DefaultBuildScriptConfiguratorFactory()
this.availableBuilds = new GroovyBuildScriptRunner().runBuildScript(null, null, []) { // TODO this.availableBuilds = new GroovyBuildScriptRunner().runBuildScript(
buildScriptFile.name,
buildScriptFile.parentFile.toURI().toURL(),
[new File('buildSrc').toURI().toURL()]
) {
configuratorFactory.get().accept(it) configuratorFactory.get().accept(it)
} }
logger.debug('after running buildScriptFile {}, builds: {}', buildScriptFile, this.availableBuilds) logger.debug('after running buildScriptFile {}, builds: {}', buildScriptFile, this.availableBuilds)