Explorar o código

change sh/automake for agx automake.

yuchuli %!s(int64=3) %!d(string=hai) anos
pai
achega
aae4b44762

+ 25 - 7
sh/automake/autodeploy.sh

@@ -12,10 +12,14 @@ controller_problue
 controller_ge3
 controller_vv7
 controller_tju_vv7
+controller_hapo
+#controller_yuhesen
 decition_brain
+decition_brain_sf
 driver_camera_usb
-driver_can_kvaser
-driver_can_vci
+driver_camera_ioctl
+#driver_can_kvaser
+#driver_can_vci
 driver_can_nvidia_agx
 driver_cloud_grpc_client_stream
 driver_grpc_server
@@ -30,15 +34,21 @@ driver_lidar_rs32
 driver_lidar_vlp16
 driver_lidar_vlp32c
 driver_lidar_vtdpoint
+driver_lidar_rsm1
 driver_map_trace
 driver_map_xodrload
+driver_ntrip_client
 driver_piccompress
 driver_radio_p900
-driver_rpc_client
-driver_rpc_server
+driver_odomtogpsimu
+#driver_rpc_client
+#driver_rpc_server
 driver_vbox_gaohong
 driver_ota_client
-driver_ota_server
+#driver_ota_server
+driver_grpc_client
+driver_grpc_server
+driver_group_grpc_client
 detection_chassis
 detection_gps_hcp2
 detection_gps_vtd
@@ -77,7 +87,14 @@ view_radar
 view_rawcan
 ui_ads_hmi
 tool_configivsysman
-RemoteCtrl_Stream
+#RemoteCtrl_Stream
+ivdiagnosis
+map_rtkdatafromveh
+picview_civetweb
+tool_trace2vectormap
+view_group_grpc
+view_ivchart
+view_message
 )
 
 for x in ${app_name[@]}
@@ -129,7 +146,8 @@ for fileName in $xlib
      patchelf --set-rpath '$ORIGIN' $fileName
   done
 
-   
+
+cp /usr/lib/aarch64-linux-gnu/nss/libsoftokn3.so  ./deploy/app/lib    #for use webengine program  
 
 #echo "creat IVSysMan.xml"
 #cp ./sh/tju64/xml/$CONFIG_IVSysMan ./deploy/app/IVSysMan.xml

+ 29 - 2
sh/automake/autogen.sh

@@ -137,6 +137,15 @@ rm Makefile
 rm .qmake.stash
 cd ../../../
 
+cd src/common/makeprotointerface/
+$qtmake makeprotointerface.pro
+make $MAKEOPT
+make clean
+cp makeprotointerface ./../../../bin/
+rm Makefile
+rm .qmake.stash
+cd ../../../
+
 controller_app_name=(
 controller_bus
 controller_jinlong_peisong
@@ -145,6 +154,8 @@ controller_problue
 controller_ge3
 controller_vv7
 controller_tju_vv7
+controller_hapo
+#controller_yuhesen
 )
 
 for x in ${controller_app_name[@]}
@@ -162,6 +173,7 @@ done
 
 decition_app_name=(
 decition_brain
+decition_brain_sf
 )
 
 for x in ${decition_app_name[@]}
@@ -179,9 +191,10 @@ done
 
 driver_app_name=(
 driver_camera_usb
-driver_can_kvaser
-driver_can_vci
+#driver_can_kvaser
+#driver_can_vci
 driver_can_nvidia_agx
+driver_camera_ioctl
 #driver_cloud_grpc_client
 #driver_cloud_grpc_pc
 #driver_cloud_grpc_server
@@ -196,13 +209,20 @@ driver_lidar_rs32
 driver_lidar_vlp16
 driver_lidar_vlp32c
 driver_lidar_vtdpoint
+driver_lidar_rsm1
 driver_map_trace
 driver_map_xodrload
 driver_piccompress
 driver_radio_p900
+driver_ntrip_client
+driver_odomtogpsimu
 #driver_rpc_client
 #driver_rpc_server
 driver_vbox_gaohong
+driver_ota_client
+driver_grpc_client
+driver_grpc_server
+driver_group_grpc_client
 )
 
 for x in ${driver_app_name[@]}
@@ -289,6 +309,13 @@ view_pcdmap
 view_radar
 view_rawcan
 tool_configivsysman
+ivdiagnosis
+map_rtkdatafromveh
+picview_civetweb
+tool_trace2vectormap
+view_group_grpc
+view_ivchart
+view_message
 )
 
 for x in ${tool_app_name[@]}

+ 1 - 1
sh/automake/automake_agx.sh

@@ -37,7 +37,7 @@ else
     	echo "$VERSIONCODE" >> appversion.md
 	cd ..
 	git add -u
-	git commit -m "automake  change app.zip"
+	git commit -m "automake  change app.zip code version:$VERSIONCODE"
 	git push
 	cd ../modularization/sh/automake
 fi

+ 1 - 1
src/driver/driver_piccompress/main.cpp

@@ -5,7 +5,7 @@
 #include <opencv2/opencv.hpp>
 #include <opencv2/core.hpp>
 
-#ifdef arc_agx
+#ifdef SYSTEM_AGX
 #include "opencv2/imgcodecs/legacy/constants_c.h"
 #include <opencv2/imgproc/types_c.h>
 

+ 2 - 0
src/tool/ivdiagnosis/ivdiagnosis.pro

@@ -11,6 +11,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = ivdiagnosis
 TEMPLATE = app
 
+QMAKE_LFLAGS += -no-pie
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the

+ 1 - 0
src/tool/tool_calcmd5/tool_calcmd5.pro

@@ -9,6 +9,7 @@ CONFIG += c++11
 # depend on your compiler). Please consult the documentation of the
 # deprecated API in order to know how to port your code away from it.
 DEFINES += QT_DEPRECATED_WARNINGS
+QMAKE_LFLAGS += -no-pie
 
 # You can also make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.

+ 1 - 0
src/tool/view_ivchart/view_ivchart.pro

@@ -9,6 +9,7 @@ CONFIG += c++11
 # depend on your compiler). Please consult the documentation of the
 # deprecated API in order to know how to port your code away from it.
 DEFINES += QT_DEPRECATED_WARNINGS
+QMAKE_LFLAGS += -no-pie
 
 # You can also make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.