Commit e7746012 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in install.sh

parent d5569a57

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ $(cc_objects) : $(outdir)/%.o : %.cc 
$(gen_sources): $(outdir)/.generate



$(outdir)/.generate: Makefile $(tt_sources)

	$(TTCN3_DIR)/bin/compiler -b -d -e -f -g -l -L -M -n -O -r -R -U none -x -X -o $(outdir) $(tt_sources)

	$(TTCN3_DIR)/bin/compiler $(TTCN3_COMPILER_OPTIONS) -o $(outdir) $(tt_sources)

	touch $@



$(foreach S, $(ttcn_sources),  $(eval $(outdir)/$(notdir $(patsubst %.ttcn, %.cc,  $(S))): $(S)))

config.mk

+2 −1
Original line number Diff line number Diff line 
#TTCN3_DIR      := /cygdrive/c/Tools/Titan

TTCN3_COMPILER_OPTIONS := -b -d -e -f -g -l -L -M -n -O -r -R -U none -x -X

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

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

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

T3Q_PATH=./tools/t3q-v2.0.0b30

install.sh

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ BASE_PATH=`pwd` 


git submodule update --init --recursive --remote



if [ ! -f ./titan-test-system-framework ]

if [ ! -d ./titan-test-system-framework ]

then

    git clone --recurse-submodules --single-branch --branch devel https://labs.etsi.org/rep/cti-tools/titan-test-system-framework.git

    git clone --recurse-submodules --branch devel https://labs.etsi.org/rep/cti-tools/titan-test-system-framework.git

    cd ./titan-test-system-framework

else

    cd ./titan-test-system-framework

titan-test-system-framework @ 524df4ef

Original line number Diff line number Diff line 
Subproject commit 554d6b6b3ce1e51d88267a3c946cd30caac97a55
 
Subproject commit 524df4ef9a2fed2c32c1d9166ebebdb51fa666ba