Kaynağa Gözat

goprotobuf: Update googlecode paths.

R=adg
CC=golang-dev
http://codereview.appspot.com/5517054
David Symonds 14 yıl önce
ebeveyn
işleme
81739467e7

+ 1 - 1
Make.protobuf

@@ -39,7 +39,7 @@
 #		myproto.pb.go
 #		myproto.pb.go
 #
 #
 #	include $(GOROOT)/src/Make.pkg
 #	include $(GOROOT)/src/Make.pkg
-#	include $(GOROOT)/src/pkg/goprotobuf.googlecode.com/hg/Make.protobuf
+#	include $(GOROOT)/src/pkg/code.google.com/p/goprotobuf/Make.protobuf
 
 
 %.pb.go:	%.proto
 %.pb.go:	%.proto
 	protoc --go_out=. $<
 	protoc --go_out=. $<

+ 5 - 5
README

@@ -31,10 +31,10 @@ To install this code:
 The simplest way is to run goinstall.
 The simplest way is to run goinstall.
 
 
 	# Grab the code from the repository and install the proto package.
 	# Grab the code from the repository and install the proto package.
-	goinstall goprotobuf.googlecode.com/hg/proto
+	goinstall code.google.com/p/goprotobuf/proto
 
 
 	# Compile and install the compiler plugin
 	# Compile and install the compiler plugin
-	cd $GOROOT/src/pkg/goprotobuf.googlecode.com/hg/compiler
+	cd $GOROOT/src/pkg/code.google.com/p/goprotobuf/compiler
 	make install
 	make install
 
 
 The compiler plugin, protoc-gen-go, will be installed in $GOBIN,
 The compiler plugin, protoc-gen-go, will be installed in $GOBIN,
@@ -56,7 +56,7 @@ for an example using such a file.
 
 
 This repository uses the same code review mechanism as Go, so
 This repository uses the same code review mechanism as Go, so
 if you wish to submit changes add the equivalent of these two lines
 if you wish to submit changes add the equivalent of these two lines
-to $GOROOT/src/pkg/goprotobuf.googlecode.com/hg/.hg/hgrc
+to $GOROOT/src/pkg/code.google.com/p/goprotobuf/.hg/hgrc
 
 
 	[extensions]
 	[extensions]
 	codereview = $GOROOT/lib/codereview/codereview.py
 	codereview = $GOROOT/lib/codereview/codereview.py
@@ -123,7 +123,7 @@ Makefile like this:
 		other.go
 		other.go
 
 
 	include $(GOROOT)/src/Make.pkg
 	include $(GOROOT)/src/Make.pkg
-	include $(GOROOT)/src/pkg/goprotobuf.googlecode.com/hg/Make.protobuf
+	include $(GOROOT)/src/pkg/code.google.com/p/goprotobuf/Make.protobuf
 
 
 
 
 To create and play with a Test object from the example package,
 To create and play with a Test object from the example package,
@@ -133,7 +133,7 @@ To create and play with a Test object from the example package,
 	import (
 	import (
 		"log"
 		"log"
 
 
-		"goprotobuf.googlecode.com/hg/proto"
+		"code.google.com/p/goprotobuf/proto"
 		"path/to/example"
 		"path/to/example"
 	)
 	)
 
 

+ 1 - 1
compiler/descriptor/Makefile

@@ -45,7 +45,7 @@ regenerate:
 	echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
 	echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
 	cd $(HOME)/protobuf-2.3.0/src && \
 	cd $(HOME)/protobuf-2.3.0/src && \
 	protoc --go_out=. ./google/protobuf/descriptor.proto && \
 	protoc --go_out=. ./google/protobuf/descriptor.proto && \
-	cp ./google/protobuf/descriptor.pb.go $(GOROOT)/src/pkg/goprotobuf.googlecode.com/hg/compiler/descriptor/descriptor.pb.go
+	cp ./google/protobuf/descriptor.pb.go $(GOROOT)/src/pkg/code.google.com/p/goprotobuf/compiler/descriptor/descriptor.pb.go
 
 
 restore:
 restore:
 	cp descriptor.pb.golden descriptor.pb.go
 	cp descriptor.pb.golden descriptor.pb.go

+ 1 - 1
compiler/descriptor/descriptor.pb.golden

@@ -3,7 +3,7 @@
 
 
 package google_protobuf
 package google_protobuf
 
 
-import proto "goprotobuf.googlecode.com/hg/proto"
+import proto "code.google.com/p/goprotobuf/proto"
 import "math"
 import "math"
 import "os"
 import "os"
 
 

+ 2 - 2
compiler/plugin/plugin.pb.golden

@@ -3,10 +3,10 @@
 
 
 package google_protobuf_compiler
 package google_protobuf_compiler
 
 
-import proto "goprotobuf.googlecode.com/hg/proto"
+import proto "code.google.com/p/goprotobuf/proto"
 import "math"
 import "math"
 import "os"
 import "os"
-import google_protobuf "goprotobuf.googlecode.com/hg/compiler/descriptor"
+import google_protobuf "code.google.com/p/goprotobuf/compiler/descriptor"
 
 
 // Reference proto, math & os imports to suppress error if they are not otherwise used.
 // Reference proto, math & os imports to suppress error if they are not otherwise used.
 var _ = proto.GetString
 var _ = proto.GetString

+ 1 - 1
compiler/testdata/imp.pb.go.golden

@@ -3,7 +3,7 @@
 
 
 package imp
 package imp
 
 
-import proto "goprotobuf.googlecode.com/hg/proto"
+import proto "code.google.com/p/goprotobuf/proto"
 import "math"
 import "math"
 import "os"
 import "os"
 import imp1 "imp2.pb"
 import imp1 "imp2.pb"

+ 3 - 1
compiler/testdata/test.pb.go.golden

@@ -3,9 +3,10 @@
 
 
 package my_test
 package my_test
 
 
-import proto "goprotobuf.googlecode.com/hg/proto"
+import proto "code.google.com/p/goprotobuf/proto"
 import "math"
 import "math"
 import imp1 "imp.pb"
 import imp1 "imp.pb"
+
 // discarding unused import multitest2 "multi1.pb"
 // discarding unused import multitest2 "multi1.pb"
 
 
 // Reference proto and math imports to suppress error if they are not otherwise used.
 // Reference proto and math imports to suppress error if they are not otherwise used.
@@ -205,6 +206,7 @@ func (this *OldReply) Marshal() ([]byte, error) {
 func (this *OldReply) Unmarshal(buf []byte) error {
 func (this *OldReply) Unmarshal(buf []byte) error {
 	return proto.UnmarshalMessageSet(buf, this.ExtensionMap())
 	return proto.UnmarshalMessageSet(buf, this.ExtensionMap())
 }
 }
+
 // ensure OldReply satisfies proto.Marshaler and proto.Unmarshaler
 // ensure OldReply satisfies proto.Marshaler and proto.Unmarshaler
 var _ proto.Marshaler = (*OldReply)(nil)
 var _ proto.Marshaler = (*OldReply)(nil)
 var _ proto.Unmarshaler = (*OldReply)(nil)
 var _ proto.Unmarshaler = (*OldReply)(nil)

+ 1 - 1
proto/testdata/test.pb.go.golden

@@ -3,7 +3,7 @@
 
 
 package test_proto
 package test_proto
 
 
-import proto "goprotobuf.googlecode.com/hg/proto"
+import proto "code.google.com/p/goprotobuf/proto"
 import "math"
 import "math"
 import "os"
 import "os"