golang

Author: waahm7

builder/imports/golang.py

@@ -19,6 +19,7 @@
     'windows-x64': 'https://go.dev/dl/go1.21.5.windows-amd64.zip',
     'windows-x86': 'https://go.dev/dl/go1.21.5.windows-386.zip',
     'macos-x64': 'https://go.dev/dl/go1.21.5.darwin-amd64.tar.gz',
+    'macos-armv8': 'https://go.dev/dl/go1.21.5.darwin-arm64.tar.gz',
 }
 
 

builder/imports/jdk.py

@@ -56,20 +56,20 @@ def install(self, env):
                     'lib/**/jvm.dll', '**/lib/**/jvm.dll'],
             ]
             found = 0
-            #
-            # for paths in required_files:
-            #     path_found = False
-            #     for path in paths:
-            #         for prefix in prefixes:
-            #             if not prefix:
-            #                 continue
-            #             full_path = os.path.join(prefix, path)
-            #             if glob.glob(full_path, recursive=True):
-            #                 found += 1
-            #                 path_found = True
-            #                 break
-            #         if path_found:
-            #             break
+
+            for paths in required_files:
+                path_found = False
+                for path in paths:
+                    for prefix in prefixes:
+                        if not prefix:
+                            continue
+                        full_path = os.path.join(prefix, path)
+                        if glob.glob(full_path, recursive=True):
+                            found += 1
+                            path_found = True
+                            break
+                    if path_found:
+                        break
 
             if found >= len(required_files):
                 print('Found existing JDK8 at {}'.format(prefix))
@@ -95,7 +95,7 @@ def install(self, env):
         print('Downloading {}'.format(url))
         fetch_and_extract(url, filename, install_dir)
         os.remove(filename)
-        print(glob.glob(os.path.join(install_dir, 'jdk*')))
+
         jdk_home = glob.glob(os.path.join(install_dir, '*jdk*'))[0]
         assert jdk_home