X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=binapigen%2Fvppapi%2Futil.go;h=1374bb91ee0c9f939af47928f9ed1b4d689b46c3;hb=a5739cb7160349f96c428995049ff61411689ea0;hp=87f2e55086390bd51523ac79e0adefb8b803018c;hpb=d1f24d37bd447b64e402298bb8eb2479681facf9;p=govpp.git

diff --git a/binapigen/vppapi/util.go b/binapigen/vppapi/util.go
index 87f2e55..1374bb9 100644
--- a/binapigen/vppapi/util.go
+++ b/binapigen/vppapi/util.go
@@ -26,7 +26,9 @@ import (
 )
 
 const (
-	VPPVersionEnvVar = "VPP_VERSION"
+	VPPVersionEnvVar  = "VPP_VERSION"
+	VPPDirEnvVar      = "VPP_DIR"
+	versionScriptPath = "./src/scripts/version"
 )
 
 // ResolveVPPVersion resolves version of the VPP for target directory.
@@ -35,17 +37,17 @@ const (
 func ResolveVPPVersion(apidir string) string {
 	// check env variable override
 	if ver := os.Getenv(VPPVersionEnvVar); ver != "" {
-		logrus.Debugf("VPP version was manually set to %q via %s env var", ver, VPPVersionEnvVar)
+		logrus.Infof("VPP version was manually set to %q via %s env var", ver, VPPVersionEnvVar)
 		return ver
 	}
 
 	// assuming VPP package is installed
-	if path.Clean(apidir) == DefaultDir {
+	if _, err := exec.LookPath("vpp"); err == nil {
 		version, err := GetVPPVersionInstalled()
 		if err != nil {
 			logrus.Warnf("resolving VPP version from installed package failed: %v", err)
 		} else {
-			logrus.Debugf("resolved VPP version from installed package: %v", version)
+			logrus.Infof("resolved VPP version from installed package: %v", version)
 			return version
 		}
 	}
@@ -60,7 +62,7 @@ func ResolveVPPVersion(apidir string) string {
 		if err != nil {
 			logrus.Warnf("resolving VPP version from version script failed: %v", err)
 		} else {
-			logrus.Debugf("resolved VPP version from version script: %v", version)
+			logrus.Infof("resolved VPP version from version script: %v", version)
 			return version
 		}
 	}
@@ -85,14 +87,13 @@ func GetVPPVersionInstalled() (string, error) {
 	return strings.TrimSpace(string(out)), nil
 }
 
-const versionScriptPath = "./src/scripts/version"
-
 // GetVPPVersionRepo retrieves VPP version using script in repo directory.
 func GetVPPVersionRepo(repoDir string) (string, error) {
-	if _, err := os.Stat(versionScriptPath); err != nil {
+	scriptPath := path.Join(repoDir, versionScriptPath)
+	if _, err := os.Stat(scriptPath); err != nil {
 		return "", err
 	}
-	cmd := exec.Command(versionScriptPath)
+	cmd := exec.Command(scriptPath)
 	cmd.Dir = repoDir
 	out, err := cmd.CombinedOutput()
 	if err != nil {
@@ -102,6 +103,10 @@ func GetVPPVersionRepo(repoDir string) (string, error) {
 }
 
 func findGitRepoRootDir(dir string) (string, error) {
+	if conf := os.Getenv(VPPDirEnvVar); conf != "" {
+		logrus.Infof("VPP directory was manually set to %q via %s env var", conf, VPPDirEnvVar)
+		return conf, nil
+	}
 	cmd := exec.Command("git", "rev-parse", "--show-toplevel")
 	cmd.Dir = dir
 	out, err := cmd.CombinedOutput()