Merge pull request #813 from daleglass-overte/get-vcpkg-path

Add a way to get VCPKG path and hash ID

hifi_qt.py

@@ -81,7 +81,9 @@ endif()
 
             qt_found = True
             system_qt = True
-            print("Using system Qt")
+
+            if not self.args.quiet:
+                print("Using system Qt")
 
         elif os.getenv('OVERTE_QT_PATH', "") != "":
             # 2. Using an user-provided directory.
@@ -92,7 +94,9 @@ endif()
             self.cmakePath = os.path.join(self.fullPath, 'lib', 'cmake')
 
             qt_found = True
-            print("Using Qt from " + self.fullPath)
+
+            if not self.args.quiet:
+                print("Using Qt from " + self.fullPath)
 
         else:
             # 3. Using a pre-built Qt.
@@ -135,7 +139,8 @@ endif()
             self.lockFile = os.path.join(lockDir, lockName)
 
         if qt_found:
-            print("Found pre-built Qt5")
+            if not self.args.quiet:
+                print("Found pre-built Qt5")
             return
 
         if 'Windows' == system:

hifi_vcpkg.py

@@ -71,7 +71,8 @@ endif()
                 os.makedirs(self.basePath)
             self.path = os.path.join(self.basePath, self.id)
 
-        print("Using vcpkg path {}".format(self.path))
+        if not self.args.quiet:
+            print("Using vcpkg path {}".format(self.path))
         lockDir, lockName = os.path.split(self.path)
         lockName += '.lock'
         if not os.path.isdir(lockDir):

prebuild.py

@@ -83,6 +83,10 @@ def parse_args():
     parser.add_argument('--build-root', required=True, type=str, help='The location of the cmake build')
     parser.add_argument('--ports-path', type=str, default=defaultPortsPath)
     parser.add_argument('--ci-build', action='store_true', default=os.getenv('CI_BUILD') is not None)
+    parser.add_argument('--get-vcpkg-id', action='store_true', help='Get the VCPKG ID, the hash path of the full VCPKG path')
+    parser.add_argument('--get-vcpkg-path', action='store_true', help='Get the full VCPKG path, ID included.')
+    parser.add_argument('--quiet', action='store_true', default=False, help='Quiet mode with less output')
+
     if True:
         args = parser.parse_args()
     else:
@@ -99,6 +103,10 @@ def main():
             del os.environ[var]
 
     args = parse_args()
+
+    if not args.quiet:
+        print(sys.argv)
+
     assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')
 
     if args.ci_build:
@@ -129,11 +137,22 @@ def main():
                     qt.writeConfig()
         else:
             if (os.environ["OVERTE_USE_SYSTEM_QT"]):
-                print("System Qt selected")
+                if not args.quiet:
+                    print("System Qt selected")
+
             else:
                 raise Exception("Internal error: System Qt not selected, but hifi_qt.py failed to return a cmake path")
 
     pm = hifi_vcpkg.VcpkgRepo(args)
+
+    if args.get_vcpkg_id:
+        print(pm.id)
+        exit(0)
+
+    if args.get_vcpkg_path:
+        print(pm.path)
+        exit(0)
+
     if qtInstallPath is not None:
         pm.writeVar('QT_CMAKE_PREFIX_PATH', qtInstallPath)
 
@@ -190,7 +209,7 @@ def main():
 
     logger.info('end')
 
-print(sys.argv)
+
 try:
     main()
 except hifi_utils.SilentFatalError as fatal_ex: