Fixes patch for WINDOWS OS

Signed-off-by: Catalin Stratu <catalinstratu45@gmail.com>
spdx · Mar 15, 2022 · f7ea935 · f7ea935
1 parent bc89f8d
commit f7ea935
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/builder/builder2v1/build_package.go b/builder/builder2v1/build_package.go
@@ -8,6 +8,7 @@ import (
 	"github.com/spdx/tools-golang/utils"
 	"path/filepath"
 	"regexp"
+	"runtime"
 )
 
 // BuildPackageSection2_1 creates an SPDX Package (version 2.1), returning
@@ -22,18 +23,27 @@ func BuildPackageSection2_1(packageName string, dirRoot string, pathsIgnore []st
 	if err != nil {
 		return nil, err
 	}
+	osType := runtime.GOOS
 
 	re, ok := regexp.Compile("/+")
 	if ok != nil {
 		return nil, err
 	}
+
+	dirRootLen := 0
+	if osType == "windows" {
+		dirRootLen = len(dirRoot)
+	}
+
 	files := map[spdx.ElementID]*spdx.File2_1{}
 	fileNumber := 0
-	//dirRootLen := len(dirRoot)
 	for _, fp := range filepaths {
-		newFileName := fp
-		newFilePatch := filepath.FromSlash("." + newFileName)
-		fmt.Println(newFilePatch)
+		newFilePatch := ""
+		if osType == "windows" {
+			newFilePatch = filepath.FromSlash("." + fp[dirRootLen:])
+		} else {
+			newFilePatch = filepath.FromSlash("./" + fp)
+		}
 		newFile, err := BuildFileSection2_1(re.ReplaceAllLiteralString(newFilePatch, string(filepath.Separator)), dirRoot, fileNumber)
 		if err != nil {
 			return nil, err

diff --git a/builder/builder2v2/build_package.go b/builder/builder2v2/build_package.go
@@ -8,6 +8,7 @@ import (
 	"github.com/spdx/tools-golang/utils"
 	"path/filepath"
 	"regexp"
+	"runtime"
 )
 
 // BuildPackageSection2_2 creates an SPDX Package (version 2.2), returning
@@ -19,6 +20,7 @@ func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []st
 	// build the file section first, so we'll have it available
 	// for calculating the package verification code
 	filepaths, err := utils.GetAllFilePaths(dirRoot, pathsIgnore)
+	osType := runtime.GOOS
 
 	if err != nil {
 		return nil, err
@@ -28,11 +30,20 @@ func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []st
 	if ok != nil {
 		return nil, err
 	}
+	dirRootLen := 0
+	if osType == "windows" {
+		dirRootLen = len(dirRoot)
+	}
 
 	files := map[spdx.ElementID]*spdx.File2_2{}
 	fileNumber := 0
 	for _, fp := range filepaths {
-		newFilePatch := filepath.FromSlash("." + fp)
+		newFilePatch := ""
+		if osType == "windows" {
+			newFilePatch = filepath.FromSlash("." + fp[dirRootLen:])
+		} else {
+			newFilePatch = filepath.FromSlash("./" + fp)
+		}
 		newFile, err := BuildFileSection2_2(re.ReplaceAllLiteralString(newFilePatch, string(filepath.Separator)), dirRoot, fileNumber)
 		if err != nil {
 			return nil, err