From c5107793e367a0e8351ff472e0eafeaf03a614bb Mon Sep 17 00:00:00 2001 From: Rob1103 Date: Thu, 25 May 2023 23:15:00 +0200 Subject: [PATCH] small corrections 3 --- srcs/buildtool/run_buildtool.go | 6 +++--- srcs/buildtool/unikraft_files_process.go | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/srcs/buildtool/run_buildtool.go b/srcs/buildtool/run_buildtool.go index d27f292..cf6a02e 100644 --- a/srcs/buildtool/run_buildtool.go +++ b/srcs/buildtool/run_buildtool.go @@ -105,7 +105,8 @@ func parseMakeOutput(output string) string { return sb.String() } -// addConfigFiles adds user-provided configuration files to the app unikernel folder. +// addConfigFiles adds user-provided configuration files in the order in which they come to the +// unikernel folder. func addConfigFiles(configFiles []string, selectedFiles *[]string, includeFolder, appFolder string) { @@ -113,7 +114,6 @@ func addConfigFiles(configFiles []string, selectedFiles *[]string, includeFolder configFile := filepath.Base(configFilePath) fileExt := filepath.Ext(configFile) - // Copy config file if fileExt == ".h" || fileExt == ".hpp" || fileExt == ".hcc" { if err := u.CopyFileContents(configFilePath, includeFolder+configFile); err != nil { u.PrintErr(err) @@ -258,7 +258,7 @@ func RunBuildTool(homeDir string, data *u.Data) { u.PrintErr(err) } - // Move config files to the unikernel folder + // Add config files to the unikernel folder addConfigFiles(*args.StringListArg[configArg], &selectedFiles, *includeFolder, appFolder) // Match micro-libs diff --git a/srcs/buildtool/unikraft_files_process.go b/srcs/buildtool/unikraft_files_process.go index d5e434a..fc5023a 100644 --- a/srcs/buildtool/unikraft_files_process.go +++ b/srcs/buildtool/unikraft_files_process.go @@ -166,11 +166,11 @@ var srcLanguages = map[string]int{ ".c": 0, ".cpp": 0, ".cc": 0, - ".S": 0, + /*".S": 0, ".s": 0, ".asm": 0, ".py": 0, - ".go": 0, + ".go": 0,*/ } func filterSourcesFiles(sourceFiles []string) []string { @@ -320,8 +320,6 @@ func conformIncludeDirectives(sourcePath string) error { if err = conformFile(path, false); err != nil { return err } - } else { - u.PrintWarning("Unsupported extension for file: " + info.Name()) } } return nil