diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 43b5ee5..25f7523 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: CI on: [push, pull_request] env: - cache-version: v11 + cache-version: v12 jobs: @@ -14,7 +14,7 @@ jobs: test-and-build-linux: strategy: matrix: - go-version: [1.18.x] + go-version: [1.20.x] platform: [ubuntu-20.04] qtversion: [5.15.6] runs-on: ${{ matrix.platform }} @@ -130,7 +130,7 @@ jobs: test-and-build-macos-11: strategy: matrix: - go-version: [1.18.x] + go-version: [1.20.x] platform: [macos-11] qtversion: [5.15.2] runs-on: ${{ matrix.platform }} @@ -206,7 +206,7 @@ jobs: test-windows-mingw: strategy: matrix: - go-version: [1.18.10] + go-version: [1.20.5] platform: [windows-latest] runs-on: ${{ matrix.platform }} env: @@ -251,22 +251,22 @@ jobs: run: | export PATH=/c/hostedtoolcache/windows/go/${{ matrix.go-version }}/x64/bin/:$PATH cd /d/a/goneovim/goneovim/src/github.com/${{ github.repository }} - go get -v github.com/therecipe/qt - go get github.com/therecipe/qt/internal/cmd@v0.0.0-20200904063919-c0c124a5770d - go get github.com/therecipe/qt/internal/binding/files/docs/5.12.0 - go get github.com/therecipe/qt/internal/binding/files/docs/5.13.0 - go get github.com/therecipe/qt/internal/cmd/moc@v0.0.0-20200904063919-c0c124a5770d - go install -v -tags=no_env github.com/therecipe/qt/cmd/... + go get -v github.com/akiyosi/qt + go get github.com/akiyosi/qt/internal/cmd@v0.0.0-20230718095223-7e4e923f23fa + go get github.com/akiyosi/qt/internal/binding/files/docs/5.12.0 + go get github.com/akiyosi/qt/internal/binding/files/docs/5.13.0 + go get github.com/akiyosi/qt/internal/cmd/moc@v0.0.0-20230718095223-7e4e923f23fa + go install -v -tags=no_env github.com/akiyosi/qt/cmd/... go mod vendor - git clone https://github.com/therecipe/env_windows_amd64_513.git vendor/github.com/therecipe/env_windows_amd64_513 + git clone https://github.com/akiyosi/env_windows_amd64_513.git vendor/github.com/akiyosi/env_windows_amd64_513 - uses: actions/cache@v2 id: cache-qt-bindings-windows-test with: path: | - ${{ github.workspace }}\src\github.com\${{ github.repository }}\vendor\github.com\therecipe\qt\* - !${{ github.workspace }}\src\github.com\${{ github.repository }}\vendor\github.com\therecipe\qt\.git - key: test-qtbindings-windows-test-${{ env.cache-version }} + ${{ github.workspace }}\src\github.com\${{ github.repository }}\vendor\github.com\akiyosi\qt\* + !${{ github.workspace }}\src\github.com\${{ github.repository }}\vendor\github.com\akiyosi\qt\.git + key: cache-qtbindings-windows-test-${{ env.cache-version }} - name: Generate Qt bindings if: ${{ steps.cache-qt-bindings-windows-test.outputs.cache-hit != 'true' }} @@ -296,7 +296,7 @@ jobs: build-windows-mingw: strategy: matrix: - go-version: [1.18.10] + go-version: [1.20.5] platform: [windows-latest] runs-on: ${{ matrix.platform }} env: @@ -347,7 +347,7 @@ jobs: with: fetch-depth: 0 path: ${{ github.workspace }}\${{ github.repository }} - + - name: Copy checkout repogitory shell: msys2 {0} run: | @@ -355,22 +355,40 @@ jobs: ls -l /d/a/goneovim/goneovim/${{ github.repository }} cp -pR /d/a/goneovim/goneovim/${{ github.repository }}/* /c/${{ github.repository }}/ cp -pR /d/a/goneovim/goneovim/${{ github.repository }}/.* /c/${{ github.repository }}/ + mkdir -p /c/src/github.com/${{ github.repository }} + cp -pR /d/a/goneovim/goneovim/${{ github.repository }}/* /c/src/github.com/${{ github.repository }}/ ls -l /c/${{ github.repository }} + ls -l /c/src/github.com/${{ github.repository }} - name: Get Qt binding for Go shell: msys2 {0} run: | export PATH=/c/hostedtoolcache/windows/go/${{ matrix.go-version }}/x64/bin/:$PATH cd /c/${{ github.repository }} - go get -v github.com/therecipe/qt - go get github.com/therecipe/qt/internal/cmd@v0.0.0-20200904063919-c0c124a5770d - go get github.com/therecipe/qt/internal/binding/files/docs/5.12.0 - go get github.com/therecipe/qt/internal/binding/files/docs/5.13.0 - go get github.com/therecipe/qt/internal/cmd/moc@v0.0.0-20200904063919-c0c124a5770d - go install -v -tags=no_env github.com/therecipe/qt/cmd/... + go get -v github.com/akiyosi/qt + go get github.com/akiyosi/qt/internal/cmd@v0.0.0-20230718095223-7e4e923f23fa + go get github.com/akiyosi/qt/internal/binding/files/docs/5.12.0 + go get github.com/akiyosi/qt/internal/binding/files/docs/5.13.0 + go get github.com/akiyosi/qt/internal/cmd/moc@v0.0.0-20230718095223-7e4e923f23fa + go install -v -tags=no_env github.com/akiyosi/qt/cmd/... go mod vendor - git clone https://github.com/therecipe/env_windows_amd64_513.git vendor/github.com/therecipe/env_windows_amd64_513 + git clone https://github.com/akiyosi/env_windows_amd64_513.git vendor/github.com/akiyosi/env_windows_amd64_513 + - uses: actions/cache@v2 + id: cache-qt-bindings-windows-build + with: + path: | + /c/${{ github.repository }}\vendor\github.com\akiyosi\qt\* + !/c/${{ github.repository }}\vendor\github.com\akiyosi\qt\.git + key: cache-qtbindings-windows-build-${{ env.cache-version }} + + - name: Generate Qt bindings + if: ${{ steps.cache-qt-bindings-windows-build.outputs.cache-hit != 'true' }} + shell: msys2 {0} + run: | + export PATH=/c/hostedtoolcache/windows/go/${{ matrix.go-version }}/x64/bin/:$PATH + cd /c/${{ github.repository }} + $(go env GOPATH)/bin/qtsetup -test=false - name: Get dependencies shell: msys2 {0} @@ -379,7 +397,7 @@ jobs: cd /c/${{ github.repository }} make deps - ### https://github.com/therecipe/qt/issues/657 + ### https://github.com/akiyosi/qt/issues/657 #- name: Test # shell: msys2 {0} # run: | @@ -503,7 +521,7 @@ jobs: env: GOROOT: ${{ github.workspace }}\go-1.18 run: | - ${{ github.workspace }}\go-1.18\bin\go.exe get -v -tags=no_env github.com/therecipe/qt/cmd/... + ${{ github.workspace }}\go-1.18\bin\go.exe get -v -tags=no_env github.com/akiyosi/qt/cmd/... - name: Install Go 1.13 run: | @@ -558,8 +576,8 @@ jobs: # id: cache-qt-bindings-windows # with: # path: | - # ${{ github.workspace }}\src\github.com\therecipe\qt\* - # !${{ github.workspace }}\src\github.com\therecipe\qt\.git + # ${{ github.workspace }}\src\github.com\akiyosi\qt\* + # !${{ github.workspace }}\src\github.com\akiyosi\qt\.git # key: ${{ matrix.qtversion }}-qtbindings-windows-${{ env.cache-version }} - name: Generate Qt bindings @@ -571,15 +589,15 @@ jobs: ${{ github.workspace }}\bin\qtsetup.exe prep windows ${{ github.workspace }}\bin\qtsetup.exe check windows ${{ github.workspace }}\bin\qtsetup.exe generate windows - sed -i '9,14d' ${{ github.workspace }}\src\github.com\therecipe\qt\core\core.cpp - sed -i '661,666d' ${{ github.workspace }}\src\github.com\therecipe\qt\internal\binding\templater\template_cpp.go + sed -i '9,14d' ${{ github.workspace }}\src\github.com\akiyosi\qt\core\core.cpp + sed -i '661,666d' ${{ github.workspace }}\src\github.com\akiyosi\qt\internal\binding\templater\template_cpp.go ${{ github.workspace }}\bin\qtsetup.exe install windows - name: Get dependencies run: | go get -v -d github.com/${{ github.repository }}/... - cd ${{ github.workspace }}\src\github.com\${{ github.repository }}\cmd\goneovim - ${{ github.workspace }}\bin\qtmoc.exe + cd ${{ github.workspace }}\src\github.com\${{ github.repository }} + ${{ github.workspace }}\bin\qtmoc.exe desktop ./cmd/goneovim # - name: Convert to compatible sources on Qt5.12 # if: ${{ matrix.qtversion == '5.12.6' }} @@ -625,8 +643,9 @@ jobs: env: QT_API: 5.13.0 run: | - cd ${{ github.workspace }}\src\github.com\${{ github.repository }}\cmd\goneovim - ${{ github.workspace }}\bin\qtdeploy -ldflags "-X github.com/akiyosi/goneovim/editor.Version=${{ steps.version-windows.outputs.GONEOVIM_VERSION }}" build desktop + cd ${{ github.workspace }}\src\github.com\${{ github.repository }} + go generate + ${{ github.workspace }}\bin\qtdeploy build desktop ./cmd/goneovim Copy-Item -Force -Recurse -Path ../../runtime -Destination ./deploy/windows/ - name: Upload for windows diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3a409d7..9fbfe7e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,7 +33,7 @@ jobs: needs: [check-new-commit] strategy: matrix: - go-version: [1.18.x] + go-version: [1.20.x] platform: [ubuntu-20.04] qtversion: [5.15.6] runs-on: ${{ matrix.platform }} @@ -103,7 +103,7 @@ jobs: - name: Get Qt binding for Go run: | - go get -v github.com/therecipe/qt/cmd/... + go get -v github.com/akiyosi/qt/cmd/... - name: Checkout code uses: actions/checkout@v2 @@ -120,7 +120,7 @@ jobs: - uses: actions/cache@v2 id: cache-qt-bindings-linux with: - path: ${{ github.workspace }}/src/github.com/therecipe + path: ${{ github.workspace }}/src/github.com/akiyosi key: ${{ matrix.qtversion }}-qtbindings-linux-${{ env.cache-version }} - name: Generate Qt bindings @@ -143,8 +143,9 @@ jobs: - name: Build run: | - cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/cmd/goneovim - $(go env GOPATH)/bin/qtdeploy -ldflags "-X github.com/akiyosi/goneovim/editor.Version=${{ steps.version-linux.outputs.GONEOVIM_VERSION }}" build desktop + cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/ + go generate + $(go env GOPATH)/bin/qtdeploy build desktop ./cmd/goneovim cp -pR ../../runtime ./deploy/linux/ - if: github.event_name == 'workflow_dispatch' @@ -170,7 +171,7 @@ jobs: needs: [check-new-commit] strategy: matrix: - go-version: [1.18.x] + go-version: [1.20.x] platform: [windows-latest] qtversion: [5.14.1] runs-on: ${{ matrix.platform }} @@ -198,7 +199,7 @@ jobs: continue-on-error: true run: | curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/go1.18.5.windows-amd64.zip - expand-archive -path go1.18.5.windows-amd64.zip -destinationpath . + expand-archive -path go1.20.6.windows-amd64.zip -destinationpath . Move-Item -Path go -Destination C:\go-root - name: Setup MSYS2 and install Qt5 @@ -224,7 +225,7 @@ jobs: - name: Get Qt binding for Go run: | - C:\go-root\bin\go.exe get -v -tags=no_env github.com/therecipe/qt/cmd/... + C:\go-root\bin\go.exe get -v -tags=no_env github.com/akiyosi/qt/cmd/... - name: Checkout code uses: actions/checkout@v2 @@ -252,8 +253,8 @@ jobs: id: cache-qt-bindings-windows with: path: | - C:\src\github.com\therecipe\qt\* - !C:\src\github.com\therecipe\qt\.git + C:\src\github.com\akiyosi\qt\* + !C:\src\github.com\akiyosi\qt\.git key: ${{ matrix.qtversion }}-qtbindings-windows-${{ env.cache-version }} - name: Generate Qt bindings @@ -275,15 +276,16 @@ jobs: run: | export PATH=$PATH:/c/bin:/c/go-root/bin:/d/a/_temp/msys64/usr/bin cd /c/src/github.com/akiyosi/goneovim/ - cd ./cmd/goneovim - /c/bin/qtmoc + cd + /c/bin/qtmoc desktop ./cmd/goneovim - name: Build for windows shell: msys2 {0} run: | export PATH=$PATH:/c/bin:/c/go-root/bin:/d/a/_temp/msys64/usr/bin - cd /c/src/github.com/akiyosi/goneovim/cmd/goneovim - /c/bin/qtdeploy -ldflags "-X github.com/akiyosi/goneovim/editor.Version=${{ steps.version-windows.outputs.GONEOVIM_VERSION }}" build desktop + cd /c/src/github.com/akiyosi/goneovim/ + go generate + /c/bin/qtdeploy build desktop ./cmd/goneovim cp -pR ../../runtime ./deploy/windows/ - if: github.event_name == 'workflow_dispatch' @@ -310,7 +312,7 @@ jobs: needs: [check-new-commit] strategy: matrix: - go-version: [1.18.x] + go-version: [1.20.x] platform: [macos-11] qtversion: [5.15.2] runs-on: ${{ matrix.platform }} @@ -343,7 +345,7 @@ jobs: - name: Get Qt binding for Go run: | - go get -v github.com/therecipe/qt/cmd/... + go get -v github.com/akiyosi/qt/cmd/... - name: Checkout code uses: actions/checkout@v2 @@ -365,7 +367,7 @@ jobs: # - uses: actions/cache@v2 # id: cache-qt-bindings-macos-11 # with: - # path: ${{ github.workspace }}/src/github.com/therecipe + # path: ${{ github.workspace }}/src/github.com/akiyosi # key: ${{ matrix.qtversion }}-qtbindings-macos-11-${{ env.cache-version }} #if: ${{ steps.cache-qt-bindings-macos-11.outputs.cache-hit != 'true' }} @@ -377,13 +379,14 @@ jobs: - name: Get dependencies run: | go get -v -t -d github.com/${{ github.repository }}/... - cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/cmd/goneovim - $(go env GOPATH)/bin/qtmoc + cd ${{ github.workspace }}/src/github.com/${{ github.repository }} + $(go env GOPATH)/bin/qtmoc desktop ./cmd/goneovim - name: Build run: | - cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/cmd/goneovim - $(go env GOPATH)/bin/qtdeploy -ldflags "-X github.com/akiyosi/goneovim/editor.Version=${{ steps.version-macos-11.outputs.GONEOVIM_VERSION }}" build desktop + cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/ + go generate + $(go env GOPATH)/bin/qtdeploy build desktop ./cmd/goneovim cp -pR ../../runtime ./deploy/darwin/goneovim.app/Contents/Resources/ cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/ /usr/libexec/PlistBuddy -c "Add :CFBundleVersion string ${{ steps.version-macos-11.outputs.GONEOVIM_VERSION_HASH }}" "./cmd/goneovim/deploy/darwin/goneovim.app/Contents/Info.plist" diff --git a/.gitignore b/.gitignore index b9df6a3..87c3bf9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ debug.log tags* moc* +editor/version.txt cmd/goneovim/goneovim cmd/goneovim/debug cmd/goneovim/deploy/* diff --git a/Makefile b/Makefile index a4d447e..b8c15ca 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,9 @@ VERSION := $(shell git describe --tags) VERSION_HASH := $(shell git rev-parse HEAD) # deployment directory -DEPLOYMENT_WINDOWS:=deploy/windows -DEPLOYMENT_DARWIN:=deploy/darwin -DEPLOYMENT_LINUX:=deploy/linux +DEPLOYMENT_WINDOWS:=cmd/goneovim/deploy/windows +DEPLOYMENT_DARWIN:=cmd/goneovim/deploy/darwin +DEPLOYMENT_LINUX:=cmd/goneovim/deploy/linux # runtime directory ifeq ($(OS),Windows_NT) @@ -37,9 +37,9 @@ endif app: ## Build goneovim @test -f ./editor/moc.go & $(GOQTMOC) desktop ./cmd/goneovim && \ - cd cmd/goneovim && \ - $(GOQTDEPLOY) -ldflags "-X github.com/akiyosi/goneovim/editor.Version=$(VERSION)" build desktop && \ - cp -pR ../../runtime $(RUNTIME_DIR) + go generate && \ + $(GOQTDEPLOY) build desktop ./cmd/goneovim && \ + cp -pR runtime $(RUNTIME_DIR) ifeq ($(OSNAME),Darwin) @/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $(VERSION_HASH)" "./cmd/goneovim/deploy/darwin/goneovim.app/Contents/Info.plist" && \ /usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string $(VERSION)" "./cmd/goneovim/deploy/darwin/goneovim.app/Contents/Info.plist" && \ @@ -51,34 +51,34 @@ endif qt_bindings: ## Setup Qt bindings for Go. ifeq ($(OSNAME),Darwin) - @go get -v github.com/therecipe/qt && \ - go get github.com/therecipe/qt/internal/cmd@v0.0.0-20200904063919-c0c124a5770d && \ - go get github.com/therecipe/qt/internal/binding/files/docs/5.12.0 && \ - go get github.com/therecipe/qt/internal/binding/files/docs/5.13.0 && \ - go get github.com/therecipe/qt/internal/cmd/moc@v0.0.0-20200904063919-c0c124a5770d && \ - go install -v -tags=no_env github.com/therecipe/qt/cmd/... && \ + @go get -v github.com/akiyosi/qt && \ + go get github.com/akiyosi/qt/internal/cmd@v0.0.0-20230718095223-7e4e923f23fa && \ + go get github.com/akiyosi/qt/internal/binding/files/docs/5.12.0 && \ + go get github.com/akiyosi/qt/internal/binding/files/docs/5.13.0 && \ + go get github.com/akiyosi/qt/internal/cmd/moc@v0.0.0-20230718095223-7e4e923f23fa && \ + go install -v -tags=no_env github.com/akiyosi/qt/cmd/... && \ go mod vendor && \ - git clone https://github.com/therecipe/env_darwin_amd64_513.git vendor/github.com/therecipe/env_darwin_amd64_513 + git clone https://github.com/akiyosi/env_darwin_amd64_513.git vendor/github.com/akiyosi/env_darwin_amd64_513 $(GOQTSETUP) -test=false else ifeq ($(OSNAME),Linux) - @go get github.com/therecipe/qt/internal/cmd@v0.0.0-20200904063919-c0c124a5770d && \ - go get github.com/therecipe/qt/internal/binding/files/docs/5.12.0 && \ - go get github.com/therecipe/qt/internal/binding/files/docs/5.13.0 && \ - go get github.com/therecipe/qt/internal/cmd/moc@v0.0.0-20200904063919-c0c124a5770d && \ - go get -v github.com/therecipe/qt && \ - go install -v -tags=no_env github.com/therecipe/qt/cmd/... && \ + @go get github.com/akiyosi/qt/internal/cmd@v0.0.0-20230718095223-7e4e923f23fa && \ + go get github.com/akiyosi/qt/internal/binding/files/docs/5.12.0 && \ + go get github.com/akiyosi/qt/internal/binding/files/docs/5.13.0 && \ + go get github.com/akiyosi/qt/internal/cmd/moc@v0.0.0-20230718095223-7e4e923f23fa && \ + go get -v github.com/akiyosi/qt && \ + go install -v -tags=no_env github.com/akiyosi/qt/cmd/... && \ go mod vendor && \ - git clone https://github.com/therecipe/env_linux_amd64_513.git vendor/github.com/therecipe/env_linux_amd64_513 + git clone https://github.com/akiyosi/env_linux_amd64_513.git vendor/github.com/akiyosi/env_linux_amd64_513 $(GOQTSETUP) -test=false else ifeq ($(OSNAME),Windows) - @go.exe get -v github.com/therecipe/qt && \ - go.exe get github.com/therecipe/qt/internal/cmd@v0.0.0-20200904063919-c0c124a5770d && \ - go.exe get github.com/therecipe/qt/internal/binding/files/docs/5.12.0 && \ - go.exe get github.com/therecipe/qt/internal/binding/files/docs/5.13.0 && \ - go.exe get github.com/therecipe/qt/internal/cmd/moc@v0.0.0-20200904063919-c0c124a5770d && \ - go.exe install -v -tags=no_env github.com/therecipe/qt/cmd/... && \ + @go.exe get -v github.com/akiyosi/qt && \ + go.exe get github.com/akiyosi/qt/internal/cmd@v0.0.0-20230718095223-7e4e923f23fa && \ + go.exe get github.com/akiyosi/qt/internal/binding/files/docs/5.12.0 && \ + go.exe get github.com/akiyosi/qt/internal/binding/files/docs/5.13.0 && \ + go.exe get github.com/akiyosi/qt/internal/cmd/moc@v0.0.0-20230718095223-7e4e923f23fa && \ + go.exe install -v -tags=no_env github.com/akiyosi/qt/cmd/... && \ go.exe mod vendor && \ - git.exe clone https://github.com/therecipe/env_windows_amd64_513.git vendor/github.com/therecipe/env_windows_amd64_513 + git.exe clone https://github.com/akiyosi/env_windows_amd64_513.git vendor/github.com/akiyosi/env_windows_amd64_513 $(GOQTSETUP) -test=false endif @@ -87,7 +87,7 @@ deps: ## Get dependent libraries. @$(GOQTMOC) desktop ./cmd/goneovim test: ## Test goneovim - @go test ./editor + @go generate && go test ./editor clean: ## Delete pre-built application binaries and Moc files. @rm -fr cmd/goneovim/deploy/* diff --git a/cmd/goneovim/main.go b/cmd/goneovim/main.go index b4b5bd0..a89080a 100644 --- a/cmd/goneovim/main.go +++ b/cmd/goneovim/main.go @@ -9,9 +9,9 @@ import ( // "github.com/felixge/fgprof" "github.com/akiyosi/goneovim/editor" + "github.com/akiyosi/qt/core" "github.com/jessevdk/go-flags" "github.com/mattn/go-isatty" - "github.com/therecipe/qt/core" ) func main() { diff --git a/editor/cursor.go b/editor/cursor.go index 70c3bb7..3bc8158 100644 --- a/editor/cursor.go +++ b/editor/cursor.go @@ -4,9 +4,9 @@ import ( "math" "github.com/akiyosi/goneovim/util" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/widgets" ) // Cursor is diff --git a/editor/editor.go b/editor/editor.go index d795354..6cd45d1 100644 --- a/editor/editor.go +++ b/editor/editor.go @@ -17,15 +17,13 @@ import ( "github.com/akiyosi/goneovim/util" frameless "github.com/akiyosi/goqtframelesswindow" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/widgets" homedir "github.com/mitchellh/go-homedir" "github.com/neovim/go-client/nvim" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" ) -var Version string - var editor *Editor const ( diff --git a/editor/editor_linux_test.go b/editor/editor_linux_test.go index 7037b6c..947293b 100644 --- a/editor/editor_linux_test.go +++ b/editor/editor_linux_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package editor @@ -6,8 +7,8 @@ import ( "fmt" "testing" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" ) func TestLinuxEditor_convertKey(t *testing.T) { diff --git a/editor/editor_mac_test.go b/editor/editor_mac_test.go index 7ca94e4..8ad3052 100644 --- a/editor/editor_mac_test.go +++ b/editor/editor_mac_test.go @@ -1,3 +1,4 @@ +//go:build darwin // +build darwin package editor @@ -6,8 +7,8 @@ import ( "fmt" "testing" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" ) func TestDarwinEditor_convertKey(t *testing.T) { diff --git a/editor/editor_test.go b/editor/editor_test.go index eb3bb92..a56d02e 100644 --- a/editor/editor_test.go +++ b/editor/editor_test.go @@ -3,8 +3,8 @@ package editor import ( "testing" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" ) func TestEditor_convertKey(t *testing.T) { diff --git a/editor/editor_win_test.go b/editor/editor_win_test.go index 4096184..2dcf460 100644 --- a/editor/editor_win_test.go +++ b/editor/editor_win_test.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package editor @@ -6,8 +7,8 @@ import ( "fmt" "testing" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" ) func TestWindowsEditor_convertKey(t *testing.T) { diff --git a/editor/font.go b/editor/font.go index 9f77336..818ab8d 100644 --- a/editor/font.go +++ b/editor/font.go @@ -4,8 +4,8 @@ import ( "fmt" "math" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/widgets" ) // Font is diff --git a/editor/handleime.go b/editor/handleime.go index 074db18..b62b9ca 100644 --- a/editor/handleime.go +++ b/editor/handleime.go @@ -6,7 +6,7 @@ import "C" import ( "runtime" - "github.com/therecipe/qt/gui" + "github.com/akiyosi/qt/gui" ) func selectionPosInPreeditStr(event *gui.QInputMethodEvent) (cursorPos, selectionLength int) { diff --git a/editor/imetooltip.go b/editor/imetooltip.go index 7f3004e..d0b8d67 100644 --- a/editor/imetooltip.go +++ b/editor/imetooltip.go @@ -4,8 +4,8 @@ import ( "fmt" "runtime" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" ) // IMETooltip is the tooltip for Input Method Editor diff --git a/editor/message.go b/editor/message.go index 942f163..060c49b 100644 --- a/editor/message.go +++ b/editor/message.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/svg" - "github.com/therecipe/qt/widgets" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/svg" + "github.com/akiyosi/qt/widgets" "github.com/akiyosi/goneovim/util" ) diff --git a/editor/minimap.go b/editor/minimap.go index ed99dfc..cda6061 100644 --- a/editor/minimap.go +++ b/editor/minimap.go @@ -13,10 +13,10 @@ import ( "time" "github.com/akiyosi/goneovim/util" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/widgets" "github.com/neovim/go-client/nvim" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" ) type miniMapSignal struct { diff --git a/editor/notification.go b/editor/notification.go index b9b1f13..f569e4f 100644 --- a/editor/notification.go +++ b/editor/notification.go @@ -6,10 +6,10 @@ import ( "unicode/utf8" "github.com/akiyosi/goneovim/util" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/svg" - "github.com/therecipe/qt/widgets" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/svg" + "github.com/akiyosi/qt/widgets" ) // NotifyLevel is notification type like "warn", "error" diff --git a/editor/nvim.go b/editor/nvim.go index d375ff6..4574e27 100644 --- a/editor/nvim.go +++ b/editor/nvim.go @@ -13,10 +13,10 @@ import ( "time" "github.com/akiyosi/goneovim/util" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" "github.com/atotto/clipboard" "github.com/neovim/go-client/nvim" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" ) func newNvim(cols, rows int, ctx context.Context) (signal *neovimSignal, redrawUpdates chan [][]interface{}, guiUpdates chan []interface{}, nvimCh chan *nvim.Nvim, uiRemoteAttachedCh chan bool, errCh chan error) { diff --git a/editor/palette.go b/editor/palette.go index 7ca4014..6209dae 100644 --- a/editor/palette.go +++ b/editor/palette.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/akiyosi/goneovim/util" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/svg" - "github.com/therecipe/qt/widgets" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/svg" + "github.com/akiyosi/qt/widgets" ) // Palette is the popup for cmdline diff --git a/editor/popupmenu.go b/editor/popupmenu.go index 4aaa0f6..64cbd43 100644 --- a/editor/popupmenu.go +++ b/editor/popupmenu.go @@ -7,9 +7,9 @@ import ( "sort" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/svg" - "github.com/therecipe/qt/widgets" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/svg" + "github.com/akiyosi/qt/widgets" "github.com/akiyosi/goneovim/util" ) diff --git a/editor/rgba.go b/editor/rgba.go index 5d6682c..0b75c29 100644 --- a/editor/rgba.go +++ b/editor/rgba.go @@ -4,7 +4,7 @@ import ( "fmt" "math" - "github.com/therecipe/qt/gui" + "github.com/akiyosi/qt/gui" ) // RGBA is diff --git a/editor/screen.go b/editor/screen.go index 116016c..658da5d 100644 --- a/editor/screen.go +++ b/editor/screen.go @@ -11,11 +11,11 @@ import ( "time" "github.com/akiyosi/goneovim/util" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/widgets" "github.com/bluele/gcache" "github.com/neovim/go-client/nvim" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" ) var globalOrder int diff --git a/editor/screen_linux.go b/editor/screen_linux.go index d1cd944..c069a28 100644 --- a/editor/screen_linux.go +++ b/editor/screen_linux.go @@ -1,7 +1,7 @@ package editor import ( - "github.com/therecipe/qt/core" + "github.com/akiyosi/qt/core" ) func createExternalWin() *ExternalWin { diff --git a/editor/screen_windows.go b/editor/screen_windows.go index d1cd944..c069a28 100644 --- a/editor/screen_windows.go +++ b/editor/screen_windows.go @@ -1,7 +1,7 @@ package editor import ( - "github.com/therecipe/qt/core" + "github.com/akiyosi/qt/core" ) func createExternalWin() *ExternalWin { diff --git a/editor/scrollbar.go b/editor/scrollbar.go index a66f4d4..3af03cf 100644 --- a/editor/scrollbar.go +++ b/editor/scrollbar.go @@ -6,9 +6,9 @@ import ( "sync" "github.com/akiyosi/goneovim/util" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/widgets" ) // ScrollBar is diff --git a/editor/tabline.go b/editor/tabline.go index 0142d20..ed91363 100644 --- a/editor/tabline.go +++ b/editor/tabline.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/akiyosi/goneovim/util" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/svg" + "github.com/akiyosi/qt/widgets" shortpath "github.com/akiyosi/short_path" "github.com/neovim/go-client/nvim" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/svg" - "github.com/therecipe/qt/widgets" ) // Tabline of the editor diff --git a/editor/tooltip.go b/editor/tooltip.go index 0fd31dd..29cb174 100644 --- a/editor/tooltip.go +++ b/editor/tooltip.go @@ -3,9 +3,9 @@ package editor import ( "bytes" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/widgets" ) type ColorStr struct { diff --git a/editor/version.go b/editor/version.go new file mode 100644 index 0000000..ab34401 --- /dev/null +++ b/editor/version.go @@ -0,0 +1,8 @@ +package editor + +import ( + _ "embed" +) + +//go:embed version.txt +var Version string diff --git a/editor/window.go b/editor/window.go index 64b5005..a34699a 100644 --- a/editor/window.go +++ b/editor/window.go @@ -14,11 +14,11 @@ import ( "unsafe" "github.com/akiyosi/goneovim/util" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/widgets" "github.com/bluele/gcache" "github.com/neovim/go-client/nvim" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" ) const ( diff --git a/editor/workspace.go b/editor/workspace.go index bcfbe7b..3cfdd3f 100644 --- a/editor/workspace.go +++ b/editor/workspace.go @@ -13,12 +13,12 @@ import ( "github.com/akiyosi/goneovim/filer" "github.com/akiyosi/goneovim/util" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/svg" + "github.com/akiyosi/qt/widgets" shortpath "github.com/akiyosi/short_path" "github.com/neovim/go-client/nvim" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/svg" - "github.com/therecipe/qt/widgets" ) type neovimSignal struct { diff --git a/filer/filer.go b/filer/filer.go index a93e4b3..308b0ce 100644 --- a/filer/filer.go +++ b/filer/filer.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/akiyosi/goneovim/util" + "github.com/akiyosi/qt/widgets" "github.com/neovim/go-client/nvim" - "github.com/therecipe/qt/widgets" ) type Filer struct { diff --git a/go.mod b/go.mod index 746bc3c..0b54545 100644 --- a/go.mod +++ b/go.mod @@ -1,26 +1,27 @@ module github.com/akiyosi/goneovim -go 1.17 +go 1.20 require ( github.com/BurntSushi/toml v1.3.2 - github.com/akiyosi/goqtframelesswindow v0.0.0-20230504150915-a0fc55d27d45 + github.com/akiyosi/goqtframelesswindow v0.0.0-20230716140237-a341d42df3c8 + github.com/akiyosi/qt v0.0.0-20230718095223-7e4e923f23fa github.com/akiyosi/short_path v0.2.1 github.com/atotto/clipboard v0.1.4 github.com/bluele/gcache v0.0.2 github.com/jessevdk/go-flags v1.5.0 github.com/mattn/go-isatty v0.0.19 github.com/mitchellh/go-homedir v1.1.0 - github.com/neovim/go-client v1.2.2-0.20230619231037-d37e022068b3 - github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d + github.com/neovim/go-client v1.2.2-0.20230716041012-dd77a916541b ) require ( + github.com/akiyosi/qt/internal/binding/files/docs/5.12.0 v0.0.0-20230718095223-7e4e923f23fa // indirect + github.com/akiyosi/qt/internal/binding/files/docs/5.13.0 v0.0.0-20230718095223-7e4e923f23fa // indirect github.com/akiyosi/w32 v0.0.0-20221111133244-de73be0c7b36 // indirect github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/sirupsen/logrus v1.4.1 // indirect - github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d // indirect - github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d // indirect golang.org/x/sys v0.6.0 // indirect + golang.org/x/tools v0.0.0-20190420181800-aa740d480789 // indirect ) diff --git a/go.sum b/go.sum index a9aef9a..5c904f8 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,13 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/akiyosi/goqtframelesswindow v0.0.0-20230504150915-a0fc55d27d45 h1:jDnckIngzOhCIQxc6u2K9q/Qfi5sZfhlqSl6f2m5MJM= -github.com/akiyosi/goqtframelesswindow v0.0.0-20230504150915-a0fc55d27d45/go.mod h1:739mXLJTAy19GBfA3Z2gitVRHX5NVqrVqygAMPVB21E= +github.com/akiyosi/goqtframelesswindow v0.0.0-20230716140237-a341d42df3c8 h1:yOqvoxofnHODBxSo9/l030IFNPJ7H/cKyzycHj+LkJQ= +github.com/akiyosi/goqtframelesswindow v0.0.0-20230716140237-a341d42df3c8/go.mod h1:739mXLJTAy19GBfA3Z2gitVRHX5NVqrVqygAMPVB21E= +github.com/akiyosi/qt v0.0.0-20230718095223-7e4e923f23fa h1:/TcUmwcQfCdp/TtrXGTgY4qBe2pnpMrQOMKmuCOrJvc= +github.com/akiyosi/qt v0.0.0-20230718095223-7e4e923f23fa/go.mod h1:/M/wktam+Uyed7ahwhO+8zsEAe3FWZGA8eq5Sh+QePA= +github.com/akiyosi/qt/internal/binding/files/docs/5.12.0 v0.0.0-20230718095223-7e4e923f23fa h1:TfqsKoPqZkeMvE2n6qNLqPb/uyEiMpV73e7MwGZsUPk= +github.com/akiyosi/qt/internal/binding/files/docs/5.12.0 v0.0.0-20230718095223-7e4e923f23fa/go.mod h1:o1Ta8fcOD7ED+UFh1S2sJGmMYyZgY/0Nhqkayiw9EOI= +github.com/akiyosi/qt/internal/binding/files/docs/5.13.0 v0.0.0-20230718095223-7e4e923f23fa h1:1Y/Gr5IZkjmWJ9HElu4XAIrN+b3ss0SSmoA6/kvhP5s= +github.com/akiyosi/qt/internal/binding/files/docs/5.13.0 v0.0.0-20230718095223-7e4e923f23fa/go.mod h1:zr7ZzZXZ4UI9WpxGsiaq0S9OHCjo+H/7vU2Oyi6RRWw= github.com/akiyosi/short_path v0.2.1 h1:1IiEQDNISfLOzs8A4+95vSgAN1Ch2IQY4wUpjZzWU/U= github.com/akiyosi/short_path v0.2.1/go.mod h1:9ZdnJCTktFi81KorFR9Zihrn8pmRD1UIx0HjASMCu1U= github.com/akiyosi/w32 v0.0.0-20221111133244-de73be0c7b36 h1:anLmpiDCKkXZv9D7iYznS3dkYS1BPlaMVGy+65azxj8= @@ -25,8 +31,8 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/neovim/go-client v1.2.1 h1:kl3PgYgbnBfvaIoGYi3ojyXH0ouY6dJY/rYUCssZKqI= github.com/neovim/go-client v1.2.1/go.mod h1:EeqCP3z1vJd70JTaH/KXz9RMZ/nIgEFveX83hYnh/7c= -github.com/neovim/go-client v1.2.2-0.20230619231037-d37e022068b3 h1:VKxu+nf1gEcpQUBShwE6KGLpdNZ50IZeDbUN+j572q0= -github.com/neovim/go-client v1.2.2-0.20230619231037-d37e022068b3/go.mod h1:UBsOERb5epbeQT0nyPTZkmUPTffRYBcHvrXXidr1NQQ= +github.com/neovim/go-client v1.2.2-0.20230716041012-dd77a916541b h1:JDchP8fWykRzJLiq5cUQ47vKkP8UY0I1yzgGDTSpYRI= +github.com/neovim/go-client v1.2.2-0.20230716041012-dd77a916541b/go.mod h1:UBsOERb5epbeQT0nyPTZkmUPTffRYBcHvrXXidr1NQQ= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= @@ -35,12 +41,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d h1:T+d8FnaLSvM/1BdlDXhW4d5dr2F07bAbB+LpgzMxx+o= -github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d/go.mod h1:SUUR2j3aE1z6/g76SdD6NwACEpvCxb3fvG82eKbD6us= -github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d h1:hAZyEG2swPRWjF0kqqdGERXUazYnRJdAk4a58f14z7Y= -github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d/go.mod h1:7m8PDYDEtEVqfjoUQc2UrFqhG0CDmoVJjRlQxexndFc= -github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d h1:AJRoBel/g9cDS+yE8BcN3E+TDD/xNAguG21aoR8DAIE= -github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d/go.mod h1:mH55Ek7AZcdns5KPp99O0bg+78el64YCYWHiQKrOdt4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -53,4 +53,5 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190420181800-aa740d480789 h1:FF0rjo15h51+N6642mf5S3QuplmKo2aCrJUYkHTx85s= golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= diff --git a/goneovim.go b/goneovim.go index 84fe71a..19e0197 100644 --- a/goneovim.go +++ b/goneovim.go @@ -1 +1,3 @@ package goneovim + +//go:generate sh -c "printf %s $(git describe --tags) > editor/version.txt" diff --git a/util/utils.go b/util/utils.go index 3f240ad..5f762ab 100644 --- a/util/utils.go +++ b/util/utils.go @@ -5,9 +5,9 @@ import ( "path/filepath" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/akiyosi/qt/core" + "github.com/akiyosi/qt/gui" + "github.com/akiyosi/qt/widgets" ) // ReflectToInt converts interface{} to int diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..3b004dd --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +v0.6.5-25-g70a241b \ No newline at end of file