From 7c3e6e8e865e8e1f9c34ac5a17d0032946b81aeb Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 1 Dec 2018 09:59:08 -0800
Subject: [PATCH] Move bpf-sdk to sdk/bpf

---
 ci/publish-bpf-sdk.sh                                        | 2 +-
 programs/bpf/c/makefile                                      | 5 +++--
 programs/native/bpf_loader/build.rs                          | 5 +++--
 {programs/bpf/c/sdk => sdk/bpf}/.gitignore                   | 0
 {programs/bpf/c/sdk => sdk/bpf}/README.md                    | 0
 {programs/bpf/c/sdk => sdk/bpf}/bpf.mk                       | 0
 {programs/bpf/c/sdk => sdk/bpf}/inc/solana_sdk.h             | 0
 {programs/bpf/c/sdk => sdk/bpf}/inc/stdio.h                  | 0
 {programs/bpf/c/sdk => sdk/bpf}/inc/stdlib.h                 | 0
 {programs/bpf/c/sdk => sdk/bpf}/inc/string.h                 | 0
 {programs/bpf/c/sdk => sdk/bpf}/inc/sys/param.h              | 0
 {programs/bpf/c/sdk => sdk/bpf}/inc/wchar.h                  | 0
 {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/bin/clang        | 0
 {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/bin/clang++      | 0
 {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/bin/llc          | 0
 {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/bin/llvm-objdump | 0
 {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/generate.sh      | 0
 {programs/bpf/c/sdk => sdk/bpf}/scripts/install.sh           | 0
 {programs/bpf/c/sdk => sdk/bpf}/scripts/package.sh           | 0
 19 files changed, 7 insertions(+), 5 deletions(-)
 rename {programs/bpf/c/sdk => sdk/bpf}/.gitignore (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/README.md (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/bpf.mk (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/inc/solana_sdk.h (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/inc/stdio.h (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/inc/stdlib.h (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/inc/string.h (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/inc/sys/param.h (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/inc/wchar.h (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/bin/clang (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/bin/clang++ (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/bin/llc (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/bin/llvm-objdump (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/llvm/docker/generate.sh (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/scripts/install.sh (100%)
 rename {programs/bpf/c/sdk => sdk/bpf}/scripts/package.sh (100%)

diff --git a/ci/publish-bpf-sdk.sh b/ci/publish-bpf-sdk.sh
index dec67055a..59913a0b9 100755
--- a/ci/publish-bpf-sdk.sh
+++ b/ci/publish-bpf-sdk.sh
@@ -15,7 +15,7 @@ fi
 echo --- Creating tarball
 (
   set -x
-  programs/bpf/c/sdk/scripts/package.sh
+  sdk/bpf/scripts/package.sh
   [[ -f bpf-sdk.tar.bz2 ]]
 )
 
diff --git a/programs/bpf/c/makefile b/programs/bpf/c/makefile
index 5c99cdec1..8c906f7ad 100644
--- a/programs/bpf/c/makefile
+++ b/programs/bpf/c/makefile
@@ -1,2 +1,3 @@
-$(shell ./sdk/scripts/install.sh)
-include sdk/bpf.mk
+BPF_SDK := ../../../sdk/bpf
+$(shell $(BPF_SDK)/scripts/install.sh)
+include $(BPF_SDK)/bpf.mk
diff --git a/programs/native/bpf_loader/build.rs b/programs/native/bpf_loader/build.rs
index c99c2582f..3d12b214e 100644
--- a/programs/native/bpf_loader/build.rs
+++ b/programs/native/bpf_loader/build.rs
@@ -11,8 +11,9 @@ fn main() {
             + &env::var("PROFILE").unwrap()
             + &"/bpf".to_string();
 
-        println!("cargo:rerun-if-changed=../../bpf/c/sdk/bpf.mk");
-        println!("cargo:rerun-if-changed=../../bpf/c/sdk/inc/solana_sdk.h");
+        println!("cargo:rerun-if-changed=../../../sdk/bpf/bpf.mk");
+        println!("cargo:rerun-if-changed=../../../sdk/bpf/inc/solana_sdk.h");
+
         println!("cargo:rerun-if-changed=../../bpf/c/makefile");
         println!("cargo:rerun-if-changed=../../bpf/c/src/bench_alu.c");
         println!("cargo:rerun-if-changed=../../bpf/c/src/move_funds.c");
diff --git a/programs/bpf/c/sdk/.gitignore b/sdk/bpf/.gitignore
similarity index 100%
rename from programs/bpf/c/sdk/.gitignore
rename to sdk/bpf/.gitignore
diff --git a/programs/bpf/c/sdk/README.md b/sdk/bpf/README.md
similarity index 100%
rename from programs/bpf/c/sdk/README.md
rename to sdk/bpf/README.md
diff --git a/programs/bpf/c/sdk/bpf.mk b/sdk/bpf/bpf.mk
similarity index 100%
rename from programs/bpf/c/sdk/bpf.mk
rename to sdk/bpf/bpf.mk
diff --git a/programs/bpf/c/sdk/inc/solana_sdk.h b/sdk/bpf/inc/solana_sdk.h
similarity index 100%
rename from programs/bpf/c/sdk/inc/solana_sdk.h
rename to sdk/bpf/inc/solana_sdk.h
diff --git a/programs/bpf/c/sdk/inc/stdio.h b/sdk/bpf/inc/stdio.h
similarity index 100%
rename from programs/bpf/c/sdk/inc/stdio.h
rename to sdk/bpf/inc/stdio.h
diff --git a/programs/bpf/c/sdk/inc/stdlib.h b/sdk/bpf/inc/stdlib.h
similarity index 100%
rename from programs/bpf/c/sdk/inc/stdlib.h
rename to sdk/bpf/inc/stdlib.h
diff --git a/programs/bpf/c/sdk/inc/string.h b/sdk/bpf/inc/string.h
similarity index 100%
rename from programs/bpf/c/sdk/inc/string.h
rename to sdk/bpf/inc/string.h
diff --git a/programs/bpf/c/sdk/inc/sys/param.h b/sdk/bpf/inc/sys/param.h
similarity index 100%
rename from programs/bpf/c/sdk/inc/sys/param.h
rename to sdk/bpf/inc/sys/param.h
diff --git a/programs/bpf/c/sdk/inc/wchar.h b/sdk/bpf/inc/wchar.h
similarity index 100%
rename from programs/bpf/c/sdk/inc/wchar.h
rename to sdk/bpf/inc/wchar.h
diff --git a/programs/bpf/c/sdk/llvm/docker/bin/clang b/sdk/bpf/llvm/docker/bin/clang
similarity index 100%
rename from programs/bpf/c/sdk/llvm/docker/bin/clang
rename to sdk/bpf/llvm/docker/bin/clang
diff --git a/programs/bpf/c/sdk/llvm/docker/bin/clang++ b/sdk/bpf/llvm/docker/bin/clang++
similarity index 100%
rename from programs/bpf/c/sdk/llvm/docker/bin/clang++
rename to sdk/bpf/llvm/docker/bin/clang++
diff --git a/programs/bpf/c/sdk/llvm/docker/bin/llc b/sdk/bpf/llvm/docker/bin/llc
similarity index 100%
rename from programs/bpf/c/sdk/llvm/docker/bin/llc
rename to sdk/bpf/llvm/docker/bin/llc
diff --git a/programs/bpf/c/sdk/llvm/docker/bin/llvm-objdump b/sdk/bpf/llvm/docker/bin/llvm-objdump
similarity index 100%
rename from programs/bpf/c/sdk/llvm/docker/bin/llvm-objdump
rename to sdk/bpf/llvm/docker/bin/llvm-objdump
diff --git a/programs/bpf/c/sdk/llvm/docker/generate.sh b/sdk/bpf/llvm/docker/generate.sh
similarity index 100%
rename from programs/bpf/c/sdk/llvm/docker/generate.sh
rename to sdk/bpf/llvm/docker/generate.sh
diff --git a/programs/bpf/c/sdk/scripts/install.sh b/sdk/bpf/scripts/install.sh
similarity index 100%
rename from programs/bpf/c/sdk/scripts/install.sh
rename to sdk/bpf/scripts/install.sh
diff --git a/programs/bpf/c/sdk/scripts/package.sh b/sdk/bpf/scripts/package.sh
similarity index 100%
rename from programs/bpf/c/sdk/scripts/package.sh
rename to sdk/bpf/scripts/package.sh