Răsfoiți Sursa

Merge pull request #771 from gchesney/add-desc-proto-file

Added descriptor file output to protobuf gen script
Rod Hynes 2 săptămâni în urmă
părinte
comite
f04c62f601

BIN
psiphon/server/pb/psiphond/psiphond.desc


BIN
psiphon/server/pb/router/router.desc


+ 1 - 1
psiphon/server/proto/compile_protobufs.sh

@@ -14,5 +14,5 @@ find . -mindepth 1 -maxdepth 1 -type d -name 'ca.psiphon.*' | sed -e 's|^\./||'
   pkg="${src##*.}"
   pkg="${src##*.}"
 
 
   mkdir -p "../pb/${pkg}" || fatal "failed to create compiled protobuf directory: ../pb/${pkg}"
   mkdir -p "../pb/${pkg}" || fatal "failed to create compiled protobuf directory: ../pb/${pkg}"
-  protoc --go_out="../pb/${pkg}/" --go_opt="module=github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/server/pb/${pkg}" "${src}/"*.proto
+  protoc --go_out="../pb/${pkg}/" --go_opt="module=github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/server/pb/${pkg}" --descriptor_set_out="../pb/${pkg}/${pkg}.desc" --include_imports "${src}/"*.proto
 done
 done