moved proto2/proto3 to types/v1 and types/v2 respectively

2019-03-13 19:37:26 -04:00 · 2019-03-13 19:37:26 -04:00 · 326b62dc57
commit 326b62dc57
parent 25cc7ba284
11 changed files with 5 additions and 8 deletions
--- a/lbrynet/schema/Makefile
+++ b/lbrynet/schema/Makefile
@ -1,9 +1,6 @@
 build:
-	rm proto2/* proto3/* -rf
-	cd proto2 && protoc --python_out=. -I ../../../../types/v1/proto/ ../../../../types/v1/proto/*.proto
-	sed -e 's/^import\ \(.*\)_pb2\ /from . import\ \1_pb2\ /g' -i proto2/*.py
-	touch proto2/__init__.py
-	cd proto3 && protoc --python_out=. -I ../../../../types/v2/proto/ ../../../../types/v2/proto/*.proto
-	sed -e 's/^import\ \(.*\)_pb2\ /from . import\ \1_pb2\ /g' -i proto3/*.py
-	touch proto3/__init__.py
-
+	rm types/v1/* types/v2/* -rf
+	touch types/v1/__init__.py types/v2/__init__.py
+	cd types/v1/ && protoc --python_out=. -I ../../../../../types/v1/proto/ ../../../../../types/v1/proto/*.proto
+	sed -e 's/^import\ \(.*\)_pb2\ /from . import\ \1_pb2\ /g' -i types/v1/*.py
+	cd types/v2/ && protoc --python_out=. -I ../../../../../types/v2/proto/ ../../../../../types/v2/proto/*.proto
--- a/lbrynet/schema/types/v1/init.py
+++ b/lbrynet/schema/types/v1/init.py
--- a/lbrynet/schema/types/v1/certificate_pb2.py
+++ b/lbrynet/schema/types/v1/certificate_pb2.py
--- a/lbrynet/schema/types/v1/fee_pb2.py
+++ b/lbrynet/schema/types/v1/fee_pb2.py
--- a/lbrynet/schema/types/v1/legacy_claim_pb2.py
+++ b/lbrynet/schema/types/v1/legacy_claim_pb2.py
--- a/lbrynet/schema/types/v1/metadata_pb2.py
+++ b/lbrynet/schema/types/v1/metadata_pb2.py
--- a/lbrynet/schema/types/v1/signature_pb2.py
+++ b/lbrynet/schema/types/v1/signature_pb2.py
--- a/lbrynet/schema/types/v1/source_pb2.py
+++ b/lbrynet/schema/types/v1/source_pb2.py
--- a/lbrynet/schema/types/v1/stream_pb2.py
+++ b/lbrynet/schema/types/v1/stream_pb2.py
--- a/lbrynet/schema/types/v2/init.py
+++ b/lbrynet/schema/types/v2/init.py
--- a/lbrynet/schema/types/v2/claim_pb2.py
+++ b/lbrynet/schema/types/v2/claim_pb2.py