Propagate inc and src merge

sonic-net · Aug 21, 2021 · 6942de0 · 6942de0
1 parent 378bfff
commit 6942de0
Show file tree

Hide file tree

Showing 26 changed files with 52 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,7 +76,6 @@ tests/swsslogentercheck.sh.trs
 tests/test-suite.log
 
 vslib/src/test-suite.log
-vslib/src/tests
 vslib/src/tests.log
 vslib/src/tests.trs
 
@@ -86,7 +85,8 @@ deps/
 
 # Executables #
 ###############
-lib/src/tests
+lib/tests
+vslib/tests
 meta/tests
 saidiscovery/saidiscovery
 saidump/saidump

diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = meta lib vslib pyext
+SUBDIRS = meta lib vslib
 
 if SYNCD
 SUBDIRS += syncd saiplayer saidump saidiscovery saisdkdump saiasiccmp tests

diff --git a/configure.ac b/configure.ac
@@ -166,9 +166,7 @@ AC_SUBST(SAIINC, "-I\$(top_srcdir)/SAI/inc -I\$(top_srcdir)/SAI/experimental -I\
 AC_OUTPUT(Makefile
           meta/Makefile
           lib/Makefile
-          lib/src/Makefile
           vslib/Makefile
-          vslib/src/Makefile
           syncd/Makefile
           saiplayer/Makefile
           saidump/Makefile

diff --git a/debian/libsairedis-dev.install b/debian/libsairedis-dev.install
@@ -1 +1 @@
-lib/inc/sairedis.h usr/include/sai
+lib/sairedis.h usr/include/sai
diff --git a/debian/libsaivs-dev.install b/debian/libsaivs-dev.install
@@ -1,3 +1,3 @@
 SAI/inc/sai*.h usr/include/sai/
 SAI/experimental/sai*.h usr/include/sai/
-vslib/inc/saivs.h
+vslib/saivs.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib
 
 lib_LTLIBRARIES = libsairedis.la
 

diff --git a/meta/Makefile.am b/meta/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = $(SAIINC)
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib
 
 lib_LTLIBRARIES = libsaimetadata.la libsaimeta.la
 
@@ -57,9 +57,9 @@ tests_SOURCES = \
 				DummySaiInterface.cpp \
 				MetaTestSaiInterface.cpp \
 				NumberOidIndexGenerator.cpp \
-				../lib/src/VirtualObjectIdManager.cpp \
-				../lib/src/SwitchConfig.cpp \
-				../lib/src/SwitchConfigContainer.cpp
+				../lib/VirtualObjectIdManager.cpp \
+				../lib/SwitchConfig.cpp \
+				../lib/SwitchConfigContainer.cpp
 
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 tests_LDADD = -lhiredis -lswsscommon -lpthread libsaimetadata.la libsaimeta.la -lzmq

diff --git a/meta/MetaTestSaiInterface.h b/meta/MetaTestSaiInterface.h
@@ -2,7 +2,7 @@
 
 #include "DummySaiInterface.h"
 
-#include "lib/inc/VirtualObjectIdManager.h"
+#include "lib/VirtualObjectIdManager.h"
 
 #include <memory>
 

diff --git a/meta/NumberOidIndexGenerator.h b/meta/NumberOidIndexGenerator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "lib/inc/OidIndexGenerator.h"
+#include "lib/OidIndexGenerator.h"
 
 namespace saimeta
 {

diff --git a/pyext/py2/Makefile.am b/pyext/py2/Makefile.am
@@ -4,7 +4,7 @@ SOURCES=../pysairedis.h ../pysairedis.cpp
 pkgpython_PYTHON = pysairedis.py __init__.py
 pkgpyexec_LTLIBRARIES = _pysairedis.la
 
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I..
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib -I..
 
 BUILT_SOURCES = pysairedis_wrap.cpp
 
@@ -14,7 +14,7 @@ _pysairedis_la_CXXFLAGS = -I/usr/include/python$(PYTHON_VERSION) $(AM_CXXFLAGS)
 
 _pysairedis_la_LDFLAGS = -module \
 		-lhiredis -lswsscommon -lpthread \
-		-L$(top_srcdir)/lib/src/.libs -lsairedis \
+		-L$(top_srcdir)/lib/.libs -lsairedis \
 		-L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \
 		-lzmq
 

diff --git a/pyext/py3/Makefile.am b/pyext/py3/Makefile.am
@@ -4,7 +4,7 @@ SOURCES=../pysairedis.h ../pysairedis.cpp
 pkgpython3_PYTHON = pysairedis.py __init__.py
 pkgpy3exec_LTLIBRARIES = _pysairedis.la
 
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I..
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib -I..
 
 BUILT_SOURCES = pysairedis_wrap.cpp
 
@@ -14,7 +14,7 @@ _pysairedis_la_CXXFLAGS = -I/usr/include/python$(PYTHON3_VERSION) $(AM_CXXFLAGS)
 
 _pysairedis_la_LDFLAGS = -module \
 		-lhiredis -lswsscommon -lpthread \
-		-L$(top_srcdir)/lib/src/.libs -lsairedis \
+		-L$(top_srcdir)/lib/.libs -lsairedis \
 		-L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \
 		-lzmq
 

diff --git a/pyext/pysairedis.cpp b/pyext/pysairedis.cpp
@@ -1,6 +1,6 @@
 #include "pysairedis.h"
 
-#include "lib/inc/sairedis.h"
+#include "lib/sairedis.h"
 #include "swss/logger.h"
 
 #include "meta/sai_serialize.h"

diff --git a/saiasiccmp/Makefile.am b/saiasiccmp/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/syncd
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib -I$(top_srcdir)/syncd
 
 bin_PROGRAMS = saiasiccmp
 
@@ -20,6 +20,6 @@ saiasiccmp_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saiasiccmp_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
 saiasiccmp_LDADD = libAsicCmp.a \
 				   -ldl -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq \
-				   $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a $(CODE_COVERAGE_LIBS)
+				   $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/libSaiRedis.a $(CODE_COVERAGE_LIBS)
 
 TESTS = test.sh
diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
@@ -1,9 +1,9 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib
 
 bin_PROGRAMS = saidiscovery
 
 if SAIVS
-SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
+SAILIB=-L$(top_srcdir)/vslib/.libs -lsaivs
 else
 SAILIB=-lsai
 endif

diff --git a/saidump/Makefile.am b/saidump/Makefile.am
@@ -1,9 +1,9 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib
 
 bin_PROGRAMS = saidump
 
 saidump_SOURCES = saidump.cpp
 saidump_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saidump_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
 saidump_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \
-				-L$(top_srcdir)/lib/src/.libs -lsairedis -lzmq $(CODE_COVERAGE_LIBS)
+				-L$(top_srcdir)/lib/.libs -lsairedis -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib
 
 bin_PROGRAMS = saiplayer
 
@@ -15,5 +15,5 @@ libSaiPlayer_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_C
 saiplayer_SOURCES = saiplayer_main.cpp
 saiplayer_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saiplayer_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-saiplayer_LDADD =  libSaiPlayer.a $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a \
+saiplayer_LDADD =  libSaiPlayer.a $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/libSaiRedis.a \
 				   -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/saiplayer/saiplayer_main.cpp b/saiplayer/saiplayer_main.cpp
@@ -1,7 +1,7 @@
 #include "SaiPlayer.h"
 #include "CommandLineOptionsParser.h"
 
-#include "lib/inc/ClientServerSai.h"
+#include "lib/ClientServerSai.h"
 #include "syncd/MetadataLogger.h"
 
 #include "swss/logger.h"

diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
@@ -3,7 +3,7 @@ AM_CXXFLAGS = $(SAIINC)
 bin_PROGRAMS = saisdkdump
 
 if SAIVS
-SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
+SAILIB=-L$(top_srcdir)/vslib/.libs -lsaivs
 else
 SAILIB=-lsai
 endif

diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -1,7 +1,7 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib -I$(top_srcdir)/vslib
 
 if SAIVS
-SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
+SAILIB=-L$(top_srcdir)/vslib/.libs -lsaivs
 else
 SAILIB=-lsai
 endif
@@ -58,7 +58,7 @@ libSyncd_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVER
 syncd_SOURCES = main.cpp
 syncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 syncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-syncd_LDADD = libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \
+syncd_LDADD = libSyncd.a $(top_srcdir)/lib/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \
 			  -ldl -lhiredis -lswsscommon $(SAILIB) -lpthread -lzmq $(CODE_COVERAGE_LIBS)
 
 if SAITHRIFT
@@ -83,11 +83,11 @@ libSyncdRequestShutdown_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMO
 syncd_request_shutdown_SOURCES = syncd_request_shutdown.cpp
 syncd_request_shutdown_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 syncd_request_shutdown_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a $(top_srcdir)/lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread $(CODE_COVERAGE_LIBS)
+syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a $(top_srcdir)/lib/libSaiRedis.a -lhiredis -lswsscommon -lpthread $(CODE_COVERAGE_LIBS)
 
 tests_SOURCES = tests.cpp
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
-tests_LDADD = libSyncd.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/lib/src/.libs -lsairedis \
+tests_LDADD = libSyncd.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/lib/.libs -lsairedis \
 			  -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
 
 TESTS = tests
diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp
@@ -25,7 +25,7 @@
 #include "meta/RedisSelectableChannel.h"
 #include "meta/PerformanceIntervalTimer.h"
 
-#include "vslib/inc/saivs.h"
+#include "vslib/saivs.h"
 
 #include <unistd.h>
 #include <inttypes.h>

diff --git a/syncd/VidManager.cpp b/syncd/VidManager.cpp
@@ -1,6 +1,6 @@
 #include "VidManager.h"
 
-#include "lib/inc/VirtualObjectIdManager.h"
+#include "lib/VirtualObjectIdManager.h"
 
 #include "meta/sai_serialize.h"
 

diff --git a/syncd/tests.cpp b/syncd/tests.cpp
@@ -9,7 +9,7 @@ extern "C" {
 #include <sai.h>
 }
 
-#include "lib/inc/Sai.h"
+#include "lib/Sai.h"
 #include "Syncd.h"
 #include "MetadataLogger.h"
 #include "sairedis.h"

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -1,13 +1,13 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib -I$(top_srcdir)/vslib
 
 bin_PROGRAMS = vssyncd tests testclient
 
-SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
+SAILIB=-L$(top_srcdir)/vslib/.libs -lsaivs
 
 vssyncd_SOURCES = main.cpp
 vssyncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 vssyncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-vssyncd_LDADD = $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a \
+vssyncd_LDADD = $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/libSaiRedis.a \
 				-lhiredis -lswsscommon $(SAILIB) -lpthread \
 				-L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lzmq $(CODE_COVERAGE_LIBS)
 
@@ -18,13 +18,13 @@ endif
 tests_SOURCES = tests.cpp
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 tests_LDADD = -lhiredis -lswsscommon -lpthread \
-			  $(top_srcdir)/lib/src/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \
+			  $(top_srcdir)/lib/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \
 			  -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
 
 testclient_SOURCES = testclient.cpp
 testclient_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 testclient_LDADD = -lhiredis -lswsscommon -lpthread \
-				   $(top_srcdir)/lib/src/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \
+				   $(top_srcdir)/lib/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \
 				   -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
 
 TESTS = aspellcheck.pl conflictnames.pl swsslogentercheck.sh checkwhitespace.sh tests BCM56850.pl MLNX2700.pl
diff --git a/tests/findcrossinclude.sh b/tests/findcrossinclude.sh
@@ -22,24 +22,24 @@ echo -- find cross include in meta/Makefile.am
 
 grep -P "FLAGS.+(lib|vslib|syncd)" ../meta/Makefile.am
 
-echo -- find cross include in lib/src/Makefile.am
+echo -- find cross include in lib/Makefile.am
 
-grep -P "FLAGS.+(vslib|syncd)" ../lib/src/Makefile.am
+grep -P "FLAGS.+(vslib|syncd)" ../lib/Makefile.am
 
-echo -- find cross include in vslib/src/Makefile.am
+echo -- find cross include in vslib/Makefile.am
 
-grep -P "FLAGS.+(lib|syncd)" ../vslib/src/Makefile.am
+grep -P "FLAGS.+(lib|syncd)" ../vslib/Makefile.am
 
 echo -- find cross include in meta directory
 
 find ../meta/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "[^r]/lib/|vslib/|syncd/"| \
-         perl -npe 's!lib/inc/sairedis(common)?.h!!g' | grep -P "[^r]/lib/|vslib/|syncd/" | grep -v deps/test
+         perl -npe 's!lib/sairedis(common)?.h!!g' | grep -P "[^r]/lib/|vslib/|syncd/" | grep -v deps/test
 
-echo -- find cross include in lib/src directory
+echo -- find cross include in lib directory
 
-find ../lib/src/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "vslib/|syncd/"
+find ../lib/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "vslib/|syncd/"
 
-echo -- find cross include in vslib/src directory
+echo -- find cross include in vslib directory
 
-find ../vslib/src/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "[^r]/lib/|syncd/"| \
-         perl -npe 's!lib/inc/sairedis.h!!g' | grep -P "[^r]/lib/|syncd/"
+find ../vslib/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "[^r]/lib/|syncd/"| \
+         perl -npe 's!lib/sairedis.h!!g' | grep -P "[^r]/lib/|syncd/"
diff --git a/tests/tests.cpp b/tests/tests.cpp
@@ -7,7 +7,7 @@
 
 #include "syncd/ZeroMQNotificationProducer.h"
 
-#include "lib/inc/ZeroMQChannel.h"
+#include "lib/ZeroMQChannel.h"
 
 #include "meta/sai_serialize.h"
 

diff --git a/vslib/Makefile.am b/vslib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I/usr/include/libnl3
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/vslib -I$(top_srcdir)/lib -I/usr/include/libnl3
 
 lib_LTLIBRARIES = libsaivs.la