resolved pkg conflict when building in generate/

4a6f656c · May 17, 2016 · ec99f79 · ec99f79
1 parent f794770
commit ec99f79
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/cloud/clouds.go b/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

diff --git a/cloudconfig/userdatacfg_win.go b/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

diff --git a/generate/doc.go b/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.
diff --git a/generate/filetoconst.go → generate/filetoconst/filetoconst.go b/generate/filetoconst.go → generate/filetoconst/filetoconst.go