Update nomos standalone binary and source (#27)

Signed-off-by: Jiyeong Seok <[email protected]>

Author: dd-jy

src/fosslight_dependency/third_party/nomos/agent/CHECKSTR

@@ -18,9 +18,9 @@ GENOBJS = _precheck.o _autodata.o
 HDRS = nomos.h $(OBJS:.o=.h) _autodefs.h
 
 #CFLAGS_LOCAL = -DSTANDALONE -g -O2 -Wall -D_FILE_OFFSET_BITS=64
-CFLAGS_LOCAL = -DSTANDALONE -Wall -D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/include/json-c
+CFLAGS_LOCAL = -DSTANDALONE -Wall -D_FILE_OFFSET_BITS=64 $(shell pkg-config glib-2.0 --cflags) $(shell pkg-config --cflags json-c)
 
-FO_LDFLAGS += -L --static /usr/lib/x86_64-linux-gnu/libglib-2.0.a -L --static /usr/lib/x86_64-linux-gnu/libjson-c.a -lpthread
+FO_LDFLAGS += $(shell pkg-config glib-2.0 --libs) $(shell pkg-config --libs json-c) -lpthread -lrt
 
 all: encode $(EXE)
 

src/fosslight_dependency/third_party/nomos/agent/GENSEARCHDATA

@@ -127,17 +127,20 @@ CXXFOLIB = $(CXXFOLIBDIR)/libfossologyCPP.a
 GLIB_CFLAGS := $(shell pkg-config --cflags glib-2.0)
 GLIB_LDFLAGS := $(shell pkg-config --libs glib-2.0)
 
-FO_CFLAGS = -I$(PG_INCLUDEDIR) -I$(FOLIBDIR) $(CFLAGS)
-FO_LDFLAGS = $(LDFLAGS)
+PG_INCLUDEDIR := $(shell pg_config --includedir)
+
+FO_CFLAGS = -I$(PG_INCLUDEDIR) $(GLIB_CFLAGS) -I$(FOLIBDIR) $(CFLAGS)
+FO_LDFLAGS = $(GLIB_LDFLAGS) $(LDFLAGS)
 
 FO_CXXFLAGS = -I$(CXXFOLIBDIR) $(FO_CFLAGS) $(CXXFLAGS)
 FO_CXXLDFLAGS = -lfossologyCPP -L$(CXXFOLIBDIR) -lstdc++ $(FO_LDFLAGS) \
                 $(shell pkg-config --libs icu-uc)
 
 # define VERSION and COMMIT_ID
-VERSION=`git describe --tags > /dev/null 2>&1 && git describe --tags | head -1 || echo "unknown"`
-BRANCH=`git rev-parse --abbrev-ref HEAD > /dev/null 2>&1 && git rev-parse --abbrev-ref HEAD | head -1 || echo "unknown"`
-COMMIT_HASH=`git show > /dev/null 2>&1 && git show | head -1 | awk '{print substr($$2,1,6)}' || echo "unknown"`
+VERSION_PATTERN = '\([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\)\(-?rc[[:digit:]]+\)?-\([[:digit:]]+\)-[[:alnum:]]*'
+VERSION = $(shell git describe --tags > /dev/null 2>&1 && git describe --tags | head -1 | sed -re 's/$(VERSION_PATTERN)/\1.\3\2/' || echo "unknown")
+BRANCH=$(shell git rev-parse --abbrev-ref HEAD > /dev/null 2>&1 && git rev-parse --abbrev-ref HEAD | head -1 || echo "unknown")
+COMMIT_HASH=$(shell git show > /dev/null 2>&1 && git show | head -1 | awk '{print substr($$2,1,6)}' || echo "unknown")
 
 # Force the VERSION variable to be < 23 chars
 override VERSION:= $(shell echo ${VERSION} | cut -b1-23)
@@ -150,6 +153,11 @@ FOWWWDIR = $(FOSRCDIR)/www/ui
 # for use when coverage C code
 FLAG_COV = -O0 -fprofile-arcs -ftest-coverage
 
+# to run phpunit tests
+PHPUNIT = $(FOSRCDIR)/vendor/bin/phpunit
+PHPUNIT_CONF = $(FOSRCDIR)/phpunit.xml
+PHPUNIT_BOOT = $(FOSRCDIR)/phpunit-bootstrap.php
+
 # to run cunit tets
 CUNIT_VERSION = $(shell $(TOP)/utils/cunit-version)