qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-11 23:50:22 -07:00
Code Releases Activity

misc/osx: don't set GOROOT or modify profile files

Browse Source 
There's no reason to set GOROOT as the tools will have the path baked
into it with GOROOT_FINAL.

R=bradfitz, bytbox, gustavo, rsc
CC=golang-dev
https://golang.org/cl/5576064
This commit is contained in:
Andrew Gerrand 2012-02-07 10:38:10 +11:00
parent 32f011e46b
commit d887a31b7c
3 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc/osx/etc/profile_go
View File

@ -1,15 +0,0 @@
#!/bin/bash
# Copyright 2011 The Go Authors. All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
# The output of this script will be eval'd by the user's shell on startup. This
# script decides what type of shell is being used in the same way as
# /usr/libexec/path_helper
if echo $SHELL | grep csh$ > /dev/null; then
echo 'setenv GOROOT /usr/local/go'
else
echo 'export GOROOT=/usr/local/go'
fi

24
misc/osx/package.bash
View File

@ -13,34 +13,32 @@ fi
BUILD=/tmp/go.build.tmp
ROOT=`hg root`
export GOROOT=$BUILD/root/usr/local/go
export GOROOT_FINAL=/usr/local/go
echo "Removing old images"
rm -f *.pkg *.dmg
echo "Preparing temporary directory"
rm -rf ${BUILD}
mkdir -p ${BUILD}
echo "Preparing template"
mkdir -p ${BUILD}/root/usr/local/
rm -rf $BUILD
mkdir -p $BUILD
echo "Copying go source distribution"
cp -r $ROOT ${BUILD}/root/usr/local/go
cp -r etc ${BUILD}/root/etc
mkdir -p $BUILD/root/usr/local
cp -r $ROOT $GOROOT
cp -r etc $BUILD/root/etc
echo "Building go"
pushd . > /dev/null
cd ${BUILD}/root/usr/local/go
GOROOT=`pwd`
pushd $GOROOT > /dev/null
src/version.bash -save
rm -rf .hg .hgignore .hgtags
cd src
./all.bash | sed "s/^/ /"
cd ..
popd > /dev/null
echo "Building package"
${PM} -v -r ${BUILD}/root -o "Go `hg id`.pkg" \
# $PM came from utils.bahs
$PM -v -r $BUILD/root -o "Go `hg id`.pkg" \
--scripts scripts \
--id com.googlecode.go \
--title Go \
@ -48,4 +46,4 @@ ${PM} -v -r ${BUILD}/root -o "Go `hg id`.pkg" \
--target "10.5"
echo "Removing temporary directory"
rm -rf ${BUILD}
rm -rf $BUILD

5
misc/osx/scripts/postinstall
View File

@ -9,11 +9,6 @@ find bin -exec chmod ugo+rx \{\} \;
find . -type d -exec chmod ugo+rx \{\} \;
chmod o-w .
echo "Setting GOROOT system-wide"
echo "eval \`/etc/profile_go\`" >> /etc/csh.login
echo "eval \`/etc/profile_go\`" >> /etc/zshenv
echo "eval \`/etc/profile_go\`" >> /etc/profile
echo "Fixing debuggers via sudo.bash"
# setgrp procmod the debuggers (sudo.bash)
cd $GOROOT/src