Commit 4e23fbc3 authored by Yann Garcia's avatar Yann Garcia
Browse files

Added TITAN patches

parent e8cc8d1d

Makefile

+6 −6
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ echo: echo_sources 
	@echo -e "defines: $(addsuffix \n, $(defines))"



clean:

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

	rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate $(outdir)/../lib5GNGAPAsn.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
@@ -125,8 +125,8 @@ t3d: all 
$(outdir) $(outdir)/asn1 $(bindir):

	mkdir -p $@



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

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

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

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



$(gen_objects) :%.o :%.cc

	g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<
@@ -144,17 +144,17 @@ $(outdir)/.generate: Makefile $(tt_sources) 
	$(TTCN3_DIR)/bin/compiler $(TTCN3_COMPILER_OPTIONS) -o  $(outdir) $(tt_sources)

	touch $@



$(bindir)/libAsn.so: $(outdir)/asn1/libAsn.so

$(bindir)/lib5GNGAPAsn.so: $(outdir)/asn1/lib5GNGAPAsn.so

	cp -f $< $@



$(outdir)/asn1/libAsn.a: $(asn_sources) $(asn1_sources) libasn1.mk Makefile

$(outdir)/asn1/lib5GNGAPAsn.a: $(asn_sources) $(asn1_sources) libNr5gcAsn1.mk Makefile

	mkdir -p $(outdir)/asn1

	echo TOP_DIR   := ../../..                                               >$(outdir)/asn1/Makefile

	echo ASN_PDU   := $(pdu)                                                >>$(outdir)/asn1/Makefile

	echo ASN_FILES := \\                                                    >>$(outdir)/asn1/Makefile

	for n in $(asn_sources) $(asn1_sources); do echo "        $$n \\"; done >>$(outdir)/asn1/Makefile

	echo                                                                    >>$(outdir)/asn1/Makefile

	cat libasn1.mk                                                          >>$(outdir)/asn1/Makefile

	cat libNr5gcAsn1.mk                                                     >>$(outdir)/asn1/Makefile

	$(MAKE) -C $(outdir)/asn1

	touch $@

config.mk

+5 −5
Original line number Diff line number Diff line 
#TTCN3_COMPILER_OPTIONS := -d -e -f -g -j -H -l -L -R -U none -x -X

TTCN3_COMPILER_OPTIONS := -d -e -f -g -j -l -L -R -U none -x -X

#TTCN3_DIR      := $(HOME)/frameworks/titan/titan.core/Install

TTCN3_DIR      :=  $(HOME)/tmp/ttcn3-9.0.0

#ASN1C_PATH     := $(HOME)/frameworks/asn1c.denis

TTCN3_COMPILER_OPTIONS := -d -e -f -g -j -H -l -L -R -U none -x -X

#TTCN3_COMPILER_OPTIONS := -d -e -f -g -j -l -L -R -U none -x -X

TTCN3_DIR      := $(HOME)/frameworks/titan/titan.core/Install

#TTCN3_DIR      :=  $(HOME)/tmp/ttcn3-9.0.0

ASN1C_PATH     := $(HOME)/frameworks/asn1c.denis

#ASN1C_PATH     := /home/ubuntu/bin/asn1c.denis/

#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

#NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include

libNr5gcAsn1.mk

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
##########################################################



# The name of the library

ASN_LIBRARY = libItsAsn.a

ASN_LIBRARY = lib5GNGAPAsn.a



ifeq (,$(sort $(ASN_FILES)))

 $(error ASN_FILES should be specified )