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

searchInternalDependencies fix

Browse source
This commit is contained in:
Rob1103 2022-11-16 20:20:20 +01:00
parent 4fed79c2d8
commit bb0c63f43d
1 changed files with 13 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
srcs/buildtool/run_buildtool.go
View file

@ -253,51 +253,25 @@ func RunBuildTool(homeDir string, data *u.Data) {
runMake(programName, appFolder) runMake(programName, appFolder)
} }
func searchInternalDependencies(unikraftPath string, matchedLibs *[]string, // retFolderCompat modifies its string argument in order to replace its underscore by a dash when
externalLibs map[string]string) error { // necessary for the searchInternalDependencies function to find the corresponding folder in the
// 'unikraft' folder.
for _, lib := range *matchedLibs { //
// Consider only external libs // It returns its string argument whose underscore has been replaced by a dash if necessary,
if _, ok := externalLibs[lib]; ok { // otherwise it returns its argument unchanged.
func retFolderForCompat(lib string) string {
// Get and read Config.UK from external lib if strings.Contains(lib, "posix_") {
configUk := unikraftPath + u.LIBSFOLDER + lib + u.SEP + "Config.uk" folder := strings.ReplaceAll(lib, "posix_", "posix-")
lines, err := u.ReadLinesFile(configUk) return folder
if err != nil {
return err
}
// Process Config.UK file
mapConfig := make(map[string][]string)
u.ProcessConfigUK(lines, false, mapConfig, nil)
for config := range mapConfig {
// Remove LIB prefix
if strings.Contains(config, "LIB") {
config = strings.TrimPrefix(config, "LIB")
}
// Check if matchedLibs already contains the lib
config = strings.ToLower(config)
if !u.Contains(*matchedLibs, config) {
*matchedLibs = append(*matchedLibs, config)
}
}
}
} }
return nil return lib
} }
/* // This version considers also internal lib dependencies
func searchInternalDependencies(unikraftPath string, matchedLibs *[]string, func searchInternalDependencies(unikraftPath string, matchedLibs *[]string,
externalLibs map[string]string) error { externalLibs map[string]string) error {
for _, lib := range *matchedLibs { for _, lib := range *matchedLibs {
if strings.Contains(lib, "_") {
lib = strings.ReplaceAll(lib, "_", "-")
}
// Get and read Config.UK from lib // Get and read Config.UK from lib
var configUk string var configUk string
@ -305,7 +279,8 @@ func searchInternalDependencies(unikraftPath string, matchedLibs *[]string,
if _, ok := externalLibs[lib]; ok { if _, ok := externalLibs[lib]; ok {
configUk = unikraftPath + u.LIBSFOLDER + lib + u.SEP + "Config.uk" configUk = unikraftPath + u.LIBSFOLDER + lib + u.SEP + "Config.uk"
} else { } else {
configUk = unikraftPath + u.UNIKRAFTFOLDER + "lib" + u.SEP + lib + u.SEP + "Config.uk" configUk = unikraftPath + u.UNIKRAFTFOLDER + "lib" + u.SEP + retFolderForCompat(lib) +
u.SEP + "Config.uk"
} }
lines, err := u.ReadLinesFile(configUk) lines, err := u.ReadLinesFile(configUk)
@ -324,11 +299,6 @@ func searchInternalDependencies(unikraftPath string, matchedLibs *[]string,
config = strings.TrimPrefix(config, "LIB") config = strings.TrimPrefix(config, "LIB")
} }
// Replace underscore by dash
//if strings.Contains(config, "_") {
// config = strings.ReplaceAll(config, "_", "-")
//}
// Check if matchedLibs already contains the lib // Check if matchedLibs already contains the lib
config = strings.ToLower(config) config = strings.ToLower(config)
if !u.Contains(*matchedLibs, config) { if !u.Contains(*matchedLibs, config) {
@ -339,7 +309,6 @@ func searchInternalDependencies(unikraftPath string, matchedLibs *[]string,
return nil return nil
} }
*/
func generateMake(programName, appFolder, workspacePath, makefile string, func generateMake(programName, appFolder, workspacePath, makefile string,
matchedLibs, sourceFiles []string, externalLibs map[string]string) error { matchedLibs, sourceFiles []string, externalLibs map[string]string) error {