Add LAN-only macOS support (#57)

tektronix · Oct 9, 2024 · 702c2a0 · 702c2a0
1 parent d8bdd64
commit 702c2a0
Show file tree

Hide file tree

Showing 8 changed files with 288 additions and 273 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -112,9 +112,11 @@ jobs:
             vscode-platform: win32-x64
             os: win32
             arch: x64
-          # - runner: macos-latest
-          #   triple: x86_64-apple-darwin
-          #   vscode-platform: darwin-arm64
+          - runner: macos-latest
+            triple: aarch64-apple-darwin
+            vscode-platform: darwin-arm64
+            os: darwin
+            arch: arm64
     runs-on: ${{matrix.runner}}
     steps:
       - name: Tool Versions
@@ -153,9 +155,11 @@ jobs:
             vscode-platform: win32-x64
             os: win32
             arch: x64
-          # - runner: macos-latest
-          #   triple: x86_64-apple-darwin
-          #   vscode-platform: darwin-arm64
+          - runner: macos-latest
+            triple: aarch64-apple-darwin
+            vscode-platform: darwin-arm64
+            os: darwin
+            arch: arm64
     needs:
       - compile
     container:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,11 +15,14 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
     Fixed -- for any bug fixes.
     Security -- in case of vulnerabilities.
 -->
+
+
 ## [0.18.2]
 
 ### Added
 
 - Added walkthrough document
+- Added macOS support (LAN only)
 
 ### Changed
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -482,8 +482,9 @@
         "xml-js": "1.6.11"
     },
     "optionalDependencies": {
-        "@tektronix/kic-cli-linux-x64": "0.18.3-0",
-        "@tektronix/kic-cli-win32-x64": "0.18.3-0"
+        "@tektronix/kic-cli-linux-x64": "0.18.3-1",
+        "@tektronix/kic-cli-win32-x64": "0.18.3-1",
+        "@tektronix/kic-cli-darwin-arm64": "0.18.3-1"
     },
     "extensionDependencies": [
         "sumneko.lua"

diff --git a/src/instruments.ts b/src/instruments.ts
@@ -18,7 +18,7 @@ import {
     KicProcessMgr,
 } from "./resourceManager"
 import { LOG_DIR } from "./utility"
-import { LoggerManager } from "./logging"
+//import { LoggerManager } from "./logging"
 
 const DISCOVERY_TIMEOUT = 5
 
@@ -1332,7 +1332,6 @@ export class InstrumentsExplorer {
     }
 
     private startDiscovery() {
-        const logger = LoggerManager.instance().add_logger("TSP Discovery")
         if (this.InstrumentsDiscoveryViewer.message == "") {
             const discover = cp.spawn(
                 DISCOVER_EXECUTABLE,
@@ -1344,8 +1343,6 @@ export class InstrumentsExplorer {
                             .toISOString()
                             .substring(0, 10)}-kic-discover.log`,
                     ),
-                    "--log-socket",
-                    `${logger.host}:${logger.port}`,
                     "all",
                     "--timeout",
                     DISCOVERY_TIMEOUT.toString(),