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
This commit is contained in:
Neels Hofmeyr 2018-03-15 22:04:41 +01:00
parent 4b2692d50b
commit 1a4c4601d7
13 changed files with 24 additions and 96 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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"

12
gen_links.sh.inc Normal file
View File

@ -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
}

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"