summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-03-15 22:04:41 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-03-16 00:08:02 +0100
commit1a4c4601d7e32e004e99c20a9c2dc78112208a7f (patch)
tree827d18ef0b94255c4abe85840582f5f2357f82a2
parent4b2692d50bd24eccfb4973a0d968dbe16799e692 (diff)
fix gen_links.sh: don't include source dir as link target
First of all, use one common place to define the gen_links() macro, in gen_links.sh.inc. In this new file, add a 'shift' to exclude the $DIR arg from also appearing in $FILES. This prevents the following wrong symlinks in the source dirs: M3UA_CNL113537/src/src MTP3asp_CNL113337/src/src SCCP_CNL113341/src/src Change-Id: Ia8493e77df1ba8723f2c5d2a49816247b0fb55f7
-rwxr-xr-xbsc-nat/gen_links.sh9
-rwxr-xr-xbsc/gen_links.sh9
-rwxr-xr-xbts/gen_links.sh9
-rw-r--r--gen_links.sh.inc12
-rwxr-xr-xggsn_tests/gen_links.sh9
-rwxr-xr-xhlr/gen_links.sh9
-rwxr-xr-xlapdm/gen_links.sh9
-rwxr-xr-xmgw/gen_links.sh9
-rwxr-xr-xmsc/gen_links.sh9
-rwxr-xr-xpcu/gen_links.sh9
-rwxr-xr-xselftest/gen_links.sh9
-rwxr-xr-xsgsn/gen_links.sh9
-rwxr-xr-xsysinfo/gen_links.sh9
13 files changed, 24 insertions, 96 deletions
diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh
index e9280e6..8aa47a9 100755
--- a/bsc-nat/gen_links.sh
+++ b/bsc-nat/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
#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/gen_links.sh b/bsc/gen_links.sh
index a173aac..9145ff7 100755
--- a/bsc/gen_links.sh
+++ b/bsc/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
#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/gen_links.sh b/bts/gen_links.sh
index d9c05ff..b2b7e92 100755
--- a/bts/gen_links.sh
+++ b/bts/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
#DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src
#FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn"
diff --git a/gen_links.sh.inc b/gen_links.sh.inc
new file mode 100644
index 0000000..2fcb9d1
--- /dev/null
+++ b/gen_links.sh.inc
@@ -0,0 +1,12 @@
+#!dont_run_this
+# This file is sourced by */gen_links.sh
+
+gen_links() {
+ DIR=$1
+ shift
+ FILES=$*
+ for f in $FILES; do
+ echo "Linking $f"
+ ln -sf $DIR/$f $f
+ done
+}
diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh
index 071c6c8..25990d3 100755
--- a/ggsn_tests/gen_links.sh
+++ b/ggsn_tests/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
#DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src
#FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn"
diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh
index 7a6ebad..391ef73 100755
--- a/hlr/gen_links.sh
+++ b/hlr/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src
FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc
diff --git a/lapdm/gen_links.sh b/lapdm/gen_links.sh
index 5ecc45c..83c6699 100755
--- a/lapdm/gen_links.sh
+++ b/lapdm/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
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/gen_links.sh b/mgw/gen_links.sh
index 03b7db2..445be50 100755
--- a/mgw/gen_links.sh
+++ b/mgw/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
#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/gen_links.sh b/msc/gen_links.sh
index b2e2ff0..b9cbd0a 100755
--- a/msc/gen_links.sh
+++ b/msc/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
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/gen_links.sh b/pcu/gen_links.sh
index 54d2bdd..4852981 100755
--- a/pcu/gen_links.sh
+++ b/pcu/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
#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/gen_links.sh b/selftest/gen_links.sh
index b0b2688..542e3c2 100755
--- a/selftest/gen_links.sh
+++ b/selftest/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
#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/gen_links.sh b/sgsn/gen_links.sh
index 1dedda2..c3c6add 100755
--- a/sgsn/gen_links.sh
+++ b/sgsn/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
#DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src
#FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn"
diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh
index ba07733..ad7891a 100755
--- a/sysinfo/gen_links.sh
+++ b/sysinfo/gen_links.sh
@@ -2,14 +2,7 @@
BASEDIR=../deps
-gen_links() {
- DIR=$1
- FILES=$*
- for f in $FILES; do
- echo "Linking $f"
- ln -sf $DIR/$f $f
- done
-}
+. ../gen_links.sh.inc
DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src
FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h"