Users stuff

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 && \