- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: buildsystem: remove ttcn3_compiler workaround

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40028?usp=email ) Change subject: buildsystem: remove ttcn3_compiler workaround ...................................................................... buildsystem: remove ttcn3_compiler workaround The related debian bug has been fixed in 2018, so remove the workaround. I've also verified that the binary is called "compiler" in Arch Linux (as some developers are on Arch). Change-Id: Ia50aa3caffeaa85eefba10695096aa23dcb69c93 --- M _buildsystem/regen_makefile.inc.sh 1 file changed, 1 insertion(+), 9 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/_buildsystem/regen_makefile.inc.sh b/_buildsystem/regen_makefile.inc.sh index 573231f..31dd491 100644 --- a/_buildsystem/regen_makefile.inc.sh +++ b/_buildsystem/regen_makefile.inc.sh @@ -14,14 +14,7 @@ # limitations under the License. -# Wrapper around the TITAN make file generator to work in Debian. -# -# TITAN has a makefile generator, but somehow Debian seems to install -# the binaries to different paths without patching the make file -# generator, leading in inconsistent non-working Makefiles. -# -# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. -# +# Wrapper around the TITAN make file generator if [ -z "$NAME" ]; then echo "ERROR: NAME is not set!" @@ -70,7 +63,6 @@ else sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile fi -sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile if [ "x$USE_CCACHE" = "x1" ]; then # enable ccache -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40028?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia50aa3caffeaa85eefba10695096aa23dcb69c93 Gerrit-Change-Number: 40028 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: buildsystem/regen_makefile: change to inc script

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40027?usp=email ) Change subject: buildsystem/regen_makefile: change to inc script ...................................................................... buildsystem/regen_makefile: change to inc script Make the regen_makefile script more consistent with gen_links.inc.sh by also turning it into an include script. By doing this all previously declared variables are available in regen_makefile, which means export and passing as arguments is not needed anymore, making the resulting users simpler. Use #!/bin/sh -e while at it and remove empty CPPFLAGS_TTCN3 vars. Change-Id: I10a41671e857024be6a5e8577c2aaca83228793e --- M SCCP_Test/regen_makefile.sh R _buildsystem/regen_makefile.inc.sh M asterisk/regen_makefile.sh M bsc-nat/regen_makefile.sh M bsc/regen_makefile.sh M bts/regen_makefile.sh M cbc/regen_makefile.sh M ccid/regen_makefile.sh M dia2gsup/regen_makefile.sh M eim/regen_makefile.sh M epdg/regen_makefile.sh M fr-net/regen_makefile.sh M fr/regen_makefile.sh M gbproxy/regen_makefile.sh M ggsn_tests/regen_makefile.sh M hlr/regen_makefile.sh M hnbgw/regen_makefile.sh M hnodeb/regen_makefile.sh M hss/regen_makefile.sh M ipad/regen_makefile.sh M mgw/regen_makefile.sh M mme/regen_makefile.sh M msc/regen_makefile.sh M ns/regen_makefile.sh M pcap-client/regen_makefile.sh M pcrf/regen_makefile.sh M pcu/regen_makefile.sh M pgw/regen_makefile.sh M remsim/regen_makefile.sh M s1gw/regen_makefile.sh M sccp/regen_makefile.sh M selftest/regen_makefile.sh M sgsn/regen_makefile.sh M simtrace/regen_makefile.sh M sip/regen_makefile.sh M smlc/regen_makefile.sh M stp/regen_makefile.sh M sysinfo/regen_makefile.sh M upf/regen_makefile.sh 39 files changed, 110 insertions(+), 139 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh index fd6a08c..08533dd 100755 --- a/SCCP_Test/regen_makefile.sh +++ b/SCCP_Test/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=SCCP_Testcases @@ -7,7 +7,4 @@ *.ttcnpp " -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/_buildsystem/regen-makefile.sh b/_buildsystem/regen_makefile.inc.sh old mode 100755 new mode 100644 similarity index 93% rename from _buildsystem/regen-makefile.sh rename to _buildsystem/regen_makefile.inc.sh index 813b212..573231f --- a/_buildsystem/regen-makefile.sh +++ b/_buildsystem/regen_makefile.inc.sh @@ -1,5 +1,3 @@ -#!/bin/sh - # Copyright 2017-2019 Harald Welte # Copyright 2018 sysmocom - s.f.m.c. GmbH # @@ -25,6 +23,16 @@ # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. # +if [ -z "$NAME" ]; then + echo "ERROR: NAME is not set!" + exit 1 +fi + +if [ -z "$FILES" ]; then + echo "ERROR: FILES is not set!" + exit 1 +fi + test -x "$(which ttcn3_makefilegen 2>/dev/null)" || { echo "ERROR: ttcn3_makefilegen not in PATH"; exit 1; } # Enable ccache if it can be found in path. @@ -37,7 +45,7 @@ USE_CCACHE=1 fi -ttcn3_makefilegen -g -p -l -U 8 -f $* +ttcn3_makefilegen -g -p -l -U 8 -f -e "$NAME" $FILES sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan/' Makefile diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh index e3dfb24..d5d0c5b 100755 --- a/asterisk/regen_makefile.sh +++ b/asterisk/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=Asterisk_Tests @@ -21,7 +21,7 @@ TELNETasp_PT.cc " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh # required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index 5b3fe4e..c6523aa 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=BSCNAT_Tests @@ -19,7 +19,7 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_MGCP -DIPA_EMULATION_SCCP @@ -29,4 +29,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh index 7ef23c3..32e0b71 100755 --- a/bsc/regen_makefile.sh +++ b/bsc/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=BSC_Tests @@ -23,7 +23,7 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_MGCP -DIPA_EMULATION_RSL @@ -36,4 +36,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh index 4f2cbeb..c9b345e 100755 --- a/bts/regen_makefile.sh +++ b/bts/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=BTS_Tests @@ -22,11 +22,11 @@ UD_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_OML -DIPA_EMULATION_OSMO_PCU -DIPA_EMULATION_RSL " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh index eba6a56..8ec5fcb 100755 --- a/cbc/regen_makefile.sh +++ b/cbc/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e NAME=CBC_Tests @@ -24,9 +24,6 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh index b618faf..91e607e 100755 --- a/ccid/regen_makefile.sh +++ b/ccid/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=CCID_Tests @@ -9,10 +9,7 @@ USB_PT.cc " -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh #sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile diff --git a/dia2gsup/regen_makefile.sh b/dia2gsup/regen_makefile.sh index b248f79..01aea4c 100755 --- a/dia2gsup/regen_makefile.sh +++ b/dia2gsup/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=DIA2GSUP_Tests @@ -17,9 +17,9 @@ DIAMETER_CodecPort_CtrlFunctDef.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL " -../_buildsystem/regen-makefile.sh DIA2GSUP_Tests.ttcn $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/eim/regen_makefile.sh b/eim/regen_makefile.sh index 5217eae..2b5cb24 100755 --- a/eim/regen_makefile.sh +++ b/eim/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=eIM_Tests @@ -19,7 +19,7 @@ PKIX1Implicit88_EncDec.cc PIPEasp_PT.cc " -../_buildsystem/regen-makefile.sh eIM_Tests.ttcn $FILES +. ../_buildsystem/regen_makefile.inc.sh # required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/epdg/regen_makefile.sh b/epdg/regen_makefile.sh index 836a10f..847c412 100755 --- a/epdg/regen_makefile.sh +++ b/epdg/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=EPDG_Tests @@ -23,9 +23,9 @@ GTPv2_CodecPort_CtrlFunctDef.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_GSUP " -../_buildsystem/regen-makefile.sh EPDG_Tests.ttcn $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh index 8500a8a..a403bf2 100755 --- a/fr-net/regen_makefile.sh +++ b/fr-net/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e NAME=FRNET_Tests @@ -16,8 +16,8 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DNS_EMULATION_FR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh index c4ce404..867fc7c 100755 --- a/fr/regen_makefile.sh +++ b/fr/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e NAME=FR_Tests @@ -17,8 +17,8 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DNS_EMULATION_FR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index a03404b..421a8f4 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e NAME=GBProxy_Tests @@ -24,13 +24,13 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DBSSGP_EM_L3 -DIPA_EMULATION_CTRL -DNS_EMULATION_FR -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh sed -i -i 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index 5fb7718..f1bccb7 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=GGSN_Tests @@ -24,7 +24,4 @@ UDP_EncDec.cc " -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 02909f8..721599c 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=HLR_Tests @@ -20,9 +20,9 @@ UDPasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/hnbgw/regen_makefile.sh b/hnbgw/regen_makefile.sh index c9ce26d..8e4b9d9 100755 --- a/hnbgw/regen_makefile.sh +++ b/hnbgw/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=HNBGW_Tests @@ -30,13 +30,13 @@ PFCP_CodecPort_CtrlFunctDef.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DRAN_EMULATION_RANAP -DSTATSD_HAVE_VTY -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/hnodeb/regen_makefile.sh b/hnodeb/regen_makefile.sh index 4cb568a..6505cf6 100755 --- a/hnodeb/regen_makefile.sh +++ b/hnodeb/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=HNB_Tests @@ -31,11 +31,11 @@ GTPv1U_CodecPort_CtrlFunctDef.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DSTATSD_HAVE_VTY " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/hss/regen_makefile.sh b/hss/regen_makefile.sh index 97aa898..49be80a 100755 --- a/hss/regen_makefile.sh +++ b/hss/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e NAME=HSS_Tests @@ -17,7 +17,4 @@ TCCInterface.cc " -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/ipad/regen_makefile.sh b/ipad/regen_makefile.sh index f1a7f99..6aab793 100755 --- a/ipad/regen_makefile.sh +++ b/ipad/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=IPAd_Tests @@ -19,7 +19,7 @@ PKIX1Implicit88_EncDec.cc VPCD_CodecPort_CtrlFunctDef.cc " -../_buildsystem/regen-makefile.sh IPAd_Tests.ttcn $FILES +. ../_buildsystem/regen_makefile.inc.sh # required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh index a3d4a74..6d05166 100755 --- a/mgw/regen_makefile.sh +++ b/mgw/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=MGCP_Test @@ -23,9 +23,9 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DSTATSD_HAVE_VTY " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 690020b..768fbd2 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=MME_Tests @@ -28,10 +28,6 @@ UECUPS_CodecPort_CtrlFunctDef.cc " - -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lgnutls/' Makefile diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index 3aa3515..b254f9d 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=MSC_Tests @@ -32,7 +32,7 @@ UD_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_GSUP -DIPA_EMULATION_MGCP @@ -44,6 +44,6 @@ -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lssl/' Makefile diff --git a/ns/regen_makefile.sh b/ns/regen_makefile.sh index f778317..10f96e2 100755 --- a/ns/regen_makefile.sh +++ b/ns/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e NAME=NS_Tests @@ -19,10 +19,10 @@ UD_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DBSSGP_EM_L3 -DNS_EMULATION_FR -DSTATSD_HAVE_VTY " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/pcap-client/regen_makefile.sh b/pcap-client/regen_makefile.sh index d3e7b2c..752e74f 100755 --- a/pcap-client/regen_makefile.sh +++ b/pcap-client/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e NAME=OPCAP_CLIENT_Tests @@ -14,6 +14,4 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3="" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/pcrf/regen_makefile.sh b/pcrf/regen_makefile.sh index 3883291..e0bf1a4 100755 --- a/pcrf/regen_makefile.sh +++ b/pcrf/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e NAME=PCRF_Tests @@ -17,7 +17,4 @@ TCCInterface.cc " -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index 1237c03..1aaabb2 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=PCU_Tests @@ -19,10 +19,10 @@ UD_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DBSSGP_EM_L3 -DIPA_EMULATION_CTRL -DSTATSD_HAVE_VTY " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index b6b7f66..ec40716 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e NAME=PGW_Tests @@ -25,7 +25,4 @@ UECUPS_CodecPort_CtrlFunctDef.cc " -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh index d08dbdc..9d4df3e 100755 --- a/remsim/regen_makefile.sh +++ b/remsim/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=REMSIM_Tests @@ -22,12 +22,12 @@ VPCD_CodecPort_CtrlFunctDef.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_RSPRO -DIPA_EMULATION_CTRL " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh # required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/s1gw/regen_makefile.sh b/s1gw/regen_makefile.sh index 173a7a1..3c48af2 100755 --- a/s1gw/regen_makefile.sh +++ b/s1gw/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=S1GW_Tests @@ -18,11 +18,7 @@ TCCInterface.cc " - -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh index 397a210..55d8826 100755 --- a/sccp/regen_makefile.sh +++ b/sccp/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=SCCP_Tests @@ -18,10 +18,10 @@ UD_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh index b3a725d..9283624 100755 --- a/selftest/regen_makefile.sh +++ b/selftest/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=Selftest @@ -13,10 +13,10 @@ TCCInterface.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_RSL -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index a378773..c116d94 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=SGSN_Tests @@ -24,7 +24,7 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DBSSGP_EM_L3 -DIPA_EMULATION_CTRL -DIPA_EMULATION_GSUP @@ -32,6 +32,6 @@ -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/simtrace/regen_makefile.sh b/simtrace/regen_makefile.sh index 0080e70..f63ac91 100755 --- a/simtrace/regen_makefile.sh +++ b/simtrace/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=SIMTRACE_Tests @@ -9,10 +9,7 @@ USB_PT.cc " -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh #sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile diff --git a/sip/regen_makefile.sh b/sip/regen_makefile.sh index 09618b5..f18d70b 100755 --- a/sip/regen_makefile.sh +++ b/sip/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=SIP_Tests @@ -23,9 +23,9 @@ UD_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DRAN_EMULATION_CTRL " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh index 279ff76..ed37dac 100755 --- a/smlc/regen_makefile.sh +++ b/smlc/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=SMLC_Tests @@ -21,7 +21,7 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL @@ -32,4 +32,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh index b2c2d3c..0d7fa48 100755 --- a/stp/regen_makefile.sh +++ b/stp/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=STP_Tests @@ -18,10 +18,10 @@ M3UA_CodecPort_CtrlFunctDef.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh index 6bd42c5..4076c52 100755 --- a/sysinfo/regen_makefile.sh +++ b/sysinfo/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=Test @@ -13,7 +13,4 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/upf/regen_makefile.sh b/upf/regen_makefile.sh index c704184..d835449 100755 --- a/upf/regen_makefile.sh +++ b/upf/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e NAME=UPF_Tests @@ -17,9 +17,9 @@ TELNETasp_PT.cc " -export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DSTATSD_HAVE_VTY " -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40027?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I10a41671e857024be6a5e8577c2aaca83228793e Gerrit-Change-Number: 40027 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: buildsystem: move related scripts to subdir

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40026?usp=email ) Change subject: buildsystem: move related scripts to subdir ...................................................................... buildsystem: move related scripts to subdir Clean up the main directory by moving all buildsystem related scripts into a _buildsystem subdirectory. Rename gen_links.sh.inc to gen_links.inc.sh while at it, so vim does syntax highlighting as shell script and not bitbake. The rest of these patches in this series lead up to changing the buildsystem to build out-of-tree (so we don't clutter the source dirs with symlinks and build artifacts) and making the build output more readable. Related: OS#6599 Change-Id: Ieeefdfd74b2698794fb12fec4ed32565dc9f36a6 --- M Makefile M SCCP_Test/gen_links.sh M SCCP_Test/regen_makefile.sh R _buildsystem/gen_links.inc.sh R _buildsystem/regen-makefile.sh R _buildsystem/rmlinks.sh M asterisk/gen_links.sh M asterisk/regen_makefile.sh M bsc-nat/gen_links.sh M bsc-nat/regen_makefile.sh M bsc/gen_links.sh M bsc/regen_makefile.sh M bts/gen_links.sh M bts/regen_makefile.sh M cbc/gen_links.sh M cbc/regen_makefile.sh M ccid/gen_links.sh M ccid/regen_makefile.sh M dia2gsup/gen_links.sh M dia2gsup/regen_makefile.sh M eim/gen_links.sh M eim/regen_makefile.sh M epdg/gen_links.sh M epdg/regen_makefile.sh M fr-net/gen_links.sh M fr-net/regen_makefile.sh M fr/gen_links.sh M fr/regen_makefile.sh M gbproxy/gen_links.sh M gbproxy/regen_makefile.sh M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh M hlr/gen_links.sh M hlr/regen_makefile.sh M hnbgw/gen_links.sh M hnbgw/regen_makefile.sh M hnodeb/gen_links.sh M hnodeb/regen_makefile.sh M hss/gen_links.sh M hss/regen_makefile.sh M ipad/gen_links.sh M ipad/regen_makefile.sh M library/hnbap/regen_makefile.sh M library/ranap/regen_makefile.sh M library/rua/regen_makefile.sh M library/s1ap/regen_makefile.sh M library/sabp/regen_makefile.sh M library/sbcap/regen_makefile.sh M mgw/gen_links.sh M mgw/regen_makefile.sh M mme/gen_links.sh M mme/regen_makefile.sh M msc/gen_links.sh M msc/regen_makefile.sh M ns/gen_links.sh M ns/regen_makefile.sh M pcap-client/gen_links.sh M pcap-client/regen_makefile.sh M pcrf/gen_links.sh M pcrf/regen_makefile.sh M pcu/gen_links.sh M pcu/regen_makefile.sh M pgw/gen_links.sh M pgw/regen_makefile.sh M remsim/gen_links.sh M remsim/regen_makefile.sh M s1gw/gen_links.sh M s1gw/regen_makefile.sh M sccp/gen_links.sh M sccp/regen_makefile.sh M selftest/gen_links.sh M selftest/regen_makefile.sh M sgsn/gen_links.sh M sgsn/regen_makefile.sh M simtrace/gen_links.sh M simtrace/regen_makefile.sh M sip/gen_links.sh M sip/regen_makefile.sh M smlc/gen_links.sh M smlc/regen_makefile.sh M stp/gen_links.sh M stp/regen_makefile.sh M sysinfo/gen_links.sh M sysinfo/regen_makefile.sh M upf/gen_links.sh M upf/regen_makefile.sh 86 files changed, 83 insertions(+), 83 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile b/Makefile index 38a8f60..2355d9a 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ .PHONY: $(1)/clean $(1)/clean: $(1)/Makefile $(MAKE) -C $(1) clean - (cd $(1) && ../rmlinks.sh && rm Makefile) + (cd $(1) && ../_buildsystem/rmlinks.sh && rm Makefile) endef define DIR_all_template diff --git a/SCCP_Test/gen_links.sh b/SCCP_Test/gen_links.sh index c980844..7bae850 100755 --- a/SCCP_Test/gen_links.sh +++ b/SCCP_Test/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h SDP_EncDec.cc" diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh index ee2cdb3..fd6a08c 100755 --- a/SCCP_Test/regen_makefile.sh +++ b/SCCP_Test/regen_makefile.sh @@ -10,4 +10,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/gen_links.sh.inc b/_buildsystem/gen_links.inc.sh similarity index 100% rename from gen_links.sh.inc rename to _buildsystem/gen_links.inc.sh diff --git a/regen-makefile.sh b/_buildsystem/regen-makefile.sh similarity index 100% rename from regen-makefile.sh rename to _buildsystem/regen-makefile.sh diff --git a/rmlinks.sh b/_buildsystem/rmlinks.sh similarity index 100% rename from rmlinks.sh rename to _buildsystem/rmlinks.sh diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh index e42ffe3..afd6a8d 100755 --- a/asterisk/gen_links.sh +++ b/asterisk/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h " diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh index f0c9bcb..e3dfb24 100755 --- a/asterisk/regen_makefile.sh +++ b/asterisk/regen_makefile.sh @@ -21,7 +21,7 @@ TELNETasp_PT.cc " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES # required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index 550aa45..aa9fb54 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index 470d109..5b3fe4e 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -29,4 +29,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index 05c1e51..30bfba7 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh index 6683f29..7ef23c3 100755 --- a/bsc/regen_makefile.sh +++ b/bsc/regen_makefile.sh @@ -36,4 +36,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/bts/gen_links.sh b/bts/gen_links.sh index c9eb786..1f16334 100755 --- a/bts/gen_links.sh +++ b/bts/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh index 054b750..4f2cbeb 100755 --- a/bts/regen_makefile.sh +++ b/bts/regen_makefile.sh @@ -29,4 +29,4 @@ -DIPA_EMULATION_RSL " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/cbc/gen_links.sh b/cbc/gen_links.sh index 5c767e4..314de12 100755 --- a/cbc/gen_links.sh +++ b/cbc/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh index 96900b3..eba6a56 100755 --- a/cbc/regen_makefile.sh +++ b/cbc/regen_makefile.sh @@ -27,6 +27,6 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile diff --git a/ccid/gen_links.sh b/ccid/gen_links.sh index 593f624..99698e6 100755 --- a/ccid/gen_links.sh +++ b/ccid/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCConversion_Functions.ttcn TCCConversion.cc" diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh index c91ac12..b618faf 100755 --- a/ccid/regen_makefile.sh +++ b/ccid/regen_makefile.sh @@ -12,7 +12,7 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES #sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile diff --git a/dia2gsup/gen_links.sh b/dia2gsup/gen_links.sh index f406ebb..eb65263 100755 --- a/dia2gsup/gen_links.sh +++ b/dia2gsup/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/dia2gsup/regen_makefile.sh b/dia2gsup/regen_makefile.sh index 22d8e06..b248f79 100755 --- a/dia2gsup/regen_makefile.sh +++ b/dia2gsup/regen_makefile.sh @@ -22,4 +22,4 @@ -DIPA_EMULATION_CTRL " -../regen-makefile.sh DIA2GSUP_Tests.ttcn $FILES +../_buildsystem/regen-makefile.sh DIA2GSUP_Tests.ttcn $FILES diff --git a/eim/gen_links.sh b/eim/gen_links.sh index 9fa3ac2..2e73c7c 100755 --- a/eim/gen_links.sh +++ b/eim/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/eim/regen_makefile.sh b/eim/regen_makefile.sh index cc0fd8e..5217eae 100755 --- a/eim/regen_makefile.sh +++ b/eim/regen_makefile.sh @@ -19,7 +19,7 @@ PKIX1Implicit88_EncDec.cc PIPEasp_PT.cc " -../regen-makefile.sh eIM_Tests.ttcn $FILES +../_buildsystem/regen-makefile.sh eIM_Tests.ttcn $FILES # required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh index a0b2871..abc0287 100755 --- a/epdg/gen_links.sh +++ b/epdg/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/epdg/regen_makefile.sh b/epdg/regen_makefile.sh index 9aa83b4..836a10f 100755 --- a/epdg/regen_makefile.sh +++ b/epdg/regen_makefile.sh @@ -28,4 +28,4 @@ -DIPA_EMULATION_GSUP " -../regen-makefile.sh EPDG_Tests.ttcn $FILES +../_buildsystem/regen-makefile.sh EPDG_Tests.ttcn $FILES diff --git a/fr-net/gen_links.sh b/fr-net/gen_links.sh index 413676c..71370e2 100755 --- a/fr-net/gen_links.sh +++ b/fr-net/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh index 89eccd3..8500a8a 100755 --- a/fr-net/regen_makefile.sh +++ b/fr-net/regen_makefile.sh @@ -20,4 +20,4 @@ -DNS_EMULATION_FR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/fr/gen_links.sh b/fr/gen_links.sh index 413676c..71370e2 100755 --- a/fr/gen_links.sh +++ b/fr/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh index 1b37cb6..c4ce404 100755 --- a/fr/regen_makefile.sh +++ b/fr/regen_makefile.sh @@ -21,4 +21,4 @@ -DNS_EMULATION_FR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/gbproxy/gen_links.sh b/gbproxy/gen_links.sh index b0bdf09..7320c57 100755 --- a/gbproxy/gen_links.sh +++ b/gbproxy/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index cd17d5c..a03404b 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -31,6 +31,6 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES sed -i -i 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index cd4c406..9aad2d7 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index ce8e15a..5fb7718 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -27,4 +27,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index 588fe08..3326e96 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index c5fadde..02909f8 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -25,4 +25,4 @@ -DIPA_EMULATION_CTRL " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index de173f1..f0c81fe 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/hnbgw/regen_makefile.sh b/hnbgw/regen_makefile.sh index c67323e..c9ce26d 100755 --- a/hnbgw/regen_makefile.sh +++ b/hnbgw/regen_makefile.sh @@ -37,6 +37,6 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/hnodeb/gen_links.sh b/hnodeb/gen_links.sh index ea78c83..86e1299 100755 --- a/hnodeb/gen_links.sh +++ b/hnodeb/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/hnodeb/regen_makefile.sh b/hnodeb/regen_makefile.sh index be7dec5..4cb568a 100755 --- a/hnodeb/regen_makefile.sh +++ b/hnodeb/regen_makefile.sh @@ -36,6 +36,6 @@ -DSTATSD_HAVE_VTY " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/hss/gen_links.sh b/hss/gen_links.sh index d06175a..63ec5e3 100755 --- a/hss/gen_links.sh +++ b/hss/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/hss/regen_makefile.sh b/hss/regen_makefile.sh index ac05766..97aa898 100755 --- a/hss/regen_makefile.sh +++ b/hss/regen_makefile.sh @@ -20,4 +20,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/ipad/gen_links.sh b/ipad/gen_links.sh index 130c68e..73901de 100755 --- a/ipad/gen_links.sh +++ b/ipad/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/ipad/regen_makefile.sh b/ipad/regen_makefile.sh index 9123e43..f1a7f99 100755 --- a/ipad/regen_makefile.sh +++ b/ipad/regen_makefile.sh @@ -19,7 +19,7 @@ PKIX1Implicit88_EncDec.cc VPCD_CodecPort_CtrlFunctDef.cc " -../regen-makefile.sh IPAd_Tests.ttcn $FILES +../_buildsystem/regen-makefile.sh IPAd_Tests.ttcn $FILES # required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/library/hnbap/regen_makefile.sh b/library/hnbap/regen_makefile.sh index 4da6872..7a63cf3 100755 --- a/library/hnbap/regen_makefile.sh +++ b/library/hnbap/regen_makefile.sh @@ -2,7 +2,7 @@ FILES="*.asn *.ttcn HNBAP_EncDec.cc" -../../regen-makefile.sh $FILES +../../_buildsystem/regen-makefile.sh $FILES sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/ranap/regen_makefile.sh b/library/ranap/regen_makefile.sh index 0ae1cfd..37122c5 100755 --- a/library/ranap/regen_makefile.sh +++ b/library/ranap/regen_makefile.sh @@ -2,7 +2,7 @@ FILES="*.asn *.ttcn RANAP_EncDec.cc" -../../regen-makefile.sh $FILES +../../_buildsystem/regen-makefile.sh $FILES sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/rua/regen_makefile.sh b/library/rua/regen_makefile.sh index 1f45203..72cee57 100755 --- a/library/rua/regen_makefile.sh +++ b/library/rua/regen_makefile.sh @@ -2,7 +2,7 @@ FILES="*.asn *.ttcn RUA_EncDec.cc" -../../regen-makefile.sh $FILES +../../_buildsystem/regen-makefile.sh $FILES sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/s1ap/regen_makefile.sh b/library/s1ap/regen_makefile.sh index fae086c..6906618 100755 --- a/library/s1ap/regen_makefile.sh +++ b/library/s1ap/regen_makefile.sh @@ -2,7 +2,7 @@ FILES="*.asn *.ttcn S1AP_EncDec.cc" -../../regen-makefile.sh $FILES +../../_buildsystem/regen-makefile.sh $FILES sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/sabp/regen_makefile.sh b/library/sabp/regen_makefile.sh index 382fbd5..0b9d88e 100755 --- a/library/sabp/regen_makefile.sh +++ b/library/sabp/regen_makefile.sh @@ -2,7 +2,7 @@ FILES="*.asn *.ttcn SABP_EncDec.cc" -../../regen-makefile.sh $FILES +../../_buildsystem/regen-makefile.sh $FILES sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/sbcap/regen_makefile.sh b/library/sbcap/regen_makefile.sh index 0cd6083..82a2a15 100755 --- a/library/sbcap/regen_makefile.sh +++ b/library/sbcap/regen_makefile.sh @@ -2,7 +2,7 @@ FILES="*.asn *.ttcn SBC_AP_EncDec.cc" -../../regen-makefile.sh $FILES +../../_buildsystem/regen-makefile.sh $FILES sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh index 629be98..571c2cb 100755 --- a/mgw/gen_links.sh +++ b/mgw/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh index 2b78cf0..a3d4a74 100755 --- a/mgw/regen_makefile.sh +++ b/mgw/regen_makefile.sh @@ -28,4 +28,4 @@ -DSTATSD_HAVE_VTY " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 61f6f73..b5c6db6 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 6e86346..690020b 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -32,6 +32,6 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lgnutls/' Makefile diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 93e339c..c1478c2 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index 081d2cb..3aa3515 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -44,6 +44,6 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lssl/' Makefile diff --git a/ns/gen_links.sh b/ns/gen_links.sh index fde0a67..16cf2e4 100755 --- a/ns/gen_links.sh +++ b/ns/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/ns/regen_makefile.sh b/ns/regen_makefile.sh index 57dde2d..f778317 100755 --- a/ns/regen_makefile.sh +++ b/ns/regen_makefile.sh @@ -25,4 +25,4 @@ -DSTATSD_HAVE_VTY " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/pcap-client/gen_links.sh b/pcap-client/gen_links.sh index e459959..6423df8 100755 --- a/pcap-client/gen_links.sh +++ b/pcap-client/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/pcap-client/regen_makefile.sh b/pcap-client/regen_makefile.sh index 81dd1eb..d3e7b2c 100755 --- a/pcap-client/regen_makefile.sh +++ b/pcap-client/regen_makefile.sh @@ -16,4 +16,4 @@ export CPPFLAGS_TTCN3="" -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/pcrf/gen_links.sh b/pcrf/gen_links.sh index baa8315..7001432 100755 --- a/pcrf/gen_links.sh +++ b/pcrf/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/pcrf/regen_makefile.sh b/pcrf/regen_makefile.sh index 7d703ad..3883291 100755 --- a/pcrf/regen_makefile.sh +++ b/pcrf/regen_makefile.sh @@ -20,4 +20,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index 146f538..bf4d7f3 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index 9cb1554..1237c03 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -25,4 +25,4 @@ -DSTATSD_HAVE_VTY " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index ff7d1c6..45114a5 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index 2f58493..b6b7f66 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -28,4 +28,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/remsim/gen_links.sh b/remsim/gen_links.sh index 615c550..992ed8e 100755 --- a/remsim/gen_links.sh +++ b/remsim/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh index fb04cce..d08dbdc 100755 --- a/remsim/regen_makefile.sh +++ b/remsim/regen_makefile.sh @@ -27,7 +27,7 @@ -DIPA_EMULATION_CTRL " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES # required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/s1gw/gen_links.sh b/s1gw/gen_links.sh index 875e028..0f7d8ed 100755 --- a/s1gw/gen_links.sh +++ b/s1gw/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/s1gw/regen_makefile.sh b/s1gw/regen_makefile.sh index adf765e..173a7a1 100755 --- a/s1gw/regen_makefile.sh +++ b/s1gw/regen_makefile.sh @@ -22,7 +22,7 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/sccp/gen_links.sh b/sccp/gen_links.sh index 614e0f1..fb30488 100755 --- a/sccp/gen_links.sh +++ b/sccp/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh index 7cd809d..397a210 100755 --- a/sccp/regen_makefile.sh +++ b/sccp/regen_makefile.sh @@ -24,4 +24,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index d5ffe6d..d1307ac 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh index 383e2db..b3a725d 100755 --- a/selftest/regen_makefile.sh +++ b/selftest/regen_makefile.sh @@ -19,4 +19,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index bae9a3b..54e5fe1 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index 5c9c5ea..a378773 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -32,6 +32,6 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/simtrace/gen_links.sh b/simtrace/gen_links.sh index 3bce04d..fa588fc 100755 --- a/simtrace/gen_links.sh +++ b/simtrace/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCConversion_Functions.ttcn TCCConversion.cc" diff --git a/simtrace/regen_makefile.sh b/simtrace/regen_makefile.sh index 04c8397..0080e70 100755 --- a/simtrace/regen_makefile.sh +++ b/simtrace/regen_makefile.sh @@ -12,7 +12,7 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES #sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile diff --git a/sip/gen_links.sh b/sip/gen_links.sh index 4c8456c..85d441a 100755 --- a/sip/gen_links.sh +++ b/sip/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/sip/regen_makefile.sh b/sip/regen_makefile.sh index b737316..09618b5 100755 --- a/sip/regen_makefile.sh +++ b/sip/regen_makefile.sh @@ -28,4 +28,4 @@ -DRAN_EMULATION_CTRL " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/smlc/gen_links.sh b/smlc/gen_links.sh index cf715f6..a4e8e3f 100755 --- a/smlc/gen_links.sh +++ b/smlc/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh #DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src #FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh index 180486c..279ff76 100755 --- a/smlc/regen_makefile.sh +++ b/smlc/regen_makefile.sh @@ -32,4 +32,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/stp/gen_links.sh b/stp/gen_links.sh index ad5d605..519b450 100755 --- a/stp/gen_links.sh +++ b/stp/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh index 032be0d..b2c2d3c 100755 --- a/stp/regen_makefile.sh +++ b/stp/regen_makefile.sh @@ -24,4 +24,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index 538fff2..01e69eb 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh index 1ed5835..6bd42c5 100755 --- a/sysinfo/regen_makefile.sh +++ b/sysinfo/regen_makefile.sh @@ -16,4 +16,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES diff --git a/upf/gen_links.sh b/upf/gen_links.sh index 6c710ee..5ca92be 100755 --- a/upf/gen_links.sh +++ b/upf/gen_links.sh @@ -2,7 +2,7 @@ BASEDIR=../deps -. ../gen_links.sh.inc +. ../_buildsystem/gen_links.inc.sh DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" diff --git a/upf/regen_makefile.sh b/upf/regen_makefile.sh index 1368db1..c704184 100755 --- a/upf/regen_makefile.sh +++ b/upf/regen_makefile.sh @@ -22,4 +22,4 @@ -DSTATSD_HAVE_VTY " -../regen-makefile.sh -e $NAME $FILES +../_buildsystem/regen-makefile.sh -e $NAME $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40026?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieeefdfd74b2698794fb12fec4ed32565dc9f36a6 Gerrit-Change-Number: 40026 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: buildsystem: make output more readable

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40033?usp=email ) Change subject: buildsystem: make output more readable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40033?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I780106e64089dc24a7ba724f6a94e67417d49c30 Gerrit-Change-Number: 40033 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Apr 2025 09:24:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: buildsystem: build out-of-tree

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40032?usp=email ) Change subject: buildsystem: build out-of-tree ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40032?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If18aaf2a2a0d55bb617e5cb1b73f6ee4b1952494 Gerrit-Change-Number: 40032 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Apr 2025 09:22:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: buildsystem/gen_links: rename ignore_pp_results

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40031?usp=email ) Change subject: buildsystem/gen_links: rename ignore_pp_results ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40031?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a1a79f1a3ff18fe4b51e4c72c3e9b56c571935e Gerrit-Change-Number: 40031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Apr 2025 09:18:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: buildsystem/gen_links: move set -e to users

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40030?usp=email ) Change subject: buildsystem/gen_links: move set -e to users ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40030?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4caf445bef716161526a213d6a06ecc9d30f78cb Gerrit-Change-Number: 40030 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Apr 2025 09:16:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: buildsystem/regen_makefile: modernize

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40029?usp=email ) Change subject: buildsystem/regen_makefile: modernize ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File _buildsystem/regen_makefile.inc.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40029/comment/b9fdf7bd_7904… : PS1, Line 53: if command -v ccache >/dev/null; then AFAIU you are dropping the feature here to disable ccache by passing USE_CCACHE=0 here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40029?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5a7dcd6171c6a370928ebedafc5ed318384dd8dd Gerrit-Change-Number: 40029 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Apr 2025 09:16:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: buildsystem: remove ttcn3_compiler workaround

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40028?usp=email ) Change subject: buildsystem: remove ttcn3_compiler workaround ...................................................................... Patch Set 1: Code-Review+2 (2 comments) File _buildsystem/regen_makefile.inc.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40028/comment/1fdfadd0_c3bc… : PS1, Line 73: sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile FYI My current eclipse-titan Archlinux package has both: /opt/eclipse-titan/bin/compiler /opt/eclipse-titan/bin/ttcn3_compiler ttcn3_compiler is actually a symlink to "compiler". https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40028/comment/cc9a27dd_3908… : PS1, Line 62: sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr\/ttcn3/' Makefile This is probably not needed anymore, I don't see any /usr/ttcn3 in my dir. eclipse-titan pkg seems to install under /opt/eclipse-titan/ nowadays. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40028?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia50aa3caffeaa85eefba10695096aa23dcb69c93 Gerrit-Change-Number: 40028 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Apr 2025 09:14:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: buildsystem/regen_makefile: change to inc script

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40027?usp=email ) Change subject: buildsystem/regen_makefile: change to inc script ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40027?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I10a41671e857024be6a5e8577c2aaca83228793e Gerrit-Change-Number: 40027 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Apr 2025 09:09:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log