kbruen/gaulthiergain-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

include directive paths problem fix 3

Browse source
This commit is contained in:
Rob1103 2023-04-19 09:57:13 +02:00
parent 6768e1d930
commit 302af1e1a2
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
srcs/buildtool/unikraft_files_process.go
View file

@ -195,15 +195,10 @@ func conformIncDirAndCopyFile(sourcePath, destPath string) (err error) {
for index := range fileLines { for index := range fileLines {
for _, match := range re.FindAllStringSubmatch(fileLines[index], -1) { for _, match := range re.FindAllStringSubmatch(fileLines[index], -1) {
// Only interested in user-defined directives containing a path to a header file
if !strings.Contains(match[0], "/") {
continue
}
// Replace the path by its last element // Replace the path by its last element
for i := 1; i < len(match); i++ { for i := 1; i < len(match); i++ {
if match[i] == "\"" { if match[i] == "\"" {
match[i+1] = filepath.Base(match[i+1]) match[i+1] = "include/" + filepath.Base(match[i+1])
fileLines[index] = strings.Join(match[1:], "") + "\n" fileLines[index] = strings.Join(match[1:], "") + "\n"
break break
} }
@ -244,7 +239,7 @@ func processSourceFiles(sourcesPath, appFolder, includeFolder string,
includesFiles = append(includesFiles, info.Name()) includesFiles = append(includesFiles, info.Name())
// Copy header files to the INCLUDEFOLDER // Copy header files to the INCLUDEFOLDER
if err = conformIncDirAndCopyFile(path, includeFolder+info.Name()); err != nil { if err = u.CopyFileContents(path, includeFolder+info.Name()); err != nil {
return err return err
} }
} else { } else {