resolved pkg conflict when building in generate/

Author: hoenirvili

cloud/clouds.go

@@ -19,7 +19,7 @@ import (
 	"github.com/juju/juju/juju/osenv"
 )
 
-//go:generate go run ../generate/filetoconst.go fallbackPublicCloudInfo fallback-public-cloud.yaml fallback_public_cloud.go 2015 cloud
+//go:generate go run ../generate/filetoconst/filetoconst.go fallbackPublicCloudInfo fallback-public-cloud.yaml fallback_public_cloud.go 2015 cloud
 
 // AuthType is the type of authentication used by the cloud.
 type AuthType string

cloudconfig/userdatacfg_win.go

@@ -22,7 +22,7 @@ import (
 	"github.com/juju/juju/tools"
 )
 
-//go:generate go run ../generate/filetoconst.go UserDataScript windowsuserdatafiles/userdata.ps1 winuserdatawrapper.go 2016 cloudconfig
+//go:generate go run ../generate/filetoconst/filetoconst.go UserDataScript windowsuserdatafiles/userdata.ps1 winuserdatawrapper.go 2016 cloudconfig
 //go:generate go run ../generate/winuserdata/winuserdata.go 2016 winuserdata.go cloudconfig
 
 type aclType string

generate/doc.go

@@ -1,6 +1,6 @@
 // Copyright 2015 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package main
+package generate
 
 // Package generate contains commands called by go generate.