From c6a302283cee53d113d88db89c0a242576dbc8c4 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 13 六月 2020 10:15:50 +0800
Subject: [PATCH] 修改包路径
---
service/Makefile | 8 +++++---
.gitignore | 2 --
lib/hc/HCNetSDKCom/libHCPreview.so | 0
lib/hc/HCNetSDKCom/libStreamTransClient.so | 0
lib/hc/HCNetSDKCom/libHCAlarm.so | 0
lib/hc/HCNetSDKCom/libHCPlayBack.so | 0
service/netdisk_service | 0
lib/hc/libhcnetsdk.so | 0
lib/hc/HCNetSDKCom/libSystemTransform.so | 0
lib/hc/HCNetSDKCom/libHCCoreDevCfg.so | 0
service/netdisk_service.c | 2 +-
lib/hc/libssl.so | 0
service/test_client | 0
lib/hc/HCNetSDKCom/libHCDisplay.so | 0
lib/hc/libhpr.so | 0
lib/hc/HCNetSDKCom/libHCVoiceTalk.so | 0
lib/hc/libHCCore.so | 0
device/libnetdisk.a | 0
lib/hc/HCNetSDK_Log_Switch.xml | 0
lib/hc/libcrypto.so | 0
lib/hc/HCNetSDKCom/libHCIndustry.so | 0
lib/hc/libz.so | 0
lib/hc/libPlayCtrl.so | 0
service/test_queue | 0
lib/hc/libAudioRender.so | 0
device/Makefile | 4 ++--
lib/hc/HCNetSDKCom/libiconv2.so | 0
lib/hc/libopenal.so.1 | 0
data/config.txt | 3 ---
lib/hc/HCNetSDKCom/libHCGeneralCfgMgr.so | 0
device/libnetdisk.so | 0
common/libusgcommon.so | 0
service/test_properties | 0
lib/hc/libNPQos.so | 0
lib/hc/libSuperRender.so | 0
/dev/null | 0
lib/hc/HCNetSDKCom/libanalyzedata.so | 0
common/libusgcommon.a | 0
lib/hc/libcrypto.so.1.0.0 | 0
service/test | 0
40 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2cd7b4f..59e0058 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,5 +32,3 @@
*.tar.gz
.vscode/
build/
-*.a
-*.so
diff --git a/common/libusgcommon.a b/common/libusgcommon.a
index db39a60..c87dc00 100644
--- a/common/libusgcommon.a
+++ b/common/libusgcommon.a
Binary files differ
diff --git a/common/libusgcommon.so b/common/libusgcommon.so
index c11f6c2..d5abb78 100755
--- a/common/libusgcommon.so
+++ b/common/libusgcommon.so
Binary files differ
diff --git a/data/config.txt b/data/config.txt
index 87c54c2..5280a71 100644
--- a/data/config.txt
+++ b/data/config.txt
@@ -4,8 +4,5 @@
# nng杩滅▼璋冪敤鍦板潃鍦板潃
remote_url=tcp://127.0.0.1:9988
-# 娴峰悍鍖呰矾寰�
-hclib=../hclib/
-
# 璐熻矗涓嬭浇浠诲姟鐨勭嚎绋嬫睜鐨勬暟閲�
workers=4
\ No newline at end of file
diff --git a/device/Makefile b/device/Makefile
index f638738..957beba 100644
--- a/device/Makefile
+++ b/device/Makefile
@@ -2,8 +2,8 @@
# Makefile for common library.
#
ROOT=..
-LDLIBS+=-Wl,-rpath=../hclib:../hclib/HCNetSDKCom:../common
-LDDIR += -L../hclib -L../hclib/HCNetSDKCom
+LDLIBS+=-Wl,-rpath=$(ROOT)/lib/hc:$(ROOT)/lib/hc/HCNetSDKCom:$(ROOT)/common
+LDDIR += -L$(ROOT)/lib/hc -L$(ROOT)/lib/hc/HCNetSDKCom
LDLIBS += -lhcnetsdk -lhpr -lHCCore
LDLIBS += -lpthread -ljsoncpp
LIB_NETDISK = libnetdisk.a
diff --git a/device/libhcnetdisk.a b/device/libhcnetdisk.a
deleted file mode 100644
index 0a5b6ac..0000000
--- a/device/libhcnetdisk.a
+++ /dev/null
Binary files differ
diff --git a/device/libhcnetdisk.so b/device/libhcnetdisk.so
deleted file mode 100755
index beb2e12..0000000
--- a/device/libhcnetdisk.so
+++ /dev/null
Binary files differ
diff --git a/device/libnetdisk.a b/device/libnetdisk.a
index 65d3de0..a9a36a5 100644
--- a/device/libnetdisk.a
+++ b/device/libnetdisk.a
Binary files differ
diff --git a/device/libnetdisk.so b/device/libnetdisk.so
index 5ec8068..da14a11 100755
--- a/device/libnetdisk.so
+++ b/device/libnetdisk.so
Binary files differ
diff --git a/device/test b/device/test
deleted file mode 100755
index 2835ae5..0000000
--- a/device/test
+++ /dev/null
Binary files differ
diff --git a/hclib/HCNetSDKCom/libHCAlarm.so b/lib/hc/HCNetSDKCom/libHCAlarm.so
similarity index 100%
rename from hclib/HCNetSDKCom/libHCAlarm.so
rename to lib/hc/HCNetSDKCom/libHCAlarm.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libHCCoreDevCfg.so b/lib/hc/HCNetSDKCom/libHCCoreDevCfg.so
similarity index 100%
rename from hclib/HCNetSDKCom/libHCCoreDevCfg.so
rename to lib/hc/HCNetSDKCom/libHCCoreDevCfg.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libHCDisplay.so b/lib/hc/HCNetSDKCom/libHCDisplay.so
similarity index 100%
rename from hclib/HCNetSDKCom/libHCDisplay.so
rename to lib/hc/HCNetSDKCom/libHCDisplay.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libHCGeneralCfgMgr.so b/lib/hc/HCNetSDKCom/libHCGeneralCfgMgr.so
similarity index 100%
rename from hclib/HCNetSDKCom/libHCGeneralCfgMgr.so
rename to lib/hc/HCNetSDKCom/libHCGeneralCfgMgr.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libHCIndustry.so b/lib/hc/HCNetSDKCom/libHCIndustry.so
similarity index 100%
rename from hclib/HCNetSDKCom/libHCIndustry.so
rename to lib/hc/HCNetSDKCom/libHCIndustry.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libHCPlayBack.so b/lib/hc/HCNetSDKCom/libHCPlayBack.so
similarity index 100%
rename from hclib/HCNetSDKCom/libHCPlayBack.so
rename to lib/hc/HCNetSDKCom/libHCPlayBack.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libHCPreview.so b/lib/hc/HCNetSDKCom/libHCPreview.so
similarity index 100%
rename from hclib/HCNetSDKCom/libHCPreview.so
rename to lib/hc/HCNetSDKCom/libHCPreview.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libHCVoiceTalk.so b/lib/hc/HCNetSDKCom/libHCVoiceTalk.so
similarity index 100%
rename from hclib/HCNetSDKCom/libHCVoiceTalk.so
rename to lib/hc/HCNetSDKCom/libHCVoiceTalk.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libStreamTransClient.so b/lib/hc/HCNetSDKCom/libStreamTransClient.so
similarity index 100%
rename from hclib/HCNetSDKCom/libStreamTransClient.so
rename to lib/hc/HCNetSDKCom/libStreamTransClient.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libSystemTransform.so b/lib/hc/HCNetSDKCom/libSystemTransform.so
similarity index 100%
rename from hclib/HCNetSDKCom/libSystemTransform.so
rename to lib/hc/HCNetSDKCom/libSystemTransform.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libanalyzedata.so b/lib/hc/HCNetSDKCom/libanalyzedata.so
similarity index 100%
rename from hclib/HCNetSDKCom/libanalyzedata.so
rename to lib/hc/HCNetSDKCom/libanalyzedata.so
Binary files differ
diff --git a/hclib/HCNetSDKCom/libiconv2.so b/lib/hc/HCNetSDKCom/libiconv2.so
similarity index 100%
rename from hclib/HCNetSDKCom/libiconv2.so
rename to lib/hc/HCNetSDKCom/libiconv2.so
Binary files differ
diff --git a/hclib/HCNetSDK_Log_Switch.xml b/lib/hc/HCNetSDK_Log_Switch.xml
similarity index 100%
rename from hclib/HCNetSDK_Log_Switch.xml
rename to lib/hc/HCNetSDK_Log_Switch.xml
diff --git a/hclib/libAudioRender.so b/lib/hc/libAudioRender.so
similarity index 100%
rename from hclib/libAudioRender.so
rename to lib/hc/libAudioRender.so
Binary files differ
diff --git a/hclib/libHCCore.so b/lib/hc/libHCCore.so
similarity index 100%
rename from hclib/libHCCore.so
rename to lib/hc/libHCCore.so
Binary files differ
diff --git a/hclib/libNPQos.so b/lib/hc/libNPQos.so
similarity index 100%
rename from hclib/libNPQos.so
rename to lib/hc/libNPQos.so
Binary files differ
diff --git a/hclib/libPlayCtrl.so b/lib/hc/libPlayCtrl.so
similarity index 100%
rename from hclib/libPlayCtrl.so
rename to lib/hc/libPlayCtrl.so
Binary files differ
diff --git a/hclib/libSuperRender.so b/lib/hc/libSuperRender.so
similarity index 100%
rename from hclib/libSuperRender.so
rename to lib/hc/libSuperRender.so
Binary files differ
diff --git a/hclib/libcrypto.so b/lib/hc/libcrypto.so
similarity index 100%
rename from hclib/libcrypto.so
rename to lib/hc/libcrypto.so
Binary files differ
diff --git a/hclib/libcrypto.so.1.0.0 b/lib/hc/libcrypto.so.1.0.0
similarity index 100%
rename from hclib/libcrypto.so.1.0.0
rename to lib/hc/libcrypto.so.1.0.0
Binary files differ
diff --git a/hclib/libhcnetsdk.so b/lib/hc/libhcnetsdk.so
similarity index 100%
rename from hclib/libhcnetsdk.so
rename to lib/hc/libhcnetsdk.so
Binary files differ
diff --git a/hclib/libhpr.so b/lib/hc/libhpr.so
similarity index 100%
rename from hclib/libhpr.so
rename to lib/hc/libhpr.so
Binary files differ
diff --git a/hclib/libopenal.so.1 b/lib/hc/libopenal.so.1
similarity index 100%
rename from hclib/libopenal.so.1
rename to lib/hc/libopenal.so.1
Binary files differ
diff --git a/hclib/libssl.so b/lib/hc/libssl.so
similarity index 100%
rename from hclib/libssl.so
rename to lib/hc/libssl.so
Binary files differ
diff --git a/hclib/libz.so b/lib/hc/libz.so
similarity index 100%
rename from hclib/libz.so
rename to lib/hc/libz.so
Binary files differ
diff --git a/service/Makefile b/service/Makefile
index 9fa2483..452d39d 100644
--- a/service/Makefile
+++ b/service/Makefile
@@ -2,9 +2,11 @@
# Makefile for common library.
#
ROOT=..
-LDLIBS+=-Wl,-rpath=$(ROOT)/hclib:$(ROOT)/hclib/HCNetSDKCom:$(ROOT)/common:$(ROOT)/device
-LDDIR += -L$(ROOT)/device -L$(ROOT)/hclib -L$(ROOT)/hclib/HCNetSDKCom
-LDLIBS += -lnetdisk
+LDLIBS+=-Wl,-rpath=$(ROOT)/lib/hc:$(ROOT)/lib/hc/HCNetSDKCom:$(ROOT)/common
+# 娴峰悍鍖呰矾寰�
+LDDIR += -L$(ROOT)/lib/hc -L$(ROOT)/lib/hc/HCNetSDKCom
+LDLIBS +=
+# 娴峰悍鍖�
LDLIBS += -lhcnetsdk -lhpr -lHCCore
LDLIBS += -ljsoncpp -lnng -lpthread
diff --git a/service/core b/service/core
deleted file mode 100644
index cdb796e..0000000
--- a/service/core
+++ /dev/null
Binary files differ
diff --git a/service/netdisk_service b/service/netdisk_service
index 69ed2d4..aa7df14 100755
--- a/service/netdisk_service
+++ b/service/netdisk_service
Binary files differ
diff --git a/service/netdisk_service.c b/service/netdisk_service.c
index 7ed52da..5e322dc 100644
--- a/service/netdisk_service.c
+++ b/service/netdisk_service.c
@@ -206,7 +206,7 @@
//娴峰悍璁惧鐜鍒濆鍖�
Netdisk_EnvConfig hcEnvConfig;
- hcEnvConfig.libpath = config.get("hclib");
+ hcEnvConfig.libpath = "../lib/hc";
HCNetdisk::netdisk_init(&hcEnvConfig);
diff --git a/service/test b/service/test
index 4718aae..a400c13 100755
--- a/service/test
+++ b/service/test
Binary files differ
diff --git a/service/test_client b/service/test_client
index 87a2890..b186451 100755
--- a/service/test_client
+++ b/service/test_client
Binary files differ
diff --git a/service/test_properties b/service/test_properties
index 6b1a2fb..8b9c3f1 100755
--- a/service/test_properties
+++ b/service/test_properties
Binary files differ
diff --git a/service/test_queue b/service/test_queue
index d11beb0..47f3dd8 100755
--- a/service/test_queue
+++ b/service/test_queue
Binary files differ
--
Gitblit v1.8.0