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

small corrections 3

Browse source
This commit is contained in:
Rob1103 2023-05-25 23:15:00 +02:00
parent c8b7d3ddd1
commit c5107793e3
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcs/buildtool/run_buildtool.go
View file

@ -105,7 +105,8 @@ func parseMakeOutput(output string) string {
return sb.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, func addConfigFiles(configFiles []string, selectedFiles *[]string, includeFolder,
appFolder string) { appFolder string) {
@ -113,7 +114,6 @@ func addConfigFiles(configFiles []string, selectedFiles *[]string, includeFolder
configFile := filepath.Base(configFilePath) configFile := filepath.Base(configFilePath)
fileExt := filepath.Ext(configFile) fileExt := filepath.Ext(configFile)
// Copy config file
if fileExt == ".h" || fileExt == ".hpp" || fileExt == ".hcc" { if fileExt == ".h" || fileExt == ".hpp" || fileExt == ".hcc" {
if err := u.CopyFileContents(configFilePath, includeFolder+configFile); err != nil { if err := u.CopyFileContents(configFilePath, includeFolder+configFile); err != nil {
u.PrintErr(err) u.PrintErr(err)
@ -258,7 +258,7 @@ func RunBuildTool(homeDir string, data *u.Data) {
u.PrintErr(err) u.PrintErr(err)
} }
// Move config files to the unikernel folder // Add config files to the unikernel folder
addConfigFiles(*args.StringListArg[configArg], &selectedFiles, *includeFolder, appFolder) addConfigFiles(*args.StringListArg[configArg], &selectedFiles, *includeFolder, appFolder)
// Match micro-libs // Match micro-libs

6
srcs/buildtool/unikraft_files_process.go
View file

@ -166,11 +166,11 @@ var srcLanguages = map[string]int{
".c": 0, ".c": 0,
".cpp": 0, ".cpp": 0,
".cc": 0, ".cc": 0,
".S": 0, /*".S": 0,
".s": 0, ".s": 0,
".asm": 0, ".asm": 0,
".py": 0, ".py": 0,
".go": 0, ".go": 0,*/
} }
func filterSourcesFiles(sourceFiles []string) []string { func filterSourcesFiles(sourceFiles []string) []string {
@ -320,8 +320,6 @@ func conformIncludeDirectives(sourcePath string) error {
if err = conformFile(path, false); err != nil { if err = conformFile(path, false); err != nil {
return err return err
} }
} else {
u.PrintWarning("Unsupported extension for file: " + info.Name())
} }
} }
return nil return nil