fixed jar file name inside zip

This commit is contained in:
SuperPotato27 2024-07-17 14:27:26 -04:00
parent c8ca3ad820
commit f712f2597f
5 changed files with 10 additions and 7 deletions

View File

@ -3,7 +3,7 @@
$JavaParams = @{ $JavaParams = @{
FilePath = 'java' FilePath = 'java'
ArgumentList = @( ArgumentList = @(
'-jar "{0}"' -f "$PWD\tcg_eventlog_tool-2.1.3.jar" '-jar "{0}"' -f "$PWD\tcg_eventlog_tool/tcg_eventlog_tool.jar"
"$args" "$args"
) )
} }

View File

@ -5,7 +5,6 @@ $StartInfo.Arguments = "-NoExit -Command
`$Host.UI.RawUI.WindowTitle=`'TCG RIM TOOL`'; `$Host.UI.RawUI.WindowTitle=`'TCG RIM TOOL`';
Set-Alias elt '$PWD\eventlog.ps1'; Set-Alias elt '$PWD\eventlog.ps1';
Set-Alias rim '$PWD\rim.ps1'; Set-Alias rim '$PWD\rim.ps1';
# function rim { java -jar 'tcg_rim_tool-2.1.0.jar' $args; };
echo 'The TCG RIM TOOL is intended for testing TCG Defined PC Client Reference Integrity Manifests (RIMs)'; echo 'The TCG RIM TOOL is intended for testing TCG Defined PC Client Reference Integrity Manifests (RIMs)';
echo 'for usage type: rim -h'; echo 'for usage type: rim -h';
echo 'for eventlog usage type: elt -h' echo 'for eventlog usage type: elt -h'

View File

@ -3,7 +3,7 @@
$JavaParams = @{ $JavaParams = @{
FilePath = 'java' FilePath = 'java'
ArgumentList = @( ArgumentList = @(
'-jar "{0}"' -f "$PWD\tcg_rim_tool-2.1.0.jar" '-jar "{0}"' -f "$PWD\tcg_rim_tool/tcg_rim_tool.jar"
"$args" "$args"
) )
} }

View File

@ -130,13 +130,14 @@ ospackage {
task buildZip(type: Zip){ task buildZip(type: Zip){
dependsOn jar dependsOn jar
from(tasks.jar.archiveFile){ from(tasks.jar.archiveFile){
rename( filename ->
"${project.name}.jar")
into '/' into '/'
} }
archiveBaseName.set(project.name) archiveBaseName.set(project.name)
archiveExtension.set('zip')
destinationDirectory.set(file("$buildDir/distributions")) destinationDirectory.set(file("$buildDir/distributions"))
archiveFileName.set("${project.name}.zip")
} }
buildZip.dependsOn jar buildZip.dependsOn jar

View File

@ -133,8 +133,11 @@ buildDeb {
} }
task buildZip(type: Zip){ task buildZip(type: Zip){
dependsOn jar
dependsOn jar dependsOn jar
from(tasks.jar.archiveFile){ from(tasks.jar.archiveFile){
rename( filename ->
"${project.name}.jar")
into '/' into '/'
} }
from('./build/resources/test/rim_fields.json'){ from('./build/resources/test/rim_fields.json'){
@ -157,8 +160,8 @@ task buildZip(type: Zip){
} }
archiveBaseName.set(project.name) archiveBaseName.set(project.name)
archiveExtension.set('zip')
destinationDirectory.set(file("$buildDir/distributions")) destinationDirectory.set(file("$buildDir/distributions"))
archiveFileName.set("${project.name}.zip")
} }
buildZip.dependsOn jar buildZip.dependsOn jar