Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
27cdc5104b
Reorganize and refurbish .gitignore file 2025-04-11 20:51:55 +02:00
c4abd27ac7
Make deploy script executable
All checks were successful
Build / build (push) Successful in 11s
2025-04-11 12:41:44 +02:00
6b88318bcd
Fix regression of Java sources not being processed before compiling
All checks were successful
Build / build (push) Successful in 11s
2025-04-11 11:48:32 +02:00
3 changed files with 18 additions and 12 deletions

22
.gitignore vendored
View file

@ -1,5 +1,7 @@
# Generally ignore hidden files
.* .*
# Manage some Codium configuration
.vscode/* .vscode/*
!.vscode !.vscode
!.vscode/extensions.json !.vscode/extensions.json
@ -7,22 +9,22 @@
!.vscode/settings.json !.vscode/settings.json
!.vscode/tasks.json !.vscode/tasks.json
build # Ignore files created during build or run
/apps
/bin /bin
/backups /backups
/db build
/docs /docs
/extras
/lib /lib
/licenses /licenses
/log /log
# Ignore files managed in src/dist
/*.properties
/apps
/db
/extras
/launcher.jar
/static /static
/*.properties # Manage Gradle configuration
!/gradle.properties !/gradle.properties
/launcher.jar
/passwd
/start.*

View file

@ -147,9 +147,11 @@ installDist {
dependsOn build dependsOn build
} }
tasks.register('processSource', Sync) { def processSource = tasks.register('processSource', Sync) {
def gitOutput = new ByteArrayOutputStream() def gitOutput = new ByteArrayOutputStream()
outputs.dir "${project.buildDir}/src"
exec { exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD' commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = gitOutput standardOutput = gitOutput
@ -164,9 +166,11 @@ tasks.register('processSource', Sync) {
.replaceAll('__builddate__', new Date().format("d MMM yyyy")) .replaceAll('__builddate__', new Date().format("d MMM yyyy"))
.replaceAll('__commithash__', gitOutput.toString().trim()) .replaceAll('__commithash__', gitOutput.toString().trim())
.replaceAll('__version__', version) .replaceAll('__version__', version)
} into "${project.buildDir}/src" } into outputs.files.singleFile
} }
tasks.compileJava.source = processSource.map { it.outputs.files }
tasks.register('update') { tasks.register('update') {
dependsOn installDist dependsOn installDist

0
src/dist/extras/deploy.sh vendored Normal file → Executable file
View file