ShadowsOverWestgate/sow-tools
7
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 38 Activity

Change Output Locations

Browse Source
This commit is contained in:
archvillainette
2026-04-13 15:05:43 +02:00
parent a4fa2156ca
commit 129602a482
6 changed files with 107 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/topdata/topdata.go
+7 -4
View File
@@ -945,6 +945,7 @@ func validateNativeOutputCatalog(dataDir string, report *ValidationReport) {
func validateTopPackageAssets(sourceDir, dataDir string, report *ValidationReport) {
assetsDir := filepath.Join(sourceDir, "assets")
generated2DADir := filepath.Join(assetsDir, "2da")
info, err := os.Stat(assetsDir)
if err != nil {
if errors.Is(err, os.ErrNotExist) {
@@ -981,6 +982,9 @@ func validateTopPackageAssets(sourceDir, dataDir string, report *ValidationRepor
if walkErr != nil {
return walkErr
}
if d.IsDir() && path == generated2DADir {
return filepath.SkipDir
}
if d.IsDir() {
return nil
}
@@ -1313,9 +1317,8 @@ func Compare(p *project.Project, progress func(string)) (CompareResult, error) {
if progress == nil {
progress = func(string) {}
}
buildDir := p.TopDataBuildDir()
output2DA := filepath.Join(buildDir, "2da")
outputTLK := filepath.Join(buildDir, "tlk")
output2DA := compiled2DAOutputDir(p)
outputTLK := compiledTLKOutputDir(p)
if _, err := os.Stat(output2DA); err != nil {
return CompareResult{}, fmt.Errorf("topdata build output missing: run build-topdata first")
}
@@ -1466,7 +1469,7 @@ func compareNativeSelfCheck(p *project.Project, actual2DA, actualTLK string, pro
}
func compareNativeCoverage(p *project.Project, actual2DA string, progress func(string)) (int, int, int, error) {
actualTLK := filepath.Join(filepath.Dir(actual2DA), "tlk")
actualTLK := compiledTLKOutputDir(p)
compared2DA, _, pass, mismatch, err := compareNativeSelfCheck(p, actual2DA, actualTLK, progress)
if err != nil {
return 0, 0, 0, err