Update taskfiles to match modern wails tempalte. (#85)

- Also fixes windows icon

Author: swz-git

.gitignore

@@ -1,2 +1,5 @@
 bin
 .task
+build/**/*.ico
+build/**/*.icns
+*.syso

Taskfile.yml

@@ -1,178 +1,32 @@
-version: "3"
+version: '3'
+
+includes:
+  common: ./build/Taskfile.yml
+  windows: ./build/windows/Taskfile.yml
+  linux: ./build/linux/Taskfile.yml
 
 vars:
   APP_NAME: "rlbotgui"
   BIN_DIR: "bin"
-  VITE_PORT: "{{.WAILS_VITE_PORT | default 9245}}"
+  VITE_PORT: '{{.WAILS_VITE_PORT | default 9245}}'
 
 tasks:
-  ## -------------------------- Build -------------------------- ##
-
   build:
     summary: Builds the application
     cmds:
-      # Build for current OS
-      - task: build:{{OS}}
-
-  build:go:
-    summary: Builds the application without frontend
-    cmds:
-      # Build for current OS
-      - task: build:{{OS}}:go
-
-  build:windows:go:
-    summary: Builds the application without frontend for Windows
-    deps:
-      - task: go:mod:tidy
-        vars:
-          BUILD_FLAGS: "{{.BUILD_FLAGS}}"
-      - task: generate:icons
-        vars:
-          ARCH: "{{.ARCH}}"
-    cmds:
-      - go build {{.BUILD_FLAGS}} -o {{.BIN_DIR}}/rlbotgui.exe
-    vars:
-      BUILD_FLAGS: '{{if ne .DEV "true"}}-tags production -trimpath -ldflags="-w -s -H windowsgui"{{else}}-gcflags=all="-l"{{end}}'
-    env:
-      GOOS: windows
-      CGO_ENABLED: 1
-      GOARCH: "{{.ARCH | default ARCH}}"
-      CC: x86_64-w64-mingw32-gcc
-      DEV: '{{.DEV | default "true"}}'
-
-  build:windows:
-    summary: Builds the application for Windows
-    deps:
-      - task: build:frontend
-        vars:
-          BUILD_FLAGS: "{{.BUILD_FLAGS}}"
-    cmds:
-      - task: build:windows:go
-
-  ## ------> Linux <-------
-
-  build:linux:go:
-    summary: Builds the application without the frontend for Linux
-    deps:
-      - task: go:mod:tidy
-        vars:
-          BUILD_FLAGS: "{{.BUILD_FLAGS}}"
-      - task: generate:icons
-        vars:
-          ARCH: "{{.ARCH}}"
-    cmds:
-      - go build {{.BUILD_FLAGS}} -o {{.BIN_DIR}}/rlbotgui
-    vars:
-      BUILD_FLAGS: '{{if ne .DEV "true"}}-tags production -trimpath -ldflags="-w -s"{{else}}-gcflags=all="-l"{{end}}'
-    env:
-      GOOS: linux
-      CGO_ENABLED: 1
-      GOARCH: "{{.ARCH | default ARCH}}"
-      DEV: '{{.DEV | default "true"}}'
-
-  build:linux:
-    summary: Builds the application for Linux
-    deps:
-      - task: build:frontend
-        vars:
-          BUILD_FLAGS: "{{.BUILD_FLAGS}}"
-    cmds:
-      - task: build:linux:go
-
-  ## -------------------------- Misc -------------------------- ##
-
-  generate:icons:
-    summary: Generates Windows `.ico` file from an image
-    dir: build
-    sources:
-      - "appicon.png"
-    generates:
-      - "icon.ico"
-    cmds:
-      # Generates both .ico
-      - wails3 generate icons -input appicon.png -windowsfilename icon.ico
+      - task: "{{OS}}:build"
 
-  install:frontend:deps:
-    summary: Install frontend dependencies
-    dir: frontend
-    sources:
-      - package.json
-      - package-lock.json
-    generates:
-      - node_modules/*
-    preconditions:
-      - sh: pnpm version
-        msg: "Looks like pnpm isn't installed."
+  package:
+    summary: Packages a production build of the application
     cmds:
-      # - npm install --silent --no-progress
-      - pnpm install
-
-  build:frontend:
-    summary: Build the frontend project
-    dir: frontend
-    sources:
-      - "**/*"
-    generates:
-      - dist/*
-    deps:
-      - install:frontend:deps
-      - task: generate:bindings
-        vars:
-          BUILD_FLAGS: "{{.BUILD_FLAGS}}"
-    cmds:
-      - pnpm run build # -q
-
-  generate:bindings:
-    summary: Generates bindings for the frontend
-    sources:
-      - "**/*.go"
-      - go.mod
-      - go.sum
-    generates:
-      - "frontend/bindings/**/*"
-    cmds:
-      # For a complete list of options, run `wails3 generate bindings -help`
-      - wails3 generate bindings -f '{{.BUILD_FLAGS}}'
-
-  go:mod:tidy:
-    summary: Runs `go mod tidy`
-    internal: true
-    generates:
-      - go.sum
-    sources:
-      - go.mod
-    cmds:
-      - go mod tidy
-
-  # ----------------------- dev ----------------------- #
+      - task: "{{OS}}:package"
 
   run:
     summary: Runs the application
     cmds:
-      - task: run:{{OS}}
-
-  run:windows:
-    cmds:
-      - '{{.BIN_DIR}}\\{{.APP_NAME}}.exe'
-
-  run:linux:
-    cmds:
-      - "{{.BIN_DIR}}/{{.APP_NAME}}"
-
-  dev:frontend:
-    summary: Runs the frontend in development mode
-    dir: frontend
-    deps:
-      - task: install:frontend:deps
-    cmds:
-      - pnpm run dev --port {{.VITE_PORT}}
+      - task: "{{OS}}:run"
 
   dev:
     summary: Runs the application in development mode
     cmds:
-      - wails3 dev -port {{.VITE_PORT}}
-
-  dev:reload:
-    summary: Reloads the application
-    cmds:
-      - task: run
+      - wails3 dev -config ./build/config.yml -port {{.VITE_PORT}}

build/Taskfile.yml

@@ -0,0 +1,86 @@
+version: '3'
+
+tasks:
+  go:mod:tidy:
+    summary: Runs `go mod tidy`
+    internal: true
+    cmds:
+      - go mod tidy
+
+  install:frontend:deps:
+    summary: Install frontend dependencies
+    dir: frontend
+    sources:
+      - package.json
+      - package-lock.json
+    generates:
+      - node_modules
+    preconditions:
+      - sh: pnpm version
+        msg: "Looks like pnpm isn't installed."
+    cmds:
+      - pnpm install
+
+  build:frontend:
+    label: build:frontend (DEV={{.DEV}})
+    summary: Build the frontend project
+    dir: frontend
+    sources:
+      - "**/*"
+    generates:
+      - dist/**/*
+    deps:
+      - task: install:frontend:deps
+      - task: generate:bindings
+        vars:
+          BUILD_FLAGS:
+            ref: .BUILD_FLAGS
+    cmds:
+      - npm run {{.BUILD_COMMAND}} -q
+    env:
+      PRODUCTION: '{{if eq .DEV "true"}}false{{else}}true{{end}}'
+    vars:
+      BUILD_COMMAND: '{{if eq .DEV "true"}}build:dev{{else}}build{{end}}'
+
+  generate:bindings:
+    label: generate:bindings (BUILD_FLAGS={{.BUILD_FLAGS}})
+    summary: Generates bindings for the frontend
+    deps:
+      - task: go:mod:tidy
+    sources:
+      - "**/*.[jt]s"
+      - exclude: frontend/**/*
+      - frontend/bindings/**/*  # Rerun when switching between dev/production mode causes changes in output
+      - "**/*.go"
+      - go.mod
+      - go.sum
+    generates:
+      - frontend/bindings/**/*
+    cmds:
+      - wails3 generate bindings -f '{{.BUILD_FLAGS}}' -clean=true
+
+  generate:icons:
+    summary: Generates Windows `.ico` and Mac `.icns` from an image; on macOS, `-iconcomposerinput appicon.icon -macassetdir darwin` also produces `Assets.car` from a `.icon` file (skipped on other platforms).
+    dir: build
+    sources:
+      - "appicon.png"
+      - "appicon.icon"
+    generates:
+      - "darwin/icons.icns"
+      - "windows/icon.ico"
+    cmds:
+      - wails3 generate icons -input appicon.png -macfilename darwin/icons.icns -windowsfilename windows/icon.ico -iconcomposerinput appicon.icon -macassetdir darwin
+
+  dev:frontend:
+    summary: Runs the frontend in development mode
+    dir: frontend
+    deps:
+      - task: install:frontend:deps
+    cmds:
+      - npm run dev -- --port {{.VITE_PORT}} --strictPort
+
+  update:build-assets:
+    summary: Updates the build assets
+    dir: build
+    cmds:
+      - wails3 update build-assets -name "{{.APP_NAME}}" -binaryname "{{.APP_NAME}}" -config config.yml -dir .

build/config.yml

@@ -1,5 +1,15 @@
 version: "3"
 
+# This information is used to generate the build assets.
+info:
+  companyName: "RLBot" # The name of the company
+  productName: "RLBotGUI" # The name of the application
+  productIdentifier: "org.rlbot.gui" # The unique product identifier
+  description: "A GUI for RLBot v5" # The application description
+  copyright: "(c) 2026, RLBot Contributors" # Copyright text
+  # comments: "Some Product Comments" # Comments
+  # version: "0.0.1" # The application version
+
 dev_mode:
     root_path: .
     log_level: warn
@@ -16,17 +26,13 @@ dev_mode:
             - .gitkeep
         watched_extension:
             - "*.go"
+            # - "*.js" # Watch for changes to JS/TS files included using the //wails:include directive.
+            # - "*.ts" # The frontend directory will be excluded entirely by the setting above.
         git_ignore: true
     executes:
-        - cmd: wails3 task build
-          type: once
-        - cmd: wails3 task install:frontend:deps
-          type: once
-        - cmd: wails3 task dev:frontend
-          type: background
-        - cmd: go mod tidy
-          type: blocking
-        - cmd: wails3 task build:go
+        - cmd: wails3 build DEV=true
           type: blocking
+        - cmd: wails3 task common:dev:frontend
+          type: background
         - cmd: wails3 task run
           type: primary