From 183c180d4755e71458c987c7073ed27f21f8014a Mon Sep 17 00:00:00 2001 From: Kybxd <627940450@qq.com> Date: Thu, 21 Aug 2025 10:34:45 +0800 Subject: [PATCH 1/2] feat: remove submodule --- .gitmodules | 4 -- test/cpp-tableau-loader/gen.bat | 114 +++++++++++++++++--------------- test/cpp-tableau-loader/gen.sh | 5 +- test/go-tableau-loader/gen.bat | 7 +- test/go-tableau-loader/gen.sh | 5 +- third_party/_submodules/tableau | 1 - 6 files changed, 73 insertions(+), 63 deletions(-) delete mode 160000 third_party/_submodules/tableau diff --git a/.gitmodules b/.gitmodules index d0be858b..5f237432 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/test/cpp-tableau-loader/gen.bat b/test/cpp-tableau-loader/gen.bat index c1a4ac96..60e8b626 100644 --- a/test/cpp-tableau-loader/gen.bat +++ b/test/cpp-tableau-loader/gen.bat @@ -1,55 +1,59 @@ -@echo off -setlocal -setlocal enabledelayedexpansion - -for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set repoRoot=%%i -cd /d "%repoRoot%" - -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 "ROOTDIR=%repoRoot%\test\cpp-tableau-loader" -set "PLGUIN_DIR=%repoRoot%\cmd\protoc-gen-cpp-tableau-loader" -set "PROTOCONF_IN=%repoRoot%\test\proto" -set "PROTOCONF_OUT=%ROOTDIR%\src\protoconf" - -REM remove old generated files -rmdir /s /q "%PROTOCONF_OUT%" 2>nul -mkdir "%PROTOCONF_OUT%" - -REM build protoc plugin of loader -pushd "%PLGUIN_DIR%" -go build -popd - -set "PATH=%PATH%;%PLGUIN_DIR%" - -set protoFiles= -pushd "%PROTOCONF_IN%" -for /R %%f in (*.proto) do ( - set protoFiles=!protoFiles! "%%f" -) -popd -"%PROTOC%" ^ ---cpp-tableau-loader_out="%PROTOCONF_OUT%" ^ ---cpp-tableau-loader_opt=paths=source_relative,shards=2 ^ ---cpp_out="%PROTOCONF_OUT%" ^ ---proto_path="%PROTOBUF_PROTO%" ^ ---proto_path="%TABLEAU_PROTO%" ^ ---proto_path="%PROTOCONF_IN%" ^ -!protoFiles! - -set "TABLEAU_IN=%TABLEAU_PROTO%\tableau\protobuf" -set "TABLEAU_OUT=%ROOTDIR%\src" -REM remove old generated files -if exist "%TABLEAU_OUT%\tableau" rmdir /s /q "%TABLEAU_OUT%\tableau" -mkdir "%TABLEAU_OUT%\tableau" - -"%PROTOC%" ^ ---cpp_out="%TABLEAU_OUT%" ^ ---proto_path="%PROTOBUF_PROTO%" ^ ---proto_path="%TABLEAU_PROTO%" ^ -"%TABLEAU_IN%\tableau.proto" "%TABLEAU_IN%\wellknown.proto" - -endlocal -endlocal +@echo off +setlocal +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_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" +set "PROTOCONF_OUT=%ROOTDIR%\src\protoconf" + +REM remove old generated files +rmdir /s /q "%PROTOCONF_OUT%" 2>nul +mkdir "%PROTOCONF_OUT%" + +REM build protoc plugin of loader +pushd "%PLGUIN_DIR%" +go build +popd + +set "PATH=%PATH%;%PLGUIN_DIR%" + +set protoFiles= +pushd "%PROTOCONF_IN%" +for /R %%f in (*.proto) do ( + set protoFiles=!protoFiles! "%%f" +) +popd +"%PROTOC%" ^ +--cpp-tableau-loader_out="%PROTOCONF_OUT%" ^ +--cpp-tableau-loader_opt=paths=source_relative,shards=2 ^ +--cpp_out="%PROTOCONF_OUT%" ^ +--proto_path="%PROTOBUF_PROTO%" ^ +--proto_path="%TABLEAU_PROTO%" ^ +--proto_path="%PROTOCONF_IN%" ^ +!protoFiles! + +set "TABLEAU_IN=%TABLEAU_PROTO%\tableau\protobuf" +set "TABLEAU_OUT=%ROOTDIR%\src" +REM remove old generated files +if exist "%TABLEAU_OUT%\tableau" rmdir /s /q "%TABLEAU_OUT%\tableau" +mkdir "%TABLEAU_OUT%\tableau" + +"%PROTOC%" ^ +--cpp_out="%TABLEAU_OUT%" ^ +--proto_path="%PROTOBUF_PROTO%" ^ +--proto_path="%TABLEAU_PROTO%" ^ +"%TABLEAU_IN%\tableau.proto" "%TABLEAU_IN%\wellknown.proto" + +endlocal +endlocal diff --git a/test/cpp-tableau-loader/gen.sh b/test/cpp-tableau-loader/gen.sh index 32756cb3..89527c69 100755 --- a/test/cpp-tableau-loader/gen.sh +++ b/test/cpp-tableau-loader/gen.sh @@ -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" diff --git a/test/go-tableau-loader/gen.bat b/test/go-tableau-loader/gen.bat index 7a9c2fb3..eefcfa16 100644 --- a/test/go-tableau-loader/gen.bat +++ b/test/go-tableau-loader/gen.bat @@ -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" diff --git a/test/go-tableau-loader/gen.sh b/test/go-tableau-loader/gen.sh index e547ff5e..70fe84a8 100755 --- a/test/go-tableau-loader/gen.sh +++ b/test/go-tableau-loader/gen.sh @@ -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" diff --git a/third_party/_submodules/tableau b/third_party/_submodules/tableau deleted file mode 160000 index a00850ec..00000000 --- a/third_party/_submodules/tableau +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a00850ecc9b066a9691353ed7fe23d01f67be75e From ddbbe95645c5a0849b4cd14042609b651a590028 Mon Sep 17 00:00:00 2001 From: Kybxd <627940450@qq.com> Date: Sat, 23 Aug 2025 11:21:53 +0800 Subject: [PATCH 2/2] feat: change bat scripts to CRLF --- test/cpp-tableau-loader/gen.bat | 118 ++++++++++++++++---------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/test/cpp-tableau-loader/gen.bat b/test/cpp-tableau-loader/gen.bat index 60e8b626..958a0044 100644 --- a/test/cpp-tableau-loader/gen.bat +++ b/test/cpp-tableau-loader/gen.bat @@ -1,59 +1,59 @@ -@echo off -setlocal -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_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" -set "PROTOCONF_OUT=%ROOTDIR%\src\protoconf" - -REM remove old generated files -rmdir /s /q "%PROTOCONF_OUT%" 2>nul -mkdir "%PROTOCONF_OUT%" - -REM build protoc plugin of loader -pushd "%PLGUIN_DIR%" -go build -popd - -set "PATH=%PATH%;%PLGUIN_DIR%" - -set protoFiles= -pushd "%PROTOCONF_IN%" -for /R %%f in (*.proto) do ( - set protoFiles=!protoFiles! "%%f" -) -popd -"%PROTOC%" ^ ---cpp-tableau-loader_out="%PROTOCONF_OUT%" ^ ---cpp-tableau-loader_opt=paths=source_relative,shards=2 ^ ---cpp_out="%PROTOCONF_OUT%" ^ ---proto_path="%PROTOBUF_PROTO%" ^ ---proto_path="%TABLEAU_PROTO%" ^ ---proto_path="%PROTOCONF_IN%" ^ -!protoFiles! - -set "TABLEAU_IN=%TABLEAU_PROTO%\tableau\protobuf" -set "TABLEAU_OUT=%ROOTDIR%\src" -REM remove old generated files -if exist "%TABLEAU_OUT%\tableau" rmdir /s /q "%TABLEAU_OUT%\tableau" -mkdir "%TABLEAU_OUT%\tableau" - -"%PROTOC%" ^ ---cpp_out="%TABLEAU_OUT%" ^ ---proto_path="%PROTOBUF_PROTO%" ^ ---proto_path="%TABLEAU_PROTO%" ^ -"%TABLEAU_IN%\tableau.proto" "%TABLEAU_IN%\wellknown.proto" - -endlocal -endlocal +@echo off +setlocal +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_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" +set "PROTOCONF_OUT=%ROOTDIR%\src\protoconf" + +REM remove old generated files +rmdir /s /q "%PROTOCONF_OUT%" 2>nul +mkdir "%PROTOCONF_OUT%" + +REM build protoc plugin of loader +pushd "%PLGUIN_DIR%" +go build +popd + +set "PATH=%PATH%;%PLGUIN_DIR%" + +set protoFiles= +pushd "%PROTOCONF_IN%" +for /R %%f in (*.proto) do ( + set protoFiles=!protoFiles! "%%f" +) +popd +"%PROTOC%" ^ +--cpp-tableau-loader_out="%PROTOCONF_OUT%" ^ +--cpp-tableau-loader_opt=paths=source_relative,shards=2 ^ +--cpp_out="%PROTOCONF_OUT%" ^ +--proto_path="%PROTOBUF_PROTO%" ^ +--proto_path="%TABLEAU_PROTO%" ^ +--proto_path="%PROTOCONF_IN%" ^ +!protoFiles! + +set "TABLEAU_IN=%TABLEAU_PROTO%\tableau\protobuf" +set "TABLEAU_OUT=%ROOTDIR%\src" +REM remove old generated files +if exist "%TABLEAU_OUT%\tableau" rmdir /s /q "%TABLEAU_OUT%\tableau" +mkdir "%TABLEAU_OUT%\tableau" + +"%PROTOC%" ^ +--cpp_out="%TABLEAU_OUT%" ^ +--proto_path="%PROTOBUF_PROTO%" ^ +--proto_path="%TABLEAU_PROTO%" ^ +"%TABLEAU_IN%\tableau.proto" "%TABLEAU_IN%\wellknown.proto" + +endlocal +endlocal