summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-10-14 17:16:21 -0700
committerRuss Cox <rsc@golang.org>2009-10-14 17:16:21 -0700
commit8ba921a65d696b40b9550f639d881b031e4f4b96 (patch)
treed22c47a4ecba3e9e54da4bba800db4302876ae19
parent77d381a6c6fe98996bc2bb7b3fdf6da7f44e29b0 (diff)
downloadgolang-8ba921a65d696b40b9550f639d881b031e4f4b96.tar.gz
move native client to exp/nacl.
R=r DELTA=3706 (1857 added, 1849 deleted, 0 changed) OCL=35731 CL=35741
-rw-r--r--src/all-nacl.bash8
-rw-r--r--src/pkg/exp/nacl/av/Makefile (renamed from usr/rsc/nacl/av/Makefile)2
-rw-r--r--src/pkg/exp/nacl/av/av.go (renamed from usr/rsc/nacl/av/av.go)4
-rw-r--r--src/pkg/exp/nacl/av/event.go (renamed from usr/rsc/nacl/av/event.go)2
-rw-r--r--src/pkg/exp/nacl/av/image.go (renamed from usr/rsc/nacl/av/image.go)0
-rw-r--r--src/pkg/exp/nacl/srpc/Makefile (renamed from usr/rsc/nacl/srpc/Makefile)2
-rw-r--r--src/pkg/exp/nacl/srpc/client.go (renamed from usr/rsc/nacl/srpc/client.go)0
-rw-r--r--src/pkg/exp/nacl/srpc/msg.go (renamed from usr/rsc/nacl/srpc/msg.go)0
-rw-r--r--src/pkg/exp/nacl/srpc/server.go (renamed from usr/rsc/nacl/srpc/server.go)0
9 files changed, 13 insertions, 5 deletions
diff --git a/src/all-nacl.bash b/src/all-nacl.bash
index 6a1a206c1..9270b5d20 100644
--- a/src/all-nacl.bash
+++ b/src/all-nacl.bash
@@ -14,6 +14,14 @@ xcd() {
builtin cd $1
}
+(xcd pkg/exp/nacl/srpc
+make install
+) || exit $?
+
+(xcd pkg/exp/nacl/av
+make install
+) || exit $?
+
(xcd ../test
./run-nacl
) || exit $?
diff --git a/usr/rsc/nacl/av/Makefile b/src/pkg/exp/nacl/av/Makefile
index 523a9fff1..743658b25 100644
--- a/usr/rsc/nacl/av/Makefile
+++ b/src/pkg/exp/nacl/av/Makefile
@@ -4,7 +4,7 @@
include $(GOROOT)/src/Make.$(GOARCH)
-TARG=nacl/av
+TARG=exp/nacl/av
GOFILES=\
av.go\
event.go\
diff --git a/usr/rsc/nacl/av/av.go b/src/pkg/exp/nacl/av/av.go
index 0accf4612..9adc582fd 100644
--- a/usr/rsc/nacl/av/av.go
+++ b/src/pkg/exp/nacl/av/av.go
@@ -13,9 +13,9 @@ package av
import (
"bytes";
- "draw";
+ "exp/draw";
+ "exp/nacl/srpc";
"log";
- "nacl/srpc";
"os";
"syscall";
"unsafe";
diff --git a/usr/rsc/nacl/av/event.go b/src/pkg/exp/nacl/av/event.go
index 62ecbc6e6..32b73badc 100644
--- a/usr/rsc/nacl/av/event.go
+++ b/src/pkg/exp/nacl/av/event.go
@@ -12,7 +12,7 @@ package av
import (
"bytes";
"debug/binary";
- "draw";
+ "exp/draw";
"log";
"os";
"time";
diff --git a/usr/rsc/nacl/av/image.go b/src/pkg/exp/nacl/av/image.go
index 3aee3cad0..3aee3cad0 100644
--- a/usr/rsc/nacl/av/image.go
+++ b/src/pkg/exp/nacl/av/image.go
diff --git a/usr/rsc/nacl/srpc/Makefile b/src/pkg/exp/nacl/srpc/Makefile
index 9014d2c3a..d30ae7d13 100644
--- a/usr/rsc/nacl/srpc/Makefile
+++ b/src/pkg/exp/nacl/srpc/Makefile
@@ -4,7 +4,7 @@
include $(GOROOT)/src/Make.$(GOARCH)
-TARG=nacl/srpc
+TARG=exp/nacl/srpc
GOFILES=\
client.go\
msg.go\
diff --git a/usr/rsc/nacl/srpc/client.go b/src/pkg/exp/nacl/srpc/client.go
index 4c375fe2a..4c375fe2a 100644
--- a/usr/rsc/nacl/srpc/client.go
+++ b/src/pkg/exp/nacl/srpc/client.go
diff --git a/usr/rsc/nacl/srpc/msg.go b/src/pkg/exp/nacl/srpc/msg.go
index 27fe7212f..27fe7212f 100644
--- a/usr/rsc/nacl/srpc/msg.go
+++ b/src/pkg/exp/nacl/srpc/msg.go
diff --git a/usr/rsc/nacl/srpc/server.go b/src/pkg/exp/nacl/srpc/server.go
index c4dc0a6c7..c4dc0a6c7 100644
--- a/usr/rsc/nacl/srpc/server.go
+++ b/src/pkg/exp/nacl/srpc/server.go