Remove do.sh

programs/bpf/build.rs

@@ -94,16 +94,16 @@ fn main() {
                 program
             );
             assert!(Command::new("bash")
-                .current_dir("rust")
-                .args(&["./do.sh", "build", program])
+                .current_dir(format!("rust/{}", program))
+                .args(&["../../../../cargo-build-bpf"])
                 .status()
-                .expect("Error calling do.sh from build.rs")
+                .expect("Error calling cargo-build-bpf from build.rs")
                 .success());
             let src = format!(
-                "target/bpfel-unknown-unknown/release/solana_bpf_rust_{}.so",
+                "rust/{0}/solana_bpf_rust_{0}.so",
                 program,
             );
-            assert!(Command::new("cp")
+            assert!(Command::new("mv")
                 .arg(&src)
                 .arg(&install_dir)
                 .status()

programs/bpf/rust/128bit/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-128bit"

programs/bpf/rust/128bit_dep/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-128bit-dep"

programs/bpf/rust/alloc/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-alloc"

programs/bpf/rust/call_depth/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-call-depth"

programs/bpf/rust/custom_heap/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-custom-heap"

programs/bpf/rust/dep_crate/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-dep-crate"

programs/bpf/rust/deprecated_loader/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-deprecated_loader"

programs/bpf/rust/dup_accounts/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-dup-accounts"

programs/bpf/rust/error_handling/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-error-handling"

programs/bpf/rust/external_spend/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-external-spend"

programs/bpf/rust/instruction_introspection/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-instruction-introspection"

programs/bpf/rust/invoke/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-invoke"

programs/bpf/rust/invoked/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-invoked"

programs/bpf/rust/iter/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-iter"

programs/bpf/rust/many_args/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-many-args"

programs/bpf/rust/many_args_dep/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-many-args-dep"

programs/bpf/rust/noop/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-noop"

programs/bpf/rust/panic/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-panic"

programs/bpf/rust/param_passing/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-param-passing"

programs/bpf/rust/param_passing_dep/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-param-passing-dep"

programs/bpf/rust/rand/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-rand"

programs/bpf/rust/ristretto/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-ristretto"

programs/bpf/rust/sanity/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-sanity"

programs/bpf/rust/sha256/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-sha256"

programs/bpf/rust/sysval/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-sysval"

sdk/bpf/scripts/bpf-trace.py

@@ -1,14 +1,13 @@
 #!/usr/bin/env python
 
-# 
+#
 # Prints a BPF program call trace with instruction counts for each call
 #
 # This script requires a dump file containing the instruction dump of the ELF
 # and a trace file that contains the trace output of the BPF VM
 #
-# You can create the dump file with do.sh:
-#  $ do.sh dump <project>
-# Or directly:
+# You can create the dump file by passing the --dump flag to `cargo build-bpf`,
+# or directly:
 #  $ llvm-objdump -print-imm-hex --source --disassemble <ELF file path>
 #
 # You can create the trace file by running the program and setting RUST_LOG:
@@ -53,7 +52,7 @@ def parse_line(rxs, line):
         sys.exit('    Usage: ' + sys.argv[0] + ' dump_file trace_file')
     dumppath = sys.argv[1]
     tracepath = sys.argv[2]
-    
+
     # parse the dump file to create a map
     # of instruction numbers to symbols
     symbols = {}
@@ -76,7 +75,7 @@ def parse_line(rxs, line):
             line = file_object.readline()
     if len(symbols) == 0:
         sys.exit("Error: No instruction dump in: " + dumppath)
-    
+
     # parse the trace file to build a call list
     calls = [] # all the calls made
     with open(tracepath, 'r') as file_object: