Update nodejs profile.
The new profile is installed from binaries, not from source.
MultiPart: 3/5
Change-Id: Ic8535d705f4fbe09b259b1c8f0e9b41a98ed73c3
diff --git a/jiri-profile-v23/nodejs_profile/nodejs.go b/jiri-profile-v23/nodejs_profile/nodejs.go
index 9209e7b..bdf5ee5 100644
--- a/jiri-profile-v23/nodejs_profile/nodejs.go
+++ b/jiri-profile-v23/nodejs_profile/nodejs.go
@@ -7,12 +7,14 @@
import (
"flag"
"fmt"
+ "path/filepath"
"runtime"
"v.io/jiri"
"v.io/jiri/profiles"
"v.io/jiri/profiles/profilesmanager"
"v.io/jiri/profiles/profilesutil"
+ "v.io/x/lib/envvar"
)
type versionSpec struct {
@@ -25,8 +27,9 @@
profileName: profile,
qualifiedName: profiles.QualifiedProfileName(installer, profile),
versionInfo: profiles.NewVersionInfo(profile, map[string]interface{}{
- "10.24": &versionSpec{"node-v0.10.24"},
- }, "10.24"),
+ "0.10.24": &versionSpec{"node-v0.10.24"},
+ "4.4.1": &versionSpec{"node-v4.4.1"},
+ }, "4.4.1"),
}
profilesmanager.Register(m)
}
@@ -67,9 +70,8 @@
return err
}
m.root = root
- m.nodeRoot = m.root.Join("cout", m.spec.nodeVersion)
+ m.nodeRoot = m.root.Join("nodejs", m.spec.nodeVersion)
m.nodeInstDir = m.nodeRoot.Join(target.TargetSpecificDirname())
- m.nodeSrcDir = jiri.NewRelPath("third_party", "csrc", m.spec.nodeVersion)
return nil
}
@@ -77,12 +79,25 @@
if err := m.initForTarget(root, target); err != nil {
return err
}
- if target.CrossCompiling() {
- return fmt.Errorf("the %q profile does not support cross compilation to %v", m.qualifiedName, target)
+ if target.Version() == "0.10.24" {
+ // Install from source only for version 0.10.24.
+ m.nodeRoot = m.root.Join("cout", m.spec.nodeVersion)
+ m.nodeInstDir = m.nodeRoot.Join(target.TargetSpecificDirname())
+ m.nodeSrcDir = jiri.NewRelPath("third_party", "csrc", m.spec.nodeVersion)
+ if err := m.installNodeFromSource(jirix, target); err != nil {
+ return err
+ }
+ } else {
+ // Install from binary tarballs.
+ if err := m.installNodeBinaries(jirix, target, m.nodeInstDir.Abs(jirix)); err != nil {
+ return err
+ }
}
- if err := m.installNode(jirix, target); err != nil {
- return err
- }
+
+ target.Env.Vars = envvar.MergeSlices(target.Env.Vars, []string{
+ "NODE_BIN=" + m.nodeInstDir.Join("bin").Symbolic(),
+ "PATH=" + m.nodeInstDir.Join("bin").Symbolic(),
+ })
target.InstallationDir = string(m.nodeInstDir)
pdb.InstallProfile(m.profileInstaller, m.profileName, string(m.nodeRoot))
return pdb.AddProfileTarget(m.profileInstaller, m.profileName, target)
@@ -99,7 +114,58 @@
return nil
}
-func (m *Manager) installNode(jirix *jiri.X, target profiles.Target) error {
+func (m *Manager) installNodeBinaries(jirix *jiri.X, target profiles.Target, outDir string) error {
+ if target.Arch() != "amd64" {
+ return fmt.Errorf("%q is not supported", target.Arch())
+ }
+
+ var arch string
+ switch target.Arch() {
+ case "amd64":
+ arch = "x64"
+ case "386":
+ arch = "x86"
+ default:
+ return fmt.Errorf("arch %q is not supported", target.Arch())
+ }
+
+ switch target.OS() {
+ case "darwin":
+ if target.Arch() != "amd64" {
+ return fmt.Errorf("arch %q is not supported on darwin", target.Arch())
+ }
+ case "linux":
+ default:
+ return fmt.Errorf("os %q is not supported", target.OS())
+ }
+
+ tarball := fmt.Sprintf("node-v%s-%s-%s.tar.gz", target.Version(), target.OS(), arch)
+ url := fmt.Sprintf("https://nodejs.org/dist/v%s/%s", target.Version(), tarball)
+ dirname := fmt.Sprintf("node-v%s-%s-%s", target.Version(), target.OS(), arch)
+
+ tmpDir, err := jirix.NewSeq().TempDir("", "")
+ if err != nil {
+ return err
+ }
+ defer jirix.NewSeq().RemoveAll(tmpDir)
+
+ fn := func() error {
+ return jirix.NewSeq().
+ Pushd(tmpDir).
+ Call(func() error {
+ return profilesutil.Fetch(jirix, tarball, url)
+ }, "fetch nodejs tarball").
+ Call(func() error {
+ return profilesutil.Untar(jirix, tarball, tmpDir)
+ }, "untar nodejs tarball").
+ MkdirAll(filepath.Dir(outDir), profilesutil.DefaultDirPerm).
+ Rename(filepath.Join(tmpDir, dirname), outDir).
+ Done()
+ }
+ return profilesutil.AtomicAction(jirix, fn, outDir, "Install NodeJS")
+}
+
+func (m *Manager) installNodeFromSource(jirix *jiri.X, target profiles.Target) error {
switch target.OS() {
case "darwin":
case "linux":
