From 5d8dde92454b62bed642ca1dc8d43f0e73b4601b Mon Sep 17 00:00:00 2001
From: Scott Mindock <srmindock@wisc.edu>
Date: Tue, 26 Mar 2024 16:30:29 +0000
Subject: [PATCH] Users stuff
---
distro/scripts/adl_cots.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/distro/scripts/adl_cots.sh b/distro/scripts/adl_cots.sh
index f11a8ff..9904d3a 100755
--- a/distro/scripts/adl_cots.sh
+++ b/distro/scripts/adl_cots.sh
@@ -345,7 +345,8 @@ mk_gtest()
mk_proto()
{
echo ${FUNCNAME[0]}
- PATH=/CSPP_SDR_4_0/JAVA_COTS/jdk1.8.0_73/bin/:$PATH
+ export PATH=/CSPP_SDR_4_0/JAVA_COTS/jdk1.8.0_73/bin/:$PATH
+
tar_name=protobuf-3.8.x.zip && \
rm -fr ${BUILD}/protobuf* && \
rm -fr ${USER_COTS_PATH}//google/protobuf && \
@@ -363,13 +364,14 @@ mk_proto()
make install && \
LIB=${BUILD}/protobuf-3.8/lib && \
echo "Now java part" && \
+ find /CSPP_SDR_4_0 -iname "javac" && \
cd ${BUILD}/protobuf*/java && \
export LD_LIBRARY_PATH=${USER_COTS_PATH}/lib && \
export LD_RUN_PATH=${USER_COTS_PATH}/lib && \
${USER_COTS_PATH}/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto && \
cd ${BUILD}/protobuf* && \
cd java/core/src/main/java/com/google/protobuf && \
- javac *.java && \
+ /CSPP_SDR_4_0/JAVA_COTS/jdk1.8.0_73/bin/javac *.java && \
cd ${BUILD}/protobuf* && \
cd java/core/src/main/java && \
jar cf ${USER_COTS_PATH}/lib/protobuf-java-3.8.0.jar com/google/protobuf/*.class && \
--
GitLab