April 2025 - gerrit-log - lists.osmocom.org

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40030?usp=email ) Change subject: buildsystem/gen_links: move set -e to users ...................................................................... buildsystem/gen_links: move set -e to users Make it more obvious that the various gen_links.sh scripts are running with "set -e" by adding it to the #! line instead of setting it through an included file. Change-Id: I4caf445bef716161526a213d6a06ecc9d30f78cb --- M SCCP_Test/gen_links.sh M _buildsystem/gen_links.inc.sh M asterisk/gen_links.sh M bsc-nat/gen_links.sh M bsc/gen_links.sh M bts/gen_links.sh M cbc/gen_links.sh M ccid/gen_links.sh M dia2gsup/gen_links.sh M eim/gen_links.sh M epdg/gen_links.sh M fr-net/gen_links.sh M fr/gen_links.sh M gbproxy/gen_links.sh M ggsn_tests/gen_links.sh M hlr/gen_links.sh M hnbgw/gen_links.sh M hnodeb/gen_links.sh M hss/gen_links.sh M ipad/gen_links.sh M mgw/gen_links.sh M mme/gen_links.sh M msc/gen_links.sh M ns/gen_links.sh M pcap-client/gen_links.sh M pcrf/gen_links.sh M pcu/gen_links.sh M pgw/gen_links.sh M remsim/gen_links.sh M s1gw/gen_links.sh M sccp/gen_links.sh M selftest/gen_links.sh M sgsn/gen_links.sh M simtrace/gen_links.sh M sip/gen_links.sh M smlc/gen_links.sh M stp/gen_links.sh M sysinfo/gen_links.sh M upf/gen_links.sh 39 files changed, 38 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/40030/1 diff --git a/SCCP_Test/gen_links.sh b/SCCP_Test/gen_links.sh index 7bae850..f6b5591 100755 --- a/SCCP_Test/gen_links.sh +++ b/SCCP_Test/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/_buildsystem/gen_links.inc.sh b/_buildsystem/gen_links.inc.sh index f134427..c21bcd6 100644 --- a/_buildsystem/gen_links.inc.sh +++ b/_buildsystem/gen_links.inc.sh @@ -16,8 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -e - rm -f .gitignore gen_link() { diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh index afd6a8d..f61052e 100755 --- a/asterisk/gen_links.sh +++ b/asterisk/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index aa9fb54..8e0f9c1 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index 30bfba7..e6ff0fd 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/bts/gen_links.sh b/bts/gen_links.sh index 1f16334..4e952d2 100755 --- a/bts/gen_links.sh +++ b/bts/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/cbc/gen_links.sh b/cbc/gen_links.sh index 314de12..9e7e2d0 100755 --- a/cbc/gen_links.sh +++ b/cbc/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/ccid/gen_links.sh b/ccid/gen_links.sh index 99698e6..a0ffc87 100755 --- a/ccid/gen_links.sh +++ b/ccid/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/dia2gsup/gen_links.sh b/dia2gsup/gen_links.sh index eb65263..a159862 100755 --- a/dia2gsup/gen_links.sh +++ b/dia2gsup/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/eim/gen_links.sh b/eim/gen_links.sh index 2e73c7c..48f2129 100755 --- a/eim/gen_links.sh +++ b/eim/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh index abc0287..9eeb691 100755 --- a/epdg/gen_links.sh +++ b/epdg/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/fr-net/gen_links.sh b/fr-net/gen_links.sh index 71370e2..ce84938 100755 --- a/fr-net/gen_links.sh +++ b/fr-net/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/fr/gen_links.sh b/fr/gen_links.sh index 71370e2..ce84938 100755 --- a/fr/gen_links.sh +++ b/fr/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/gbproxy/gen_links.sh b/gbproxy/gen_links.sh index 7320c57..25a5f59 100755 --- a/gbproxy/gen_links.sh +++ b/gbproxy/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index 9aad2d7..18b5113 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index 3326e96..e7697fb 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index f0c81fe..1c1b1b5 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/hnodeb/gen_links.sh b/hnodeb/gen_links.sh index 86e1299..dcb5379 100755 --- a/hnodeb/gen_links.sh +++ b/hnodeb/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/hss/gen_links.sh b/hss/gen_links.sh index 63ec5e3..74a9db8 100755 --- a/hss/gen_links.sh +++ b/hss/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/ipad/gen_links.sh b/ipad/gen_links.sh index 73901de..8daadaf 100755 --- a/ipad/gen_links.sh +++ b/ipad/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh index 571c2cb..69d61fc 100755 --- a/mgw/gen_links.sh +++ b/mgw/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/mme/gen_links.sh b/mme/gen_links.sh index b5c6db6..3f0b63a 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/msc/gen_links.sh b/msc/gen_links.sh index c1478c2..92e979c 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/ns/gen_links.sh b/ns/gen_links.sh index 16cf2e4..a726824 100755 --- a/ns/gen_links.sh +++ b/ns/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/pcap-client/gen_links.sh b/pcap-client/gen_links.sh index 6423df8..82c5f99 100755 --- a/pcap-client/gen_links.sh +++ b/pcap-client/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/pcrf/gen_links.sh b/pcrf/gen_links.sh index 7001432..1e708e4 100755 --- a/pcrf/gen_links.sh +++ b/pcrf/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index bf4d7f3..dea0ed6 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index 45114a5..9da4406 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/remsim/gen_links.sh b/remsim/gen_links.sh index 992ed8e..1ceab7b 100755 --- a/remsim/gen_links.sh +++ b/remsim/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/s1gw/gen_links.sh b/s1gw/gen_links.sh index 0f7d8ed..ab85bee 100755 --- a/s1gw/gen_links.sh +++ b/s1gw/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/sccp/gen_links.sh b/sccp/gen_links.sh index fb30488..55f171b 100755 --- a/sccp/gen_links.sh +++ b/sccp/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index d1307ac..249baf3 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 54e5fe1..23fcb83 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/simtrace/gen_links.sh b/simtrace/gen_links.sh index fa588fc..63be15e 100755 --- a/simtrace/gen_links.sh +++ b/simtrace/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/sip/gen_links.sh b/sip/gen_links.sh index 85d441a..99536cf 100755 --- a/sip/gen_links.sh +++ b/sip/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/smlc/gen_links.sh b/smlc/gen_links.sh index a4e8e3f..0626a53 100755 --- a/smlc/gen_links.sh +++ b/smlc/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/stp/gen_links.sh b/stp/gen_links.sh index 519b450..17000ed 100755 --- a/stp/gen_links.sh +++ b/stp/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index 01e69eb..12d6615 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps diff --git a/upf/gen_links.sh b/upf/gen_links.sh index 5ca92be..62e8c56 100755 --- a/upf/gen_links.sh +++ b/upf/gen_links.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e BASEDIR=../deps -- 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: newchange 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>

4 months, 1 week

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40031?usp=email ) Change subject: buildsystem/gen_links: rename ignore_pp_results ...................................................................... buildsystem/gen_links: rename ignore_pp_results Rename ignore_pp_results to gen_links_finish in preparation for the next patch where the function will be used for generating more symlinks instead of writing to a gitignore file. This is a separate commit to make the next one more readable. Change-Id: I6a1a79f1a3ff18fe4b51e4c72c3e9b56c571935e --- M SCCP_Test/gen_links.sh M _buildsystem/gen_links.inc.sh M asterisk/gen_links.sh M bsc-nat/gen_links.sh M bsc/gen_links.sh M bts/gen_links.sh M cbc/gen_links.sh M ccid/gen_links.sh M dia2gsup/gen_links.sh M eim/gen_links.sh M epdg/gen_links.sh M fr-net/gen_links.sh M fr/gen_links.sh M gbproxy/gen_links.sh M ggsn_tests/gen_links.sh M hlr/gen_links.sh M hnbgw/gen_links.sh M hnodeb/gen_links.sh M hss/gen_links.sh M ipad/gen_links.sh M mgw/gen_links.sh M mme/gen_links.sh M msc/gen_links.sh M ns/gen_links.sh M pcap-client/gen_links.sh M pcrf/gen_links.sh M pcu/gen_links.sh M pgw/gen_links.sh M remsim/gen_links.sh M s1gw/gen_links.sh M sccp/gen_links.sh M selftest/gen_links.sh M sgsn/gen_links.sh M simtrace/gen_links.sh M sip/gen_links.sh M smlc/gen_links.sh M stp/gen_links.sh M sysinfo/gen_links.sh M upf/gen_links.sh 39 files changed, 39 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/40031/1 diff --git a/SCCP_Test/gen_links.sh b/SCCP_Test/gen_links.sh index f6b5591..8b33c1a 100755 --- a/SCCP_Test/gen_links.sh +++ b/SCCP_Test/gen_links.sh @@ -45,4 +45,4 @@ Native_Functions.ttcn Native_FunctionDefs.cc SCCP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/_buildsystem/gen_links.inc.sh b/_buildsystem/gen_links.inc.sh index c21bcd6..5701f0f 100644 --- a/_buildsystem/gen_links.inc.sh +++ b/_buildsystem/gen_links.inc.sh @@ -35,7 +35,7 @@ done } -ignore_pp_results() { +gen_links_finish() { # Avoid using the pattern itself if no file is found in globbing below: shopt -s nullglob for pp in *.ttcnpp; do diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh index f61052e..4113965 100755 --- a/asterisk/gen_links.sh +++ b/asterisk/gen_links.sh @@ -48,4 +48,4 @@ FILES+="SIP_Emulation.ttcn SIP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index 8e0f9c1..fa7e868 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -55,4 +55,4 @@ FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_VTY_Functions.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn BSSAP_CodecPort.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index e6ff0fd..7e31117 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -76,4 +76,4 @@ gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/bts/gen_links.sh b/bts/gen_links.sh index 4e952d2..b04a876 100755 --- a/bts/gen_links.sh +++ b/bts/gen_links.sh @@ -52,4 +52,4 @@ FILES+="IPA_Testing.ttcn" gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/cbc/gen_links.sh b/cbc/gen_links.sh index 9e7e2d0..129de44 100755 --- a/cbc/gen_links.sh +++ b/cbc/gen_links.sh @@ -60,4 +60,4 @@ FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/ccid/gen_links.sh b/ccid/gen_links.sh index a0ffc87..dac7ffe 100755 --- a/ccid/gen_links.sh +++ b/ccid/gen_links.sh @@ -18,4 +18,4 @@ FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/dia2gsup/gen_links.sh b/dia2gsup/gen_links.sh index a159862..75d165d 100755 --- a/dia2gsup/gen_links.sh +++ b/dia2gsup/gen_links.sh @@ -44,4 +44,4 @@ FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/eim/gen_links.sh b/eim/gen_links.sh index 48f2129..c633311 100755 --- a/eim/gen_links.sh +++ b/eim/gen_links.sh @@ -44,4 +44,4 @@ FILES+="HTTP_Server_Emulation.ttcn HTTP_Adapter.ttcn" gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh index 9eeb691..889cb9a 100755 --- a/epdg/gen_links.sh +++ b/epdg/gen_links.sh @@ -66,4 +66,4 @@ FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/fr-net/gen_links.sh b/fr-net/gen_links.sh index ce84938..64e5b43 100755 --- a/fr-net/gen_links.sh +++ b/fr-net/gen_links.sh @@ -52,4 +52,4 @@ FILES+="LLC_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/fr/gen_links.sh b/fr/gen_links.sh index ce84938..64e5b43 100755 --- a/fr/gen_links.sh +++ b/fr/gen_links.sh @@ -52,4 +52,4 @@ FILES+="LLC_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/gbproxy/gen_links.sh b/gbproxy/gen_links.sh index 25a5f59..c71f049 100755 --- a/gbproxy/gen_links.sh +++ b/gbproxy/gen_links.sh @@ -95,4 +95,4 @@ GTPv1C_Templates.ttcn IPCP_Types.ttcn IPCP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index 18b5113..4bbe462 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -68,4 +68,4 @@ FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index e7697fb..a077937 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -54,4 +54,4 @@ gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index 1c1b1b5..a6a2f54 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -108,4 +108,4 @@ FILES+="Mutex.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/hnodeb/gen_links.sh b/hnodeb/gen_links.sh index dcb5379..118bb8b 100755 --- a/hnodeb/gen_links.sh +++ b/hnodeb/gen_links.sh @@ -69,4 +69,4 @@ FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/hss/gen_links.sh b/hss/gen_links.sh index 74a9db8..5fcd559 100755 --- a/hss/gen_links.sh +++ b/hss/gen_links.sh @@ -37,4 +37,4 @@ FILES+="HTTP_Adapter.ttcn Prometheus_Checker.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/ipad/gen_links.sh b/ipad/gen_links.sh index 8daadaf..f47bc6e 100755 --- a/ipad/gen_links.sh +++ b/ipad/gen_links.sh @@ -40,4 +40,4 @@ FILES+="VPCD_Adapter.ttcn HTTP_Server_Emulation.ttcn" gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh index 69d61fc..f185902 100755 --- a/mgw/gen_links.sh +++ b/mgw/gen_links.sh @@ -52,4 +52,4 @@ gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 3f0b63a..98194ad 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -84,4 +84,4 @@ FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 92e979c..63d90fc 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -105,4 +105,4 @@ FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/ns/gen_links.sh b/ns/gen_links.sh index a726824..e1e9895 100755 --- a/ns/gen_links.sh +++ b/ns/gen_links.sh @@ -57,4 +57,4 @@ FILES+="LLC_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/pcap-client/gen_links.sh b/pcap-client/gen_links.sh index 82c5f99..5e4cd93 100755 --- a/pcap-client/gen_links.sh +++ b/pcap-client/gen_links.sh @@ -28,4 +28,4 @@ FILES+="OPCAP_CodecPort.ttcn OPCAP_CodecPort_CtrlFunct.ttcn OPCAP_CodecPort_CtrlFunctdef.cc OPCAP_Adapter.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/pcrf/gen_links.sh b/pcrf/gen_links.sh index 1e708e4..12ae9f7 100755 --- a/pcrf/gen_links.sh +++ b/pcrf/gen_links.sh @@ -37,4 +37,4 @@ FILES+="HTTP_Adapter.ttcn Prometheus_Checker.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index dea0ed6..cf3c124 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -60,4 +60,4 @@ FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index 9da4406..314050e 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -68,4 +68,4 @@ FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/remsim/gen_links.sh b/remsim/gen_links.sh index 1ceab7b..e013a77 100755 --- a/remsim/gen_links.sh +++ b/remsim/gen_links.sh @@ -48,4 +48,4 @@ VPCD_Adapter.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/s1gw/gen_links.sh b/s1gw/gen_links.sh index ab85bee..6328ab8 100755 --- a/s1gw/gen_links.sh +++ b/s1gw/gen_links.sh @@ -35,4 +35,4 @@ FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/sccp/gen_links.sh b/sccp/gen_links.sh index 55f171b..693f66f 100755 --- a/sccp/gen_links.sh +++ b/sccp/gen_links.sh @@ -59,4 +59,4 @@ FILES+="SCCP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index 249baf3..e6dcfbd 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -42,4 +42,4 @@ FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn GSM_RestOctets.ttcn RSL_Types.ttcn BSSAP_CodecPort.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn PCO_Types.ttcn GSUP_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 23fcb83..992e757 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -99,4 +99,4 @@ FILES+="GTP_Emulation.ttcn IPCP_Types.ttcn IPCP_Templates.ttcn RAW_NS.ttcnpp " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/simtrace/gen_links.sh b/simtrace/gen_links.sh index 63be15e..62b4346 100755 --- a/simtrace/gen_links.sh +++ b/simtrace/gen_links.sh @@ -18,4 +18,4 @@ FILES+="SIMTRACE_Types.ttcn SIMTRACE_Templates.ttcn SIMTRACE_Emulation.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/sip/gen_links.sh b/sip/gen_links.sh index 99536cf..72c5122 100755 --- a/sip/gen_links.sh +++ b/sip/gen_links.sh @@ -49,4 +49,4 @@ FILES+="SIP_Emulation.ttcn SIP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/smlc/gen_links.sh b/smlc/gen_links.sh index 0626a53..4aeedd8 100755 --- a/smlc/gen_links.sh +++ b/smlc/gen_links.sh @@ -72,4 +72,4 @@ gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/stp/gen_links.sh b/stp/gen_links.sh index 17000ed..625a3de 100755 --- a/stp/gen_links.sh +++ b/stp/gen_links.sh @@ -55,4 +55,4 @@ FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index 12d6615..95bb0ee 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -28,4 +28,4 @@ FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn" gen_links $DIR $FILES -ignore_pp_results +gen_links_finish diff --git a/upf/gen_links.sh b/upf/gen_links.sh index 62e8c56..2a65368 100755 --- a/upf/gen_links.sh +++ b/upf/gen_links.sh @@ -33,4 +33,4 @@ FILES+="PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn PFCP_Templates.ttcn" gen_links $DIR $FILES -ignore_pp_results +gen_links_finish -- 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: newchange 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>

4 months, 1 week

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40032?usp=email ) Change subject: buildsystem: build out-of-tree ...................................................................... buildsystem: build out-of-tree The buildsystem used to create symlinks to dependency source files in the testsuite directories, and then building inside that source directory. This lead to many unrelated files being in the source directory. Change the logic to create symlinks to all sources in a separate $BUILDDIR instead (default: _build) and do the build there. Advantages: * Source directories are not cluttered with other files anymore. * Clean up logic becomes much simpler and faster (rm -rf _build instead of generating a Makefile and running "make clean" in every testsuite directory). * Using a separate $BUILDDIR is now possible, this will be used by testenv in a follow-up patch when running with podman, to make sure that build artifacts from podman and not using podman are not mixed as they are incompatible. Related: OS#6599 Change-Id: If18aaf2a2a0d55bb617e5cb1b73f6ee4b1952494 --- M .gitignore M Makefile M _buildsystem/gen_links.inc.sh M _buildsystem/regen_makefile.inc.sh D _buildsystem/rmlinks.sh M _testenv/testenv/testsuite.py M start-testsuite.sh 7 files changed, 89 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/40032/1 diff --git a/.gitignore b/.gitignore index d1a9de5..b14e63c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ __pycache__ tags .linux +_build diff --git a/Makefile b/Makefile index 2355d9a..e490df8 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +BUILDDIR ?= _build + SUBDIRS= \ asterisk \ bsc \ @@ -87,43 +89,46 @@ deps-update: .make.deps compile: $(foreach dir,$(SUBDIRS),$(dir)/compile) -clean: $(foreach dir,$(SUBDIRS),$(dir)/clean) +clean-old: $(foreach dir,$(SUBDIRS),$(dir)/clean-old) + @rm -rfv ~/.cache/osmo-ttcn3-testenv/podman/osmo-ttcn3-hacks all: $(foreach dir,$(SUBDIRS),$(dir)/all) define DIR_Makefile_template -$(1)/Makefile: $(1)/gen_links.sh $(1)/regen_makefile.sh +$(BUILDDIR)/$(1)/Makefile: $(1)/gen_links.sh $(1)/regen_makefile.sh (cd $(1) && ./gen_links.sh && ./regen_makefile.sh) endef define DIR_compile_template .PHONY: $(1)/compile -$(1)/compile: deps $(1)/Makefile - $(MAKE) -C $(1) compile +$(1)/compile: deps $(BUILDDIR)/$(1)/Makefile + $(MAKE) -C $(BUILDDIR)/$(1) compile endef -define DIR_clean_template -.PHONY: $(1)/clean -$(1)/clean: $(1)/Makefile - $(MAKE) -C $(1) clean - (cd $(1) && ../_buildsystem/rmlinks.sh && rm Makefile) +# Remove left-over files from before the buildsystem was changed to do +# out-of-tree builds. _buildsystem/gen_links.inc.sh tells the users to run this +# if needed. +define DIR_clean_old_template +.PHONY: $(1)/clean-old +$(1)/clean-old: + @git clean -fx "$(1)" endef define DIR_all_template $(1): $(1)/all .PHONY: $(1)/all -$(1)/all: deps $(1)/Makefile - $(MAKE) -C $(1) compile - $(MAKE) $(PARALLEL_MAKE) -C $(1) +$(1)/all: deps $(BUILDDIR)/$(1)/Makefile + $(MAKE) -C $(BUILDDIR)/$(1) compile + $(MAKE) $(PARALLEL_MAKE) -C $(BUILDDIR)/$(1) endef $(foreach dir,$(SUBDIRS), \ $(eval $(call DIR_Makefile_template,$(dir))) \ $(eval $(call DIR_compile_template,$(dir))) \ - $(eval $(call DIR_clean_template,$(dir))) \ + $(eval $(call DIR_clean_old_template,$(dir))) \ $(eval $(call DIR_all_template,$(dir))) \ ) -.PHONY: tags regen-diameter-types-ttcn +.PHONY: tags regen-diameter-types-ttcn clean tags: find $(shell pwd) \ -type f -name "*.ttcn" -o \ @@ -132,3 +137,9 @@ regen-diameter-types-ttcn: (cd library/ && ./regen-DIAMETER_Types_ttcn.sh) + +# Intentionally not using $(BUILDDIR) here to avoid user errors leading to +# unintentional removal of other files. If $(BUILDDIR) is changed, it is +# trivial to clean up the builddir manually. +clean: + rm -rf _build diff --git a/_buildsystem/gen_links.inc.sh b/_buildsystem/gen_links.inc.sh index 5701f0f..161754c 100644 --- a/_buildsystem/gen_links.inc.sh +++ b/_buildsystem/gen_links.inc.sh @@ -1,45 +1,57 @@ -#!dont_run_this +# Copyright 2017 Harald Welte +# Copyright 2018-2025 sysmocom - s.f.m.c. GmbH +# SPDX-License-Identifier: Apache-2.0 # This file is sourced by */gen_links.sh -# Copyright 2017 Harald Welte -# Copyright 2018 sysmocom - s.f.m.c. GmbH -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +if [ -e Makefile ]; then + echo + echo "ERROR: found old build artefacts in source tree" + echo + echo "osmo-ttcn3-hacks does out-of-tree builds now. Make sure that you" + echo "have comitted all code changes and run 'make clean-old' once" + echo "to clean up your source tree, then try again." + echo + exit 1 +fi -rm -f .gitignore +TOPDIR="$(realpath "$(dirname "$0")/..")" +PROJECTDIR=$(realpath . --relative-to "$TOPDIR") # e.g. "msc", "library/rua" +BUILDDIR="${BUILDDIR:-$TOPDIR/_build}" -gen_link() { - src="$1" - f="$2" - echo "Linking $f" - ln -sf "$src" "$f" - echo "$f" >> .gitignore -} +mkdir -p "$BUILDDIR/$PROJECTDIR" gen_links() { - DIR=$1 + local f + local dir="$1" shift - FILES=$* - for f in $FILES; do - gen_link "$DIR/$f" "$f" + local files="$*" + + for f in $files; do + (ln -sf \ + "$(realpath "$TOPDIR/$PROJECTDIR/$dir/$f")" \ + "$BUILDDIR/$PROJECTDIR/$f") & done } gen_links_finish() { - # Avoid using the pattern itself if no file is found in globbing below: - shopt -s nullglob - for pp in *.ttcnpp; do - ttcn_file="$(echo $pp | sed 's/pp$//')" - echo "$ttcn_file" >> .gitignore + local f + local patterns=" + *.asn + *.c + *.cc + *.h + *.hh + *.ttcn + *.ttcnpp + " + for f in $patterns; do + if ! [ -e "$f" ]; then + continue + fi + + ln -sf \ + "$TOPDIR/$PROJECTDIR/$f" \ + "$BUILDDIR/$PROJECTDIR/$f" & done + wait } diff --git a/_buildsystem/regen_makefile.inc.sh b/_buildsystem/regen_makefile.inc.sh index 6d874d3..3c10a68 100644 --- a/_buildsystem/regen_makefile.inc.sh +++ b/_buildsystem/regen_makefile.inc.sh @@ -18,6 +18,12 @@ exit 1 fi +TOPDIR="$(realpath "$(dirname "$0")/..")" +BUILDDIR="${BUILDDIR:-$TOPDIR/_build}" +PROJECTDIR=$(realpath . --relative-to "$TOPDIR") # e.g. "msc", "library/rua" + +cd "$BUILDDIR/$PROJECTDIR" + ttcn3_makefilegen -g -p -l -U 8 -f -e "$NAME" $FILES sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile diff --git a/_buildsystem/rmlinks.sh b/_buildsystem/rmlinks.sh deleted file mode 100755 index 65ee03c..0000000 --- a/_buildsystem/rmlinks.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -find . -type l -delete diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 9b28668..c1d048b 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -3,7 +3,6 @@ import atexit import glob import logging -import multiprocessing import os import os.path import shlex @@ -99,11 +98,7 @@ def build(): logging.info("Building testsuite") - testsuite_dir = f"{ttcn3_hacks_dir}/{testenv.args.testsuite}" - testenv.cmd.run(["make", "compile"], cwd=testsuite_dir) - - jobs = multiprocessing.cpu_count() + 1 - testenv.cmd.run(["make", "-j", f"{jobs}"], cwd=testsuite_dir) + testenv.cmd.run(["make", testenv.args.testsuite], cwd=ttcn3_hacks_dir) def is_running(pid): @@ -173,6 +168,7 @@ cwd = os.path.join(testenv.testdir.testdir, "testsuite") start_testsuite = os.path.join(ttcn3_hacks_dir, "start-testsuite.sh") suite = os.path.join(ttcn3_hacks_dir, testenv.args.testsuite, section_data["program"]) + suite = os.path.relpath(suite, ttcn3_hacks_dir) env = { "TTCN3_PCAP_PATH": os.path.join(testenv.testdir.testdir, "testsuite"), diff --git a/start-testsuite.sh b/start-testsuite.sh index 4b88501..8c55779 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -27,8 +27,11 @@ exit 1 fi +TOPDIR="$(realpath "$(dirname "$0")")" +BUILDDIR="${BUILDDIR:-$TOPDIR/_build}" + SUITE=$1 -SUITE_DIR="$(dirname "$SUITE")" +SUITE_DIR="$(basename "$(dirname "$SUITE")")" SUITE_NAME="$(basename "$SUITE")" CFG="$SUITE_NAME.cfg" if [ $# -gt 1 ]; then @@ -52,9 +55,13 @@ # below is for the debian packages TTCN3_BIN_DIR="${TTCN3_BIN_DIR:-/usr/bin}" TITAN_LIBRARY_PATH="${TITAN_LIBRARY_PATH:-/usr/lib/titan:/usr/ttcn3/lib}" -LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" "$TTCN3_BIN_DIR/ttcn3_start" $SUITE $CFG $TEST +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BUILDDIR/$SUITE_DIR:$TITAN_LIBRARY_PATH" \ + "$TTCN3_BIN_DIR/ttcn3_start" \ + "$BUILDDIR/$SUITE_DIR/$SUITE_NAME" \ + "$CFG" \ + "$TEST" -expected="$SUITE_DIR/expected-results.xml" +expected="$TOPDIR/$SUITE_DIR/expected-results.xml" if [ ! -f "$expected" ]; then echo "No expected results found, not comparing outcome. ($expected)" exit 0 @@ -67,7 +74,7 @@ exit 1 fi -compare="$SUITE_DIR/../compare-results.py" +compare="$TOPDIR/compare-results.py" if [ ! -x "$compare" ]; then echo "ERROR: cannot find $compare" exit 1 -- 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: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If18aaf2a2a0d55bb617e5cb1b73f6ee4b1952494 Gerrit-Change-Number: 40032 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40033?usp=email ) Change subject: buildsystem: make output more readable ...................................................................... buildsystem: make output more readable Generate short and readable compile messages: CC IPL4asp_PT.o CCLD TCCInterface.so CCLD TELNETasp_PT.so CCLD MGCP_Test Instead of the very verbose messages we would get otherwise. Especially the linking message clutters a whole page of terminal output without this path: if ... g++ ... $ALL_OBJ_FILES; then : ; else ... $ALL_OBJ_FILES; fi Change-Id: I780106e64089dc24a7ba724f6a94e67417d49c30 --- M _buildsystem/regen_makefile.inc.sh 1 file changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/40033/1 diff --git a/_buildsystem/regen_makefile.inc.sh b/_buildsystem/regen_makefile.inc.sh index 3c10a68..aa3d5d0 100644 --- a/_buildsystem/regen_makefile.inc.sh +++ b/_buildsystem/regen_makefile.inc.sh @@ -63,3 +63,57 @@ # with ccache. sed -i -e 's/^COMPILER_FLAGS = $.*$/& -D/' Makefile fi + +# +# Make output more readable (skip with make V=1) +# + +make_pretty_rule() { + local rule_name="$1" + local cmd_start="$2" + local cmd_msg="@echo ' $3'" + + sed -i -z "s/$rule_name\\n\\t$cmd_start/$rule_name\\n\\t$cmd_msg\n\t@$cmd_start/" Makefile +} + +make_pretty_rules() { + make_pretty_rule \ + '$(EXECUTABLE): $(SHARED_OBJECTS)' \ + 'if' \ + 'CCLD $@' + + make_pretty_rule \ + '$(LIBRARY): $(OBJECTS)' \ + '$(CXX)' \ + 'CCLD $@' + + make_pretty_rule \ + '.cc.o .c.o:' \ + '$(CXX)' \ + 'CC $@' + + make_pretty_rule \ + '%.so: %.o' \ + '$(CXX)' \ + 'CCLD $@' + + make_pretty_rule \ + '%.ttcn: %.ttcnpp $(TTCN3_INCLUDES)' \ + '$(CPP)' \ + 'PP $@' + + make_pretty_rule \ + 'compile: $(TTCN3_MODULES) $(PREPROCESSED_TTCN3_MODULES) $(ASN1_MODULES)' \ + '$(TTCN3_DIR)' \ + 'TTCN *.ttcn *.asn' + + sed -i "s/@echo Creating dependency file for/@echo ' DEP '/" Makefile + + # TTCN3 compiler: Silence "Notify: Parsing..." output with -q, it still + # prints warnings and errors + sed -i -e 's/^COMPILER_FLAGS = $.*$/& -q/' Makefile +} + +if [ "$V" != 1 ]; then + make_pretty_rules +fi -- 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: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I780106e64089dc24a7ba724f6a94e67417d49c30 Gerrit-Change-Number: 40033 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: remove copy_ttcn3_hacks_dir

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40034?usp=email ) Change subject: testenv: remove copy_ttcn3_hacks_dir ...................................................................... testenv: remove copy_ttcn3_hacks_dir When running with podman, set a separate builddir to avoid conflicts with build objects generated from running "make" outside of podman. As the buildsystem supports setting a differerent builddir directly now, remove the copy_ttcn3_hacks_dir logic that was used to emulate this feature. Change-Id: I9cae0c4f8c34bb6876ef51048ef19b35a2e369a9 --- M _testenv/testenv/requirements.py M _testenv/testenv/testenv_cfg.py M _testenv/testenv/testsuite.py 3 files changed, 15 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/40034/1 diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 5405f50..cd320d5 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -75,7 +75,7 @@ "-q", "fftranscode", os.path.join( - testenv.testsuite.ttcn3_hacks_dir_src, + testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite, "regen_makefile.sh", ), diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index 4044225..70d64c8 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -30,7 +30,7 @@ def exit_error_readme(): - readme = os.path.join(testenv.testsuite.ttcn3_hacks_dir_src, "_testenv/README.md") + readme = os.path.join(testenv.testsuite.ttcn3_hacks_dir, "_testenv/README.md") logging.error(f"More information: {readme}") sys.exit(1) @@ -194,7 +194,7 @@ def find_configs(): - dir_testsuite = os.path.join(testenv.testsuite.ttcn3_hacks_dir_src, testenv.args.testsuite) + dir_testsuite = os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite) pattern = os.path.join(dir_testsuite, "testenv*.cfg") ret = sorted(glob.glob(pattern)) diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index c1d048b..a42c4e4 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -1,6 +1,7 @@ # Copyright 2024 sysmocom - s.f.m.c. GmbH # SPDX-License-Identifier: GPL-3.0-or-later import atexit +import copy import glob import logging import os @@ -12,8 +13,8 @@ import testenv.cmd import time -ttcn3_hacks_dir = None -ttcn3_hacks_dir_src = os.path.realpath(f"{__file__}/../../..") +ttcn3_hacks_dir = os.path.realpath(f"{__file__}/../../..") +builddir_env = {} testsuite_proc = None @@ -23,82 +24,34 @@ return logging.info("Updating osmo-ttcn3-hacks/deps") - deps_dir = os.path.join(ttcn3_hacks_dir_src, "deps") + deps_dir = os.path.join(ttcn3_hacks_dir, "deps") testenv.cmd.run(["make", "-C", deps_dir]) testenv.cmd.run(["touch", deps_marker]) -def copy_ttcn3_hacks_dir(): - """Copy source files of osmo-ttcn3-hacks.git to the cache dir, so we don't - mix binary objects from host and inside podman that are very likely to - be incompatible""" - global ttcn3_hacks_dir - - ttcn3_hacks_dir = os.path.join(testenv.args.cache, "podman", "osmo-ttcn3-hacks") - - logging.info(f"Copying osmo-ttcn3-hacks sources to: {ttcn3_hacks_dir}") - - # Rsync can't directly parse the .gitignore with ! rules, so create a list - # of files to be copied with git - copy_list = os.path.join(testenv.args.cache, "podman", "ttcn3-copy-list") - testenv.cmd.run( - f"git ls-files -o -c --exclude-standard > {shlex.quote(copy_list)}", - cwd=ttcn3_hacks_dir_src, - no_podman=True, - ) - - # Copy source files, excluding binary objects - testenv.cmd.run( - [ - "rsync", - "--archive", - f"--files-from={copy_list}", - f"{ttcn3_hacks_dir_src}/", - f"{ttcn3_hacks_dir}/", - ], - no_podman=True, - ) - - # The "deps" dir is in gitignore, copy it separately - testenv.cmd.run( - [ - "rsync", - "--links", - "--recursive", - "--exclude", - "/.git", - f"{ttcn3_hacks_dir_src}/deps/", - f"{ttcn3_hacks_dir}/deps/", - ], - no_podman=True, - ) - - def prepare_testsuite_dir(): testsuite_dir = f"{ttcn3_hacks_dir}/{testenv.args.testsuite}" logging.info(f"Generating links and Makefile for {testenv.args.testsuite}") - testenv.cmd.run(["./gen_links.sh"], cwd=testsuite_dir) - testenv.cmd.run("USE_CCACHE=1 ./regen_makefile.sh", cwd=testsuite_dir) + testenv.cmd.run(["./gen_links.sh"], cwd=testsuite_dir, env=builddir_env) + testenv.cmd.run("USE_CCACHE=1 ./regen_makefile.sh", cwd=testsuite_dir, env=builddir_env) def init(): - global ttcn3_hacks_dir + global builddir_env atexit.register(stop) - update_deps() if testenv.args.podman: - copy_ttcn3_hacks_dir() - else: - ttcn3_hacks_dir = ttcn3_hacks_dir_src + builddir = os.path.join(testenv.args.cache, "podman", "ttcn3") + builddir_env = {"BUILDDIR": builddir} prepare_testsuite_dir() def build(): logging.info("Building testsuite") - testenv.cmd.run(["make", testenv.args.testsuite], cwd=ttcn3_hacks_dir) + testenv.cmd.run(["make", testenv.args.testsuite], cwd=ttcn3_hacks_dir, env=builddir_env) def is_running(pid): @@ -170,9 +123,8 @@ suite = os.path.join(ttcn3_hacks_dir, testenv.args.testsuite, section_data["program"]) suite = os.path.relpath(suite, ttcn3_hacks_dir) - env = { - "TTCN3_PCAP_PATH": os.path.join(testenv.testdir.testdir, "testsuite"), - } + env = copy.copy(builddir_env) + env["TTCN3_PCAP_PATH"] = os.path.join(testenv.testdir.testdir, "testsuite") # Let ttcn3-tcpdump-stop.sh retrieve talloc reports host, port = testenv.testenv_cfg.get_vty_host_port(cfg) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40034?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9cae0c4f8c34bb6876ef51048ef19b35a2e369a9 Gerrit-Change-Number: 40034 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: clean: fix cleaning git dir

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40025?usp=email ) Change subject: testenv: clean: fix cleaning git dir ...................................................................... testenv: clean: fix cleaning git dir Don't try to build a PATH that contains the testsuite dir if running the "clean" action, because then no testsuite is defined. Fix for: $ ./testenv.py clean [testenv] + ['rm', '-rf', '/home/user/.cache/osmo-ttcn3-testenv/git'] Traceback (most recent call last): File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/./testenv.py", line 137, in <module> main() File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/./testenv.py", line 133, in main clean() File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/./testenv.py", line 117, in clean testenv.cmd.run(["rm", "-rf", path]) File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/_testenv/testenv/cmd.py", line 106, in run env=generate_env(env), ^^^^^^^^^^^^^^^^^ File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/_testenv/testenv/cmd.py", line 72, in generate_env path += f":{os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite)}" ^^^^^^^^^^^^^^^^^^^^^^ AttributeError: 'Namespace' object has no attribute 'testsuite' Change-Id: I65da89581260fc60b3d8da0a93ee04c0c22c7f2c --- M _testenv/testenv/cmd.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/40025/1 diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index df57b79..f84769d 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -68,7 +68,7 @@ ret = dict(env_extra) path = os.path.join(testenv.data_dir, "scripts") path += f":{os.path.join(testenv.data_dir, 'scripts/qemu')}" - if testenv.testsuite.ttcn3_hacks_dir: + if testenv.args.action == "run" and testenv.testsuite.ttcn3_hacks_dir: path += f":{os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite)}" if usr_dir: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40025?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I65da89581260fc60b3d8da0a93ee04c0c22c7f2c Gerrit-Change-Number: 40025 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/40028/1 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: newchange 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>

4 months, 1 week

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40029?usp=email ) Change subject: buildsystem/regen_makefile: modernize ...................................................................... buildsystem/regen_makefile: modernize Apply various small changes to make this file more readable. Change-Id: I5a7dcd6171c6a370928ebedafc5ed318384dd8dd --- M _buildsystem/regen_makefile.inc.sh 1 file changed, 19 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/40029/1 diff --git a/_buildsystem/regen_makefile.inc.sh b/_buildsystem/regen_makefile.inc.sh index 31dd491..6d874d3 100644 --- a/_buildsystem/regen_makefile.inc.sh +++ b/_buildsystem/regen_makefile.inc.sh @@ -1,19 +1,6 @@ # Copyright 2017-2019 Harald Welte -# Copyright 2018 sysmocom - s.f.m.c. GmbH -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - +# Copyright 2018-2025 sysmocom - s.f.m.c. GmbH +# SPDX-License-Identifier: Apache-2.0 # Wrapper around the TITAN make file generator if [ -z "$NAME" ]; then @@ -26,16 +13,9 @@ 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. -# This speeds up repeated builds of the TTCN3 tests by an order of magnitude -# since most of the generated C++ source files don't change very often. -# Roughly, for an initial build which takes N minutes, a complete rebuild -# after 'make clean' will only take N seconds with ccache. -# Note that ccache cannot speed up compilation of .o files to .so files. -if [ -z "$USE_CCACHE" ] && which ccache 2>/dev/null; then - USE_CCACHE=1 +if ! command -v ttcn3_makefilegen >/dev/null; then + echo "ERROR: ttcn3_makefilegen not in PATH" + exit 1 fi ttcn3_makefilegen -g -p -l -U 8 -f -e "$NAME" $FILES @@ -43,31 +23,37 @@ sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan/' Makefile sed -i -e 's/LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp -lssl/' Makefile -#sed -i -e 's/TTCN3_LIB = ttcn3-parallel/TTCN3_LIB = ttcn3/' Makefile # The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue, # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -DLKSCTP_MULTIHOMING_ENABLED -DAS_USE_SSL/' Makefile -#remove -Wall from CXXFLAGS: we're not interested in generic warnings for autogenerated code cluttering the logs +# Remove -Wall from CXXFLAGS: we're not interested in generic warnings for +# autogenerated code cluttering the logs sed -i -e 's/-Wall//' Makefile -if [ "x$CPPFLAGS_TTCN3" != "x" ]; then +if [ -n "$CPPFLAGS_TTCN3" ]; then CPPFLAGS_TTCN3="$(echo "$CPPFLAGS_TTCN3" | tr -d '\n' | tr '\t' ' ')" sed -i -e "s/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = $CPPFLAGS_TTCN3/" Makefile fi -# for TITAN 6.3.0 +# For TITAN 6.3.0 if cat /etc/issue | grep "Arch Linux" >/dev/null 2>&1; then sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr\/ttcn3/' Makefile else sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile fi -if [ "x$USE_CCACHE" = "x1" ]; then - # enable ccache +# Enable ccache if it can be found in path. This speeds up repeated builds of +# the TTCN3 tests by an order of magnitude since most of the generated C++ +# source files don't change very often. Roughly, for an initial build which +# takes N minutes, a complete rebuild after 'make clean' will only take N +# seconds with ccache. Note that ccache cannot speed up compilation of .o files +# to .so files. +if command -v ccache >/dev/null; then sed -i -e 's/^CXX = g++ $/CXX = env CCACHE_SLOPPINESS=time_macros ccache g++/' Makefile - # Append the -D option to compiler flags. This option disables timestamps - # inside comments in the generated C++ code which interfere with ccache. + # Append the -D option to compiler flags. This option disables + # timestamps inside comments in the generated C++ code which interfere + # with ccache. sed -i -e 's/^COMPILER_FLAGS = $.*$/& -D/' Makefile fi -- 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: newchange 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>

4 months, 1 week

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/40027/1 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: newchange 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>

4 months, 1 week

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/40026/1 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: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieeefdfd74b2698794fb12fec4ed32565dc9f36a6 Gerrit-Change-Number: 40026 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025