update conversion/deep-copy generator

deads2k · deads2k · commit ff3278a45475 · 2015-07-06T14:14:20.000-04:00
diff --git a/cmd/genconversion/conversion.go b/cmd/genconversion/conversion.go
@@ -40,7 +40,7 @@ func main() {
 		funcOut = file
 	}
 
-	generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw())
+	generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw(), "github.com/openshift/origin/pkg/api")
 	apiShort := generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
 	generator.AssumePrivateConversions()
 	// TODO(wojtek-t): Change the overwrites to a flag.
diff --git a/cmd/gendeepcopy/deep_copy.go b/cmd/gendeepcopy/deep_copy.go
@@ -61,7 +61,7 @@ func main() {
 	if knownVersion == "api" {
 		knownVersion = api.Scheme.Raw().InternalVersion
 	}
-	generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), util.NewStringSet("github.com/openshift/origin"))
+	generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), "github.com/openshift/origin/pkg/api", util.NewStringSet("github.com/openshift/origin"))
 	apiShort := generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
 	generator.ReplaceType("github.com/GoogleCloudPlatform/kubernetes/pkg/util", "empty", struct{}{})
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func main() {`
`40`	`40`	`funcOut = file`
`41`	`41`	`}`
`42`	`42`
`43`		`- generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw())`
	`43`	`+ generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw(), "github.com/openshift/origin/pkg/api")`
`44`	`44`	`apiShort := generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")`
`45`	`45`	`generator.AssumePrivateConversions()`
`46`	`46`	`// TODO(wojtek-t): Change the overwrites to a flag.`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func main() {`
`61`	`61`	`if knownVersion == "api" {`
`62`	`62`	`knownVersion = api.Scheme.Raw().InternalVersion`
`63`	`63`	`}`
`64`		`- generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), util.NewStringSet("github.com/openshift/origin"))`
	`64`	`+ generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), "github.com/openshift/origin/pkg/api", util.NewStringSet("github.com/openshift/origin"))`
`65`	`65`	`apiShort := generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")`
`66`	`66`	`generator.ReplaceType("github.com/GoogleCloudPlatform/kubernetes/pkg/util", "empty", struct{}{})`
`67`	`67`