diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/makerelease/darwin/Distribution (renamed from misc/dist/darwin/Distribution) | 0 | ||||
| -rw-r--r-- | misc/makerelease/darwin/Resources/bg.png (renamed from misc/dist/darwin/Resources/bg.png) | bin | 11466 -> 11466 bytes | |||
| -rw-r--r-- | misc/makerelease/darwin/etc/paths.d/go (renamed from misc/dist/darwin/etc/paths.d/go) | 0 | ||||
| -rwxr-xr-x | misc/makerelease/darwin/scripts/postinstall (renamed from misc/dist/darwin/scripts/postinstall) | 0 | ||||
| -rwxr-xr-x | misc/makerelease/darwin/scripts/preinstall (renamed from misc/dist/darwin/scripts/preinstall) | 0 | ||||
| -rw-r--r-- | misc/makerelease/makerelease.go (renamed from misc/dist/bindist.go) | 18 | ||||
| -rw-r--r-- | misc/makerelease/windows/LICENSE.rtf (renamed from misc/dist/windows/LICENSE.rtf) | bin | 1687 -> 1687 bytes | |||
| -rw-r--r-- | misc/makerelease/windows/README.txt (renamed from misc/dist/windows/README.txt) | 0 | ||||
| -rw-r--r-- | misc/makerelease/windows/images/Banner.jpg (renamed from misc/dist/windows/images/Banner.jpg) | bin | 6643 -> 6643 bytes | |||
| -rw-r--r-- | misc/makerelease/windows/images/Dialog.jpg (renamed from misc/dist/windows/images/Dialog.jpg) | bin | 16428 -> 16428 bytes | |||
| -rw-r--r-- | misc/makerelease/windows/images/DialogLeft.jpg (renamed from misc/dist/windows/images/DialogLeft.jpg) | bin | 12961 -> 12961 bytes | |||
| -rw-r--r-- | misc/makerelease/windows/images/gopher.ico (renamed from misc/dist/windows/images/gopher.ico) | bin | 30166 -> 30166 bytes | |||
| -rw-r--r-- | misc/makerelease/windows/installer.wxs (renamed from misc/dist/windows/installer.wxs) | 0 |
13 files changed, 9 insertions, 9 deletions
diff --git a/misc/dist/darwin/Distribution b/misc/makerelease/darwin/Distribution index 8b764b69f..8b764b69f 100644 --- a/misc/dist/darwin/Distribution +++ b/misc/makerelease/darwin/Distribution diff --git a/misc/dist/darwin/Resources/bg.png b/misc/makerelease/darwin/Resources/bg.png Binary files differindex c3d8ea93a..c3d8ea93a 100644 --- a/misc/dist/darwin/Resources/bg.png +++ b/misc/makerelease/darwin/Resources/bg.png diff --git a/misc/dist/darwin/etc/paths.d/go b/misc/makerelease/darwin/etc/paths.d/go index 532e5f936..532e5f936 100644 --- a/misc/dist/darwin/etc/paths.d/go +++ b/misc/makerelease/darwin/etc/paths.d/go diff --git a/misc/dist/darwin/scripts/postinstall b/misc/makerelease/darwin/scripts/postinstall index 13f5bff9b..13f5bff9b 100755 --- a/misc/dist/darwin/scripts/postinstall +++ b/misc/makerelease/darwin/scripts/postinstall diff --git a/misc/dist/darwin/scripts/preinstall b/misc/makerelease/darwin/scripts/preinstall index 4cdaaa4bc..4cdaaa4bc 100755 --- a/misc/dist/darwin/scripts/preinstall +++ b/misc/makerelease/darwin/scripts/preinstall diff --git a/misc/dist/bindist.go b/misc/makerelease/makerelease.go index cd0ff7fee..661f91c57 100644 --- a/misc/dist/bindist.go +++ b/misc/makerelease/makerelease.go @@ -205,7 +205,7 @@ type Build struct { } func (b *Build) Do() error { - work, err := ioutil.TempDir("", "bindist") + work, err := ioutil.TempDir("", "makerelease") if err != nil { return err } @@ -286,13 +286,13 @@ func (b *Build) Do() error { version string // "weekly.2012-03-04" fullVersion []byte // "weekly.2012-03-04 9353aa1efdf3" ) - pat := filepath.Join(b.root, "pkg/tool/*/dist*") // trailing * for .exe + pat := filepath.Join(b.root, "pkg/tool/*/makerelease*") // trailing * for .exe m, err := filepath.Glob(pat) if err != nil { return err } if len(m) == 0 { - return fmt.Errorf("couldn't find dist in %q", pat) + return fmt.Errorf("couldn't find makerelease in %q", pat) } fullVersion, err = b.run("", m[0], "version") if err != nil { @@ -351,7 +351,7 @@ func (b *Build) Do() error { // build pkg // arrange work so it's laid out as the dest filesystem - etc := filepath.Join(b.root, "misc/dist/darwin/etc") + etc := filepath.Join(b.root, "misc/makerelease/darwin/etc") _, err = b.run(work, "cp", "-r", etc, ".") if err != nil { return err @@ -371,11 +371,11 @@ func (b *Build) Do() error { return err } defer os.RemoveAll(pkgdest) - dist := filepath.Join(runtime.GOROOT(), "misc/dist") + makerelease := filepath.Join(runtime.GOROOT(), "misc/makerelease") _, err = b.run("", "pkgbuild", "--identifier", "com.googlecode.go", "--version", version, - "--scripts", filepath.Join(dist, "darwin/scripts"), + "--scripts", filepath.Join(makerelease, "darwin/scripts"), "--root", work, filepath.Join(pkgdest, "com.googlecode.go.pkg")) if err != nil { @@ -383,8 +383,8 @@ func (b *Build) Do() error { } targ = base + ".pkg" _, err = b.run("", "productbuild", - "--distribution", filepath.Join(dist, "darwin/Distribution"), - "--resources", filepath.Join(dist, "darwin/Resources"), + "--distribution", filepath.Join(makerelease, "darwin/Distribution"), + "--resources", filepath.Join(makerelease, "darwin/Resources"), "--package-path", pkgdest, targ) if err != nil { @@ -404,7 +404,7 @@ func (b *Build) Do() error { targs = append(targs, targ) // Create MSI installer. - win := filepath.Join(b.root, "misc/dist/windows") + win := filepath.Join(b.root, "misc/makerelease/windows") installer := filepath.Join(win, "installer.wxs") if *wxsFile != "" { installer = *wxsFile diff --git a/misc/dist/windows/LICENSE.rtf b/misc/makerelease/windows/LICENSE.rtf Binary files differindex b2b0be62c..b2b0be62c 100644 --- a/misc/dist/windows/LICENSE.rtf +++ b/misc/makerelease/windows/LICENSE.rtf diff --git a/misc/dist/windows/README.txt b/misc/makerelease/windows/README.txt index 0cf828b24..0cf828b24 100644 --- a/misc/dist/windows/README.txt +++ b/misc/makerelease/windows/README.txt diff --git a/misc/dist/windows/images/Banner.jpg b/misc/makerelease/windows/images/Banner.jpg Binary files differindex ce65f63af..ce65f63af 100644 --- a/misc/dist/windows/images/Banner.jpg +++ b/misc/makerelease/windows/images/Banner.jpg diff --git a/misc/dist/windows/images/Dialog.jpg b/misc/makerelease/windows/images/Dialog.jpg Binary files differindex 1f0ec0a31..1f0ec0a31 100644 --- a/misc/dist/windows/images/Dialog.jpg +++ b/misc/makerelease/windows/images/Dialog.jpg diff --git a/misc/dist/windows/images/DialogLeft.jpg b/misc/makerelease/windows/images/DialogLeft.jpg Binary files differindex 73bab89b4..73bab89b4 100644 --- a/misc/dist/windows/images/DialogLeft.jpg +++ b/misc/makerelease/windows/images/DialogLeft.jpg diff --git a/misc/dist/windows/images/gopher.ico b/misc/makerelease/windows/images/gopher.ico Binary files differindex 2e861ebe0..2e861ebe0 100644 --- a/misc/dist/windows/images/gopher.ico +++ b/misc/makerelease/windows/images/gopher.ico diff --git a/misc/dist/windows/installer.wxs b/misc/makerelease/windows/installer.wxs index b170b98dc..b170b98dc 100644 --- a/misc/dist/windows/installer.wxs +++ b/misc/makerelease/windows/installer.wxs |
