cleanup of comments and naming

This commit is contained in:
thzero 2023-05-07 08:12:55 -05:00
parent 0da7515b3a
commit 4f79c3f82b
2 changed files with 28 additions and 20 deletions

View File

@ -54,11 +54,6 @@ dependencies {
} }
def serializedEnginesPath = './src/main/resources/datafiles/thrustcurves/thrustcurves.ser' def serializedEnginesPath = './src/main/resources/datafiles/thrustcurves/thrustcurves.ser'
// Deletes the serialize engine file if it exists.
tasks.register('serializeEnginesDelete', Delete) {
group = 'openrocket'
delete fileTree(serializedEnginesPath)
}
// Executes the serialization of engines from ThrustCurve. // Executes the serialization of engines from ThrustCurve.
tasks.register('serializeEngines') { tasks.register('serializeEngines') {
group = 'openrocket' group = 'openrocket'
@ -70,6 +65,12 @@ tasks.register('serializeEngines') {
println "Serialized engines in ${project.file(serializedEnginesPath)} already exist." println "Serialized engines in ${project.file(serializedEnginesPath)} already exist."
} }
} }
// Deletes the serialize engine file if it exists.
tasks.register('serializeEnginesDelete', Delete) {
group = 'openrocket'
delete fileTree(serializedEnginesPath)
}
// Excutes the Java serialization program to fetch ThrustCurve rocket data and serialize it.
tasks.register('serializeEnginesExecute', JavaExec) { tasks.register('serializeEnginesExecute', JavaExec) {
group = 'openrocket' group = 'openrocket'
workingDir new File(projectDir, 'build/tmp') workingDir new File(projectDir, 'build/tmp')

View File

@ -64,6 +64,7 @@ dependencies {
} }
def externalComponentsPath = './src/main/resources/datafiles/components' def externalComponentsPath = './src/main/resources/datafiles/components'
// Copies the external components to the Swing resource folder.
tasks.register('externalComponentsCopy', Copy) { tasks.register('externalComponentsCopy', Copy) {
group = 'openrocket' group = 'openrocket'
dependsOn 'externalComponentsValidate' dependsOn 'externalComponentsValidate'
@ -79,21 +80,13 @@ tasks.register('externalComponentsCopy', Copy) {
println "Copying $details.sourcePath to $details.path ..." println "Copying $details.sourcePath to $details.path ..."
} }
} }
// Deletes the external components resource folder.
tasks.register('externalComponentsDelete', Delete) { tasks.register('externalComponentsDelete', Delete) {
group = 'openrocket' group = 'openrocket'
delete fileTree(externalComponentsPath) delete fileTree(externalComponentsPath)
} }
tasks.register('externalComponentsInit') { // Validates the external components resource folder. If it is a Git project, then
group = 'openrocket' // calls the submodule updates to fetch the latest submodules.
doLast {
exec {
workingDir "../"
executable 'git'
args 'submodule', 'init'
}
println "Executed externalComponentsInit!"
}
}
tasks.register('externalComponentsValidate') { tasks.register('externalComponentsValidate') {
group = 'openrocket' group = 'openrocket'
def externalResourceComponents = './resources-src/datafiles/components-dbcook/orc'; def externalResourceComponents = './resources-src/datafiles/components-dbcook/orc';
@ -114,7 +107,7 @@ tasks.register('externalComponentsValidate') {
"% git submodule update --remote\n" + "% git submodule update --remote\n" +
"\n"; "\n";
println message println message
dependsOn externalComponentsUpdate dependsOn subModuleUpdate
} else { } else {
message += message +=
"If you retrieved this code by downloading and uncompressing a zip file,\n" + "If you retrieved this code by downloading and uncompressing a zip file,\n" +
@ -128,16 +121,30 @@ tasks.register('externalComponentsValidate') {
} }
} }
} }
tasks.register('externalComponentsUpdate') {
// Initializes the submodules in Git.
tasks.register('submoduleInit') {
group = 'openrocket' group = 'openrocket'
dependsOn 'externalComponentsInit' doLast {
exec {
workingDir "../"
executable 'git'
args 'submodule', 'init'
}
println "Executed submoduleInit!"
}
}
// Updates the initialized submodules in Git.
tasks.register('subModuleUpdate') {
group = 'openrocket'
dependsOn 'submoduleInit'
doLast { doLast {
exec { exec {
workingDir "../" workingDir "../"
executable 'git' executable 'git'
args 'submodule', 'update', '--remote' args 'submodule', 'update', '--remote'
} }
println "Executed externalComponentsUpdate!" println "Executed subModuleUpdate!"
} }
} }