Re-work cabal-build-all for build commands

cardano-community · Jun 28, 2022 · cf3031e · cf3031e
1 parent 33baaf7
commit cf3031e
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/scripts/cnode-helper-scripts/cabal-build-all.sh b/scripts/cnode-helper-scripts/cabal-build-all.sh
@@ -6,7 +6,8 @@
 echo "Deleting build config artifact to remove cached version, this prevents invalid Git Rev"
 find dist-newstyle/build/x86_64-linux/ghc-8.10.?/cardano-config-* >/dev/null 2>&1 && rm -rf "dist-newstyle/build/x86_64-linux/ghc-8.*/cardano-config-*"
 
-source "${HOME}"/.bashrc
+[[ -f /usr/lib/libsecp256k1.so ]] && export LD_LIBRARY_PATH=/usr/lib:"${LD_LIBRARY_PATH}"
+[[ -f /usr/lib/pkgconfig/libsecp256k1.pc ]] && export PKG_CONFIG_PATH=/usr/lib/pkgconfig:"${PKG_CONFIG_PATH}"
 
 if [[ "$1" == "-l" ]] ; then
   USE_SYSTEM_LIBSODIUM="package cardano-crypto-praos
@@ -61,25 +62,29 @@ cat <<-EOF > .tmp.cabal.project.local
 	EOF
 chmod 640 .tmp.cabal.project.local
 
-if [[ -z "${USE_SYSTEM_LIBSODIUM}" ]] ; then
-  echo "Running cabal update to ensure you're on latest dependencies.."
-  cabal update 2>&1 | tee /tmp/cabal-update.log
-  echo "Building.."
-  cabal build all 2>&1 | tee tee /tmp/build.log
+echo "Running cabal update to ensure you're on latest dependencies.."
+cabal update 2>&1 | tee /tmp/cabal-update.log
+echo "Building.."
+
+if [[ -z "${USE_SYSTEM_LIBSODIUM}" ]] ; then # Build using default cabal.project first and then add cabal.project.local for additional packages
   if [[ "${PWD##*/}" == "cardano-node" ]] || [[ "${PWD##*/}" == "cardano-db-sync" ]]; then
     echo "Overwriting cabal.project.local to include cardano-addresses and bech32 .."
     mv .tmp.cabal.project.local cabal.project.local
+    [[ "${PWD##*/}" == "cardano-node" ]] && cabal build cardano-node cardano-cli cardano-ping cardano-submit-api --disable-tests --disable-coverage
+    [[ "${PWD##*/}" == "cardano-db-sync" ]] && cabal build cardano-db-sync --disable-tests --disable-coverage
     cabal install bech32 cardano-addresses-cli  --overwrite-policy=always 2>&1 | tee /tmp/build-b32-caddr.log
+  else
+    cabal build all --disable-tests --disable-coverage 2>&1 | tee tee /tmp/build.log
   fi
-else
+else # Add cabal.project.local customisations first before building
   if [[ "${PWD##*/}" == "cardano-node" ]] || [[ "${PWD##*/}" == "cardano-db-sync" ]]; then
     echo "Overwriting cabal.project.local to include cardano-addresses and bech32 .."
     mv .tmp.cabal.project.local cabal.project.local
+    [[ "${PWD##*/}" == "cardano-node" ]] && cabal build cardano-node cardano-cli cardano-ping cardano-submit-api --disable-tests --disable-coverage
+    [[ "${PWD##*/}" == "cardano-db-sync" ]] && cabal build cardano-db-sync --disable-tests --disable-coverage
+  else
+    cabal build all --disable-tests --disable-coverage 2>&1 | tee tee /tmp/build.log
   fi
-  echo "Running cabal update to ensure you're on latest dependencies.."
-  cabal update 2>&1 | tee /tmp/cabal-update.log
-  echo "Building.."
-  cabal build all 2>&1 | tee tee /tmp/build.log
   [[ -f cabal.project.local ]] && cabal install bech32 cardano-addresses-cli  --overwrite-policy=always 2>&1 | tee /tmp/build-b32-caddr.log
 fi