Skip to content

feat: remove submodule tableau #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Kybxd wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

feat: remove submodule tableau #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
183c180
feat: remove submodule
Kybxd Aug 21, 2025
ddbbe95
feat: change bat scripts to CRLF
Kybxd Aug 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
path = third_party/_submodules/protobuf
url = https://github.com/protocolbuffers/protobuf
ignore = dirty
[submodule "third_party/_submodules/tableau"]
path = third_party/_submodules/tableau
url = https://github.com/tableauio/tableau
ignore = dirty
6 changes: 5 additions & 1 deletion test/cpp-tableau-loader/gen.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ setlocal enabledelayedexpansion

for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set repoRoot=%%i
cd /d "%repoRoot%"
go mod tidy

set "PROTOC=%repoRoot%\third_party\_submodules\protobuf\cmake\build\protoc.exe"
set "PROTOBUF_PROTO=%repoRoot%\third_party\_submodules\protobuf\src"
set "TABLEAU_PROTO=%repoRoot%\third_party\_submodules\tableau\proto"
set "TABLEAU_GOPATH=github.com/tableauio/tableau"
for /f "delims=" %%G in ('go env GOPATH') do set "GOPATH=%%G"
for /f "tokens=2" %%V in ('findstr /c:"%TABLEAU_GOPATH%" go.mod') do set "VERSION=%%V"
set "TABLEAU_PROTO=%GOPATH%\pkg\mod\%TABLEAU_GOPATH%@%VERSION%\proto"
set "ROOTDIR=%repoRoot%\test\cpp-tableau-loader"
set "PLGUIN_DIR=%repoRoot%\cmd\protoc-gen-cpp-tableau-loader"
set "PROTOCONF_IN=%repoRoot%\test\proto"
Expand Down
5 changes: 4 additions & 1 deletion test/cpp-tableau-loader/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ set -o pipefail
shopt -s globstar

cd "$(git rev-parse --show-toplevel)"
go mod tidy

PROTOC="./third_party/_submodules/protobuf/cmake/build/protoc"
PROTOBUF_PROTO="./third_party/_submodules/protobuf/src"
TABLEAU_PROTO="./third_party/_submodules/tableau/proto"
TABLEAU_GOPATH="github.com/tableauio/tableau"
TABLEAU_PROTO="$(go env GOPATH)/pkg/mod/$TABLEAU_GOPATH@$(grep $TABLEAU_GOPATH go.mod | awk '{print $2}')/proto"
ROOTDIR="./test/cpp-tableau-loader"
PLGUIN_DIR="./cmd/protoc-gen-cpp-tableau-loader"
PROTOCONF_IN="./test/proto"
Expand Down
7 changes: 6 additions & 1 deletion test/go-tableau-loader/gen.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ setlocal enabledelayedexpansion

for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set repoRoot=%%i
cd /d "%repoRoot%"
go mod tidy

set "PROTOC=%repoRoot%\third_party\_submodules\protobuf\cmake\build\protoc.exe"
set "PROTOBUF_PROTO=%repoRoot%\third_party\_submodules\protobuf\src"
set "TABLEAU_PROTO=%repoRoot%\third_party\_submodules\tableau\proto"
set "PROTOBUF_PROTO=%repoRoot%\third_party\_submodules\protobuf\src"
set "TABLEAU_GOPATH=github.com/tableauio/tableau"
for /f "delims=" %%G in ('go env GOPATH') do set "GOPATH=%%G"
for /f "tokens=2" %%V in ('findstr /c:"%TABLEAU_GOPATH%" go.mod') do set "VERSION=%%V"
set "TABLEAU_PROTO=%GOPATH%\pkg\mod\%TABLEAU_GOPATH%@%VERSION%\proto"
set "PLGUIN_DIR=%repoRoot%\cmd\protoc-gen-go-tableau-loader"
set "PROTOCONF_IN=%repoRoot%\test\proto"
set "PROTOCONF_OUT=%repoRoot%\test\go-tableau-loader\protoconf"
Expand Down
5 changes: 4 additions & 1 deletion test/go-tableau-loader/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ set -o pipefail
shopt -s globstar

cd "$(git rev-parse --show-toplevel)"
go mod tidy

PROTOC="./third_party/_submodules/protobuf/cmake/build/protoc"
PROTOBUF_PROTO="./third_party/_submodules/protobuf/src"
TABLEAU_PROTO="./third_party/_submodules/tableau/proto"
TABLEAU_GOPATH="github.com/tableauio/tableau"
TABLEAU_PROTO="$(go env GOPATH)/pkg/mod/$TABLEAU_GOPATH@$(grep $TABLEAU_GOPATH go.mod | awk '{print $2}')/proto"
PLGUIN_DIR="./cmd/protoc-gen-go-tableau-loader"
PROTOCONF_IN="./test/proto"
PROTOCONF_OUT="./test/go-tableau-loader/protoconf"
Expand Down
1 change: 0 additions & 1 deletion third_party/_submodules/tableau
Open in desktop
Submodule tableau deleted from a00850