move native client to exp/nacl.

R=r
DELTA=3706  (1857 added, 1849 deleted, 0 changed)
OCL=35731
CL=35741

diff --git a/src/all-nacl.bash b/src/all-nacl.bash
index 6a1a206c1107fe40a562985a0f980092fa4af74c..9270b5d20c5f0bf2dd46cc786f8bc29a5dca6d03 100644 (file)
--- 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
similarity index 94%
rename from usr/rsc/nacl/av/Makefile
rename to src/pkg/exp/nacl/av/Makefile
index 523a9fff19b221e23db5565b45db8281e8221619..743658b25b766dcf1a5d3486643ad7207c63a542 100644 (file)
--- 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
similarity index 99%
rename from usr/rsc/nacl/av/av.go
rename to src/pkg/exp/nacl/av/av.go
index 0accf46126aa05b50f7da706d3c82ebcdfe400d1..9adc582fd48612bbc25b8f81a70fa2479687bfbf 100644 (file)
--- 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
similarity index 99%
rename from usr/rsc/nacl/av/event.go
rename to src/pkg/exp/nacl/av/event.go
index 62ecbc6e6028240b6dcdb7da0db71ca681632027..32b73badc07f9f52f3008616acacbf432031da1c 100644 (file)
--- 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
similarity index 100%
rename from usr/rsc/nacl/av/image.go
rename to src/pkg/exp/nacl/av/image.go

diff --git a/usr/rsc/nacl/srpc/Makefile b/src/pkg/exp/nacl/srpc/Makefile
similarity index 93%
rename from usr/rsc/nacl/srpc/Makefile
rename to src/pkg/exp/nacl/srpc/Makefile
index 9014d2c3a83f53f1a6dcb9bfaa255fb637eb924c..d30ae7d13d53f06c00b575808f8b8dd312840e5e 100644 (file)
--- 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
similarity index 100%
rename from usr/rsc/nacl/srpc/client.go
rename to src/pkg/exp/nacl/srpc/client.go

diff --git a/usr/rsc/nacl/srpc/msg.go b/src/pkg/exp/nacl/srpc/msg.go
similarity index 100%
rename from usr/rsc/nacl/srpc/msg.go
rename to src/pkg/exp/nacl/srpc/msg.go

diff --git a/usr/rsc/nacl/srpc/server.go b/src/pkg/exp/nacl/srpc/server.go
similarity index 100%
rename from usr/rsc/nacl/srpc/server.go
rename to src/pkg/exp/nacl/srpc/server.go