upd

Author: amakarev

build.sh

@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
+export CGO_ENABLED=0
 
+export CGO_ENABLED=0
 version=$(git describe --long --dirty --abbrev=10 --tags)
 lf="-X github.com/intel/oneapi-cli/cmd.version=${version}"
 
-GOOS=linux GOARCH=amd64 go build -ldflags "$lf" -o linux/bin/oneapi-cli
-GOOS=windows GOARCH=amd64 go build -ldflags "$lf" -o win/bin/oneapi-cli.exe
-GOOS=darwin GOARCH=amd64 go build -ldflags "$lf" -o osx/bin/oneapi-cli
+
+GOOS=linux GOARCH=amd64 go build -ldflags "$lf" -trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="all=-s -w" -o linux/bin/oneapi-cli
+GOOS=windows GOARCH=amd64 go build -ldflags "$lf" -trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="all=-s -w"  -o win/bin/oneapi-cli.exe
+GOOS=darwin GOARCH=amd64 go build -ldflags "$lf" -trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="all=-s -w" -o osx/bin/oneapi-cli

cmd/check.go

@@ -1,14 +1,5 @@
 // Copyright 2019 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
-/*
-	usage:
-	oneapi-cli check  --deps="mkl,tbb"
-
-	TODO: --html flag
-
-	https://software.intel.com/en-us/oneapi
-
-*/
 
 package cmd
 

cmd/clean.go

@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 
@@ -18,6 +19,11 @@ var cleanCmd = &cobra.Command{
 	Long:  `Removes local Sample Cache`,
 	Run: func(cmd *cobra.Command, args []string) {
 		os.RemoveAll(filepath.Join(baseFilePath, aggregator.AggregatorLocalAPILevel))
+		if err := os.RemoveAll(filepath.Join(baseFilePath, aggregator.AggregatorLocalAPILevel)); err != nil {
+			fmt.Println("Failed to clean sample cache.")
+			fmt.Printf("%s \n", err)
+			os.Exit(1)
+		}
 	},
 }
 

cmd/root.go

@@ -15,15 +15,10 @@ import (
 	"github.com/spf13/cobra"
 )
 
-//SamplesEndpointDefault default samples endpoint
 const SamplesEndpointDefault = "https://iotdk.intel.com/samples-iss"
 
-//2021.1-beta05/
-
-//SampleLatestKey the location from the default path that points to a "latest version"
 const SampleLatestKey = "latest"
 
-//LocalStorageDefault the default path root where the local cache is kept
 const LocalStorageDefault = ".oneapi-cli"
 
 var baseURL string
@@ -95,7 +90,6 @@ func init() {
 	}
 	defaultBaseFilePath := filepath.Join(userHome, LocalStorageDefault)
 
-	//rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cmd.yaml)")
 	rootCmd.PersistentFlags().StringVarP(&baseURL, "url", "u", getVersionInfo(), "URL of remote sample aggregator")
 	rootCmd.PersistentFlags().StringVarP(&baseFilePath, "directory", "d", defaultBaseFilePath, "location to store local oneapi samples cache")
 	rootCmd.PersistentFlags().StringSliceVarP(&enabledLanguages, "languages", "l", defaultLanguages, "enabled languages")
@@ -104,16 +98,20 @@ func init() {
 
 }
 
-//looks at the command bin path and looks for "version.txt" which
-//points to which sample version to look at. If it cant find it it
-//returns the Latestkey const
+// looks at the command bin path and looks for "samples-version-tag.txt" which
+
+// points to which sample version to look at. If it cant find it it
+// returns the Latestkey const
 func getVersionInfo() string {
 	bin, err := os.Executable()
 	if err != nil {
 		return fmt.Sprintf("%s/%s/", SamplesEndpointDefault, SampleLatestKey)
 	}
-	versionPath := filepath.Join(filepath.Dir(bin), "version.txt")
-
+	bin, err = filepath.EvalSymlinks(bin)
+	if err != nil {
+		return fmt.Sprintf("%s/%s/", SamplesEndpointDefault, SampleLatestKey)
+	}
+	versionPath := filepath.Join(filepath.Dir(filepath.Dir(bin)), "etc", "samples-version-tag.txt")
 	file, err := os.Open(versionPath)
 	if err != nil {
 		return fmt.Sprintf("%s/%s/", SamplesEndpointDefault, SampleLatestKey)

cmd/version.go

@@ -9,10 +9,10 @@ import (
 	"github.com/spf13/cobra"
 )
 
-//Version set during build via `go build -ldflags -X "-X main.Version=version"`
+// Version set during build via `go build -ldflags -X "-X main.Version=version"`
 var version string
 
-// cleanCmd represents the clean command
+// versionCmd represents the version command
 var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Show the CLI version information",

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/mattn/go-ieproxy v0.0.1
 	github.com/spf13/cobra v1.6.1
 	gitlab.com/tslocum/cview v1.4.4
+	//	golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43
 	golang.org/x/sys v0.13.0
 )
 

pkg/deps/checker.go

@@ -17,7 +17,7 @@ import (
 const (
 	rootEnvKey = "ONEAPI_ROOT"
 
-	baseURL = "https://software.intel.com/en-us/oneapi/"
+	baseURL = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/overview"
 
 	formatStr = `The following tools are needed to build this sample but are not locally installed: (%s)
 You may continue and view the sample without the prerequisites. To install the missing prerequisites, visit:
@@ -28,11 +28,10 @@ You may continue and view the sample without the prerequisites. To install the m
 	compilerReg = "compiler\\|(.*)"
 )
 
-//CheckDeps as
+// CheckDeps as
 func CheckDeps(dependencies []string, root string) (msg string, errCode int) {
 	//dependencies are both "normal" component dependencies ( ["mkl", "vtune"])
 	//and "special" dependencies  ( ["pkg|mraa", "compiler|icc"])
-
 	componentDeps, specialDeps := separatethSheepsGoats(dependencies)
 
 	componentMsg, componentErrCode := checkComponentDeps(componentDeps, root)
@@ -145,30 +144,30 @@ func checkCompilerDeps(compilerDeps []string, root string) (msg string, errCode
 	var missing []string
 
 	winCompilers := map[string]string{
-		"icc":     "windows/bin/intel64/icl.exe",
-		"fortran": "windows/bin/intel64/ifort.exe",
-		"dpcpp":   "windows/bin/dpcpp.exe",
-		"icpc":    "windows/bin/intel64/icpc.exe",
-		"icx":     "windows/bin/icx.exe",
-		"icpcx":   "windows/bin/icpcx.exe",
-		"ifx":     "windows/bin/ifx.exe",
+		"icc":     "bin/intel64/icl.exe",
+		"fortran": "bin/intel64/ifort.exe",
+		"dpcpp":   "bin/dpcpp.exe",
+		"icpc":    "bin/intel64/icpc.exe",
+		"icx":     "bin/icx.exe",
+		"icpcx":   "bin/icpcx.exe",
+		"ifx":     "bin/ifx.exe",
 	}
 	linCompilers := map[string]string{
-		"icc":     "linux/bin/intel64/icc",
-		"fortran": "linux/bin/intel64/ifort",
-		"dpcpp":   "linux/bin/dpcpp",
-		"icpc":    "linux/bin/intel64/icpc",
-		"icx":     "linux/bin/icx",
-		"icpcx":   "linux/bin/icpcx",
-		"ifx":     "linux/bin/ifx",
+		"icc":     "bin/intel64/icc",
+		"fortran": "bin/intel64/ifort",
+		"dpcpp":   "bin/dpcpp",
+		"icpc":    "bin/intel64/icpc",
+		"icx":     "bin/icx",
+		"icpcx":   "bin/icpcx",
+		"ifx":     "bin/ifx",
 	}
 	macCompilers := map[string]string{
-		"icpc":  "mac/bin/intel64/icpc",
-		"icc":   "mac/bin/intel64/icc",
-		"ifort": "mac/bin/intel64/ifort",
-		"icx":   "mac/bin/icx",
-		"icpcx": "mac/bin/icpcx",
-		"ifx":   "mac/bin/ifx",
+		"icpc":  "bin/intel64/icpc",
+		"icc":   "bin/intel64/icc",
+		"ifort": "bin/intel64/ifort",
+		"icx":   "bin/icx",
+		"icpcx": "bin/icpcx",
+		"ifx":   "bin/ifx",
 	}
 
 	compilerRoot := GetCompilerRoot(root)
@@ -220,19 +219,28 @@ func checkSpecialDeps(specialDependencies []string, root string) (msg string, er
 	return msg, errCode
 }
 
-//GetOneAPIRoot gets the root the OneAPI installation
-//based on the ONEAPI_ROOT
+// GetOneAPIRoot gets the root the OneAPI installation
+// based on the ONEAPI_ROOT
 func GetOneAPIRoot() (path string, err error) {
 	root, ok := os.LookupEnv(rootEnvKey)
+
 	if !ok {
 		return "", fmt.Errorf("%s not defined.  Be sure to run oneapi environment script ( source setvars.sh )", rootEnvKey)
 	}
+
+	tmp := filepath.Dir(root)
+	tmp = strings.ToLower(filepath.Base(tmp))
+	if tmp == "oneapi" {
+		return filepath.Dir(root), nil
+	}
+
 	return root, nil
 }
 
 // CMPLR_ROOT was, for awhile, always defined in the environment. But no longer.
 func GetCompilerRoot(root string) (compilerRoot string) {
-	return filepath.Join(root, "compiler", "latest")
+	compilerRoot = filepath.Join(root, "compiler", "latest")
+	return compilerRoot
 }
 
 type suiteComponent struct {
@@ -265,7 +273,7 @@ func GenerateMessage(missing []string) string {
 
 	//5. return message with url.
 
-	//baseURL := "https://software.intel.com/en-us/oneapi"   // this is captured in format String
+	//baseURL := "https://www.intel.com/content/www/us/en/developer/tools/oneapi/overview"   // this is captured in format String
 	var slug string
 	fallbackMsg := fmt.Sprintf(formatStr, strings.Join(missing, " "), baseURL, slug)
 
@@ -342,7 +350,7 @@ func readSomeJSON(path string, something interface{}) error {
 	return nil
 }
 
-//keeping the same interface as the file reading function for now.
+// keeping the same interface as the file reading function for now.
 func parseSomeJSON(str string, something interface{}) error {
 	json.Unmarshal([]byte(str), something)
 	return nil

pkg/ui/cli.go

@@ -25,7 +25,7 @@ const depsMissingEnvFmt = `The sample you have chosen requires the following dep
 Unfortunately, we are unable to determine if they are present.
 Did you use setvars to configure your environment? Are you using a container build environment?`
 
-//CLI data
+// CLI data
 type CLI struct {
 	sidebar    *cview.TextView
 	app        *cview.Application
@@ -36,14 +36,14 @@ type CLI struct {
 	langSelect *cview.List
 }
 
-const idzURL = "https://software.intel.com/en-us/oneapi"
+const idzURL = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/overview"
 
 func optionViewDocsInBrowser(url string) {
 	//If it cant open it for some reason, it will silently fail
 	browser.OpenBrowser(url)
 }
 
-//NewCLI create a new *CLI element for showing the CLI
+// NewCLI create a new *CLI element for showing the CLI
 func NewCLI(a *aggregator.Aggregator, uH string) (cli *CLI, err error) {
 	if a == nil {
 		return nil, fmt.Errorf("Aggregator passed not valid")
@@ -64,7 +64,7 @@ func NewCLI(a *aggregator.Aggregator, uH string) (cli *CLI, err error) {
 	return &CLI{app: cview.NewApplication(), aggregator: a, userHome: uH, oneAPIRoot: oneRootPath}, nil
 }
 
-//Show displays the UI
+// Show displays the UI
 func (cli *CLI) Show() {
 
 	list := cview.NewList().
@@ -172,7 +172,7 @@ func newSampleNode(s aggregator.Sample) *cview.TreeNode {
 	return node
 }
 
-//This take a sample and a category to add it to. TODO revist this
+// This take a sample and a category to add it to. TODO revist this
 func categoriesSeach(parent *cview.TreeNode, cats []string, s aggregator.Sample) {
 	if len(cats) == 0 {
 		parent.AddChild(newSampleNode(s))