Quellcode durchsuchen

all: invert use_golang_protobuf_v1 tag

Invert the build tag such that the default is to use the reimplementation
that uses v2 under the hood.

Change-Id: I04ee912ddd59b387c2fbf0146b779dd99b060e93
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169297
Reviewed-by: Herbie Ong <herbie@google.com>
Joe Tsai vor 6 Jahren
Ursprung
Commit
be03c15fca
5 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
  1. 1 1
      proto/hooks_disabled.go
  2. 1 1
      proto/hooks_enabled.go
  3. 1 1
      proto/properties.go
  4. 1 1
      proto/properties_alt.go
  5. 1 1
      test.bash

+ 1 - 1
proto/hooks_disabled.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !proto_reimpl
+// +build use_golang_protobuf_v1
 
 package proto
 

+ 1 - 1
proto/hooks_enabled.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build proto_reimpl
+// +build !use_golang_protobuf_v1
 
 package proto
 

+ 1 - 1
proto/properties.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !proto_reimpl
+// +build use_golang_protobuf_v1
 
 package proto
 

+ 1 - 1
proto/properties_alt.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build proto_reimpl
+// +build !use_golang_protobuf_v1
 
 package proto
 

+ 1 - 1
test.bash

@@ -11,7 +11,7 @@ FAIL="\x1b[31mFAIL"
 RESET="\x1b[0m"
 
 echo -e "${BOLD}go test${RESET}"
-RET_TEST=$((go test ./... && go test -tags proto_reimpl ./...) | egrep -v "^(ok|[?])\s+")
+RET_TEST=$((go test ./... && go test -tags use_golang_protobuf_v1 ./...) | egrep -v "^(ok|[?])\s+")
 if [[ ! -z "$RET_TEST" ]]; then echo "$RET_TEST"; echo; fi
 
 echo -e "${BOLD}go generate${RESET}"