Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: set executable name explicitly

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Wed Oct 13 13:38:12 UTC 2021 

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 )

Change subject: regen_makefile.sh: set executable name explicitly
......................................................................

regen_makefile.sh: set executable name explicitly

Set the executable name in each regen_makefile.sh explicitly with -e,
instead of having it set indirectly from the first .ttcn file. Make it
consistent by placing the name on top of each of these files.

Fix for warning:
ttcn3_makefilegen: warning: File `BSC_Tests.ttcn' was given more than once for the Makefile.

Related: OS#5252
Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f
---
M SCCP_Test/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 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 lapdm/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 pcu/regen_makefile.sh
M pgw/regen_makefile.sh
M remsim/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
28 files changed, 78 insertions(+), 34 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved



diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh
index f5d13b7..ee2cdb3 100755
--- a/SCCP_Test/regen_makefile.sh
+++ b/SCCP_Test/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=SCCP_Testcases.ttcn
+NAME=SCCP_Testcases
 
 FILES="
 	*.ttcn
@@ -10,4 +10,4 @@
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh
index 33b557c..470d109 100755
--- a/bsc-nat/regen_makefile.sh
+++ b/bsc-nat/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=BSCNAT_Tests.ttcn
+NAME=BSCNAT_Tests
 
 FILES="
 	*.c
@@ -29,4 +29,4 @@
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh
index 53f8e82..9e69bef 100755
--- a/bsc/regen_makefile.sh
+++ b/bsc/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=BSC_Tests.ttcn
+NAME=BSC_Tests
 
 FILES="
 	*.c
@@ -34,4 +34,4 @@
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh
index 850e0bf..147d64f 100755
--- a/bts/regen_makefile.sh
+++ b/bts/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=BTS_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -26,4 +28,4 @@
 	-DIPA_EMULATION_RSL
 "
 
-../regen-makefile.sh BTS_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh
index d2c3b12..11a93c4 100755
--- a/cbc/regen_makefile.sh
+++ b/cbc/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=CBC_Tests
+
 FILES="
 	*.asn
 	*.ttcn
@@ -23,6 +25,6 @@
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh CBC_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 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 0925654..bbb7f33 100755
--- a/ccid/regen_makefile.sh
+++ b/ccid/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=CCID_Tests
+
 FILES="
 	*.ttcn
 	Native_FunctionDefs.cc
@@ -9,7 +11,7 @@
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh CCID_Tests.ttcn $FILES
+../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/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh
index 6488015..89eccd3 100755
--- a/fr-net/regen_makefile.sh
+++ b/fr-net/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=FRNET_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -18,4 +20,4 @@
 	-DNS_EMULATION_FR
 "
 
-../regen-makefile.sh FRNET_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh
index 9c473ef..1b37cb6 100755
--- a/fr/regen_makefile.sh
+++ b/fr/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=FR_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -19,4 +21,4 @@
 	-DNS_EMULATION_FR
 "
 
-../regen-makefile.sh FR_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh
index 5ec6689..78910a4 100755
--- a/gbproxy/regen_makefile.sh
+++ b/gbproxy/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=GBProxy_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -30,6 +32,6 @@
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh GBProxy_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 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 5e6b08d..7adbd0b 100755
--- a/ggsn_tests/regen_makefile.sh
+++ b/ggsn_tests/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=GGSN_Tests
+
 FILES="
 	*.ttcn
 	BSSGP_EncDec.cc
@@ -21,4 +23,4 @@
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh GGSN_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh
index 9ab40ce..7cd6cf4 100755
--- a/hlr/regen_makefile.sh
+++ b/hlr/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN="HLR_Tests.ttcn"
+NAME=HLR_Tests
 
 FILES="
 	*.asn
@@ -24,4 +24,4 @@
 	-DIPA_EMULATION_CTRL
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/lapdm/regen_makefile.sh b/lapdm/regen_makefile.sh
index 2eb1366..f354e87 100755
--- a/lapdm/regen_makefile.sh
+++ b/lapdm/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=L1CTL_Test
+
 FILES="
 	*.ttcn
 	L1CTL_PortType_CtrlFunctDef.cc
@@ -11,4 +13,4 @@
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh L1CTL_Test.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh
index a47f7ba..921956c 100755
--- a/mgw/regen_makefile.sh
+++ b/mgw/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=MGCP_Test
+
 FILES="
 	*.c
 	*.ttcn
@@ -25,4 +27,4 @@
 	-DIPA_EMULATION_CTRL
 "
 
-../regen-makefile.sh MGCP_Test.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh
index 5606879..62956d8 100755
--- a/mme/regen_makefile.sh
+++ b/mme/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=MME_Tests
+
 FILES="
 	*.asn
 	*.c
@@ -24,6 +26,6 @@
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh MME_Tests.ttcn $FILES
+../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/regen_makefile.sh b/msc/regen_makefile.sh
index 4ca9558..081d2cb 100755
--- a/msc/regen_makefile.sh
+++ b/msc/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=MSC_Tests
+
 FILES="
 	*.asn
 	*.c
@@ -42,6 +44,6 @@
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh MSC_Tests.ttcn $FILES
+../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/regen_makefile.sh b/ns/regen_makefile.sh
index 1958dee..88360d8 100755
--- a/ns/regen_makefile.sh
+++ b/ns/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=NS_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -23,4 +25,4 @@
 	-DNS_EMULATION_FR
 "
 
-../regen-makefile.sh NS_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/pcap-client/regen_makefile.sh b/pcap-client/regen_makefile.sh
index 88c062d..81dd1eb 100755
--- a/pcap-client/regen_makefile.sh
+++ b/pcap-client/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=OPCAP_CLIENT_Tests
+
 FILES="
 	*.ttcn
 	IPL4asp_PT.cc
@@ -14,4 +16,4 @@
 
 export CPPFLAGS_TTCN3=""
 
-../regen-makefile.sh OPCAP_CLIENT_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh
index d4404d0..006c6ba 100755
--- a/pcu/regen_makefile.sh
+++ b/pcu/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=PCU_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -22,4 +24,4 @@
 	-DIPA_EMULATION_CTRL
 "
 
-../regen-makefile.sh PCU_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh
index 21f03ba..ce59dfb 100755
--- a/pgw/regen_makefile.sh
+++ b/pgw/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=PGW_Tests
+
 FILES="
 	*.ttcn
 	BSSGP_EncDec.cc
@@ -24,4 +26,4 @@
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh PGW_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh
index edfb073..fb04cce 100755
--- a/remsim/regen_makefile.sh
+++ b/remsim/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=REMSIM_Tests
+
 FILES="
 	*.asn
 	*.ttcn
@@ -25,7 +27,7 @@
 	-DIPA_EMULATION_CTRL
 "
 
-../regen-makefile.sh REMSIM_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 # required for forkpty(3) used by PIPEasp
 sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile
diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh
index 175c10b..7cd809d 100755
--- a/sccp/regen_makefile.sh
+++ b/sccp/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=SCCP_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -22,4 +24,4 @@
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh SCCP_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh
index 17854ce..383e2db 100755
--- a/selftest/regen_makefile.sh
+++ b/selftest/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=Selftest.ttcn
+NAME=Selftest
 
 FILES="
 	*.ttcn
@@ -19,4 +19,4 @@
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh
index 2a5cb92..a1f702a 100755
--- a/sgsn/regen_makefile.sh
+++ b/sgsn/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=SGSN_Tests
+
 FILES="
 	*.asn
 	*.ttcn
@@ -30,6 +32,6 @@
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh SGSN_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 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 509699e..baecf7d 100755
--- a/simtrace/regen_makefile.sh
+++ b/simtrace/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=SIMTRACE_Tests
+
 FILES="
 	*.ttcn
 	Native_FunctionDefs.cc
@@ -9,7 +11,7 @@
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh SIMTRACE_Tests.ttcn $FILES
+../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/regen_makefile.sh b/sip/regen_makefile.sh
index caf657c..c7a645d 100755
--- a/sip/regen_makefile.sh
+++ b/sip/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=SIP_Tests
+
 FILES="
 	*.c
 	*.ttcn
@@ -24,4 +26,4 @@
 	-DRAN_EMULATION_CTRL
 "
 
-../regen-makefile.sh SIP_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh
index 24e3407..180486c 100755
--- a/smlc/regen_makefile.sh
+++ b/smlc/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=SMLC_Tests.ttcn
+NAME=SMLC_Tests
 
 FILES="
 	*.c
@@ -32,4 +32,4 @@
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh
index 0b90687..032be0d 100755
--- a/stp/regen_makefile.sh
+++ b/stp/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=STP_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -22,4 +24,4 @@
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh STP_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh
index 4a3dfcc..569f406 100755
--- a/sysinfo/regen_makefile.sh
+++ b/sysinfo/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=Test
+
 FILES="
 	*.ttcn
 	IPL4_GSMTAP_CtrlFunctDef.cc
@@ -13,4 +15,4 @@
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh Test.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f
Gerrit-Change-Number: 25758
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211013/56aae4b3/attachment.htm>

More information about the gerrit-log mailing list