commit d7893a19e365841fdc31d738d4d21cea7e3e14b9
author Anthony DiGirolamo <tonymd@google.com> Fri Apr 02 17:01:31 2021 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Apr 03 00:22:05 2021 +0000
tree 72ccb59713ef0be1e3f945a65c184e3f87258c81
parent b6f45f96027bf30882fc473d35daf9b1fa3ae09a

Move env setup to config file

Change-Id: I0fc3c405dab2c4e365977831219113f8306f3a81
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/39913
Reviewed-by: Keir Mierle <keir@google.com>
Commit-Queue: Anthony DiGirolamo <tonymd@google.com>

applications/tls_example/trust_store/ca_certificates_crls.h

diff --git a/applications/tls_example/trust_store/ca_certificates_crls.h b/applications/tls_example/trust_store/ca_certificates_crls.h
index 5129601..dd7d63f 100644
--- a/applications/tls_example/trust_store/ca_certificates_crls.h
+++ b/applications/tls_example/trust_store/ca_certificates_crls.h
@@ -11,9 +11,7 @@
 // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

 // License for the specific language governing permissions and limitations under

 // the License.

-

-#ifndef CA_CERTIFICATE_CRLS_H

-#define CA_CERTIFICATE_CRLS_H

+#pragma once

 

 #define GLOBAL_SIGN_CA_CRL                                               \

   "-----BEGIN X509 CRL-----\r\n"                                         \

@@ -70,5 +68,3 @@
   "-----END X509 CRL-----\r\n"

 

 std::span<const std::span<const unsigned char>> GetBuiltInRootCert();

-

-#endif  // CA_CERTIFICATE_CRLS_H

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 6cd0205..ea60edf 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -120,7 +120,7 @@
 # This is where pw_bootstrap is called. Most small projects will include
 # --use-pigweed-defaults.
 ######### BEGIN PROJECT-SPECIFIC CODE #########
-  pw_bootstrap --shell-file "$SETUP_SH" --install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" --use-pigweed-defaults --virtualenv-gn-target "$PW_PROJECT_ROOT#:python.install" --virtualenv-gn-out-dir "$PW_PROJECT_ROOT/out"
+  pw_bootstrap --shell-file "$SETUP_SH" --install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" --virtualenv-gn-out-dir "$PW_PROJECT_ROOT/out" --config-file "$PW_PROJECT_ROOT/env_setup.json"
 ########## END PROJECT-SPECIFIC CODE ##########
   pw_finalize bootstrap "$SETUP_SH"
 else

env_setup.json

diff --git a/env_setup.json b/env_setup.json
new file mode 100644
index 0000000..482b275
--- /dev/null
+++ b/env_setup.json
@@ -0,0 +1,12 @@
+{
+  "cipd_package_files": [
+    "third_party/pigweed/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
+    "third_party/pigweed/pw_env_setup/py/pw_env_setup/cipd_setup/luci.json"
+  ],
+  "virtualenv": {
+    "gn_root": ".",
+    "gn_targets": [
+      ":python.install"
+    ]
+  }
+}