Commit fa3d8969 authored by Denis Filatov's avatar Denis Filatov
Browse files

(*) support for postamble in Makefile 

(*) sync with recent changes in LibCommon and framework
(*) add base time in certificate generation
parent 10e129e0

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -4,3 +4,5 @@ config.mk 
data/certificates/*

!data/certificates/profiles

!data/certificates/Makefile

package.yml

.gitignore

Makefile

+10 −7
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ endif 


libs += -lssl -lcrypto -lxml2 -ljsoncpp -lzip



$(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS)))



outdir := $(TOPDIR)/build/$(ATS)

bindir := $(TOPDIR)/bin

outdir := $(TOPDIR)/build/$(ATS)



$(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS)))



sources     := $(all_sources)

includes    := $(outdir) $(outdir)/.. $(outdir)/asn1 $(all_includes) $(NPCAP_INCLUDE)
@@ -91,9 +91,11 @@ gen_headers := $(gen_ttcn_headers) $(gen_ttcn3_headers) $(gen_asn_headers) $(gen 
gen_objects := $(patsubst %.cc, %.o, $(gen_sources))

cc_objects  := $(patsubst  %.cc, $(outdir)/%.o, $(cc_sources))



.PHONY: all FORCE echo

outbin = $(bindir)/$(ATS)$(SUB_ATS)$(EXE)



.PHONY: all FORCE echo postamble



all: $(bindir) $(outdir) $(bindir)/$(ATS)$(SUB_ATS)$(EXE)

all: $(bindir) $(outdir) $(outbin) postamble



echo_sources:

	@echo -e "$(addsuffix \n,$(all_sources))"
@@ -107,7 +109,7 @@ echo: echo_sources 
	@echo -e "defines: $(addsuffix \n, $(defines))"



clean:

	rm -f $(outdir)/$(ATS)$(SUB_ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate $(outdir)/../libItsAsn.so

	rm -f $(outbin) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate $(outdir)/../libItsAsn.so

#	rm -f $(outdir)/asn1/*.so $(outdir)/asn1/*.o $(outdir)/asn1/*.c $(outdir)/asn1/*.h $(outdir)/asn1/Makefile.am.libasncodec



regen: force_regen $(outdir)/.generate
@@ -129,7 +131,7 @@ t3d: all 
$(outdir) $(outdir)/asn1 $(bindir):

	mkdir -p $@



$(bindir)/$(ATS)$(SUB_ATS)$(EXE): $(outdir)/asn1/libItsAsn.a $(gen_objects) $(cc_objects) 

$(outbin): $(outdir)/asn1/libItsAsn.a $(gen_objects) $(cc_objects) 

	g++ -g -O0 -std=c++17 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/libItsAsn.a $(libs)



$(gen_objects) :%.o :%.cc
@@ -169,3 +171,4 @@ $(foreach S, $(asn1_sources), $(eval $(outdir)/$(notdir $(patsubst %.asn1, %.cc 


$(asn_sources) $(asn1_sources):



postamble:

data/certificates/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ depdir=temp 
keydir=certificates

iutdir=iut



base_time := $(shell date +%Y-01-01)

asn1certgen=$(CERTGEN)/build/$(ARCH)/certgen

asn1certidx=$(CERTGEN)/build/$(ARCH)/certidx -n
@@ -36,7 +37,7 @@ clean: 
	rm -f $(certificates_oer) $(certificates_xer)



$(certificates_xer): $(xerdir)/%.xer : $(in)/%.xml

	xsltproc $(xsl_cvt) $< | xmllint --format -o $@ -

	xsltproc --param base-time "'$(base_time)'" $(xsl_cvt) $< | xmllint --format -o $@ -



$(outdir)/index.lst: $(certificates_oer)

	$(asn1certidx) -o $@ $^

titan-test-system-framework @ e27aaa84

Original line number Diff line number Diff line 
Subproject commit eb652d4fbd09a333332d4e2fb28aede6543d456b
 
Subproject commit e27aaa847f49a1e459f427abc3620ef7a40223ca

LibCommon @ 149e7d5c

Compare 21bad7c5 to 149e7d5c
Original line number Diff line number Diff line 
Subproject commit 21bad7c51917d19bebdff5b36983e22922421976
 
Subproject commit 149e7d5cc1fc2252f2100f25bb06c72245529143