Megatest

Check-in [a2b3efa030]
Login
☰Home Timeline Files Branches Tags Tickets Wiki Login
Overview
Comment:Fixed LD_LIBRARY_PATH handling in wrapper
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.64
Files: files | file ages | folders
SHA1: a2b3efa030a54e6cfb6c6736fca7e1e27d07cd15
User & Date: mrwellan on 2017-05-05 11:17:37
Other Links: branch diff | manifest | tags
Context
2017-05-08
10:26
bumped version check-in: e00680eecc user: bjbarcla tags: v1.64, v1.6411
2017-05-07
06:57
Merged in changes from v1.65 check-in: 90059ea017 user: matt tags: v1.65
2017-05-05
11:17
Fixed LD_LIBRARY_PATH handling in wrapper check-in: a2b3efa030 user: mrwellan tags: v1.64
2017-05-04
17:18
fixed typo in megatest.scm check-in: 21852a2d21 user: bjbarcla tags: v1.64
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified utils/mk_wrapper from [9bb7f8caf7] to [81ea74cc07]. 

1
2
3
4
5

6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

1
2
3
4
5
6
7
8

9
10
11
12
13
14
15
16
17
18
19
20
21
22





23
24
25
26
27
28
29






+


-














-
-
-
-
-








#!/bin/bash

prefix=$1
cmd=$2
target=$3
cfgfile="$prefix/bin/.$(lsb_release -sr)/cfg.sh"

if [ "$LD_LIBRARY_PATH" != "" ];then
  cfgfile="$prefix/bin/.$(lsb_release -sr)/cfg.sh"
  echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2
( cat << __EOF
if [ "\$LD_LIBRARY_PATH" != "" ];then
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\$LD_LIBRARY_PATH
else
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
fi
__EOF
) > $cfgfile
  echo 
else
  echo "INFO: LD_LIBRARY_PATH not set" >&2
fi

# echo "#!/bin/bash" > $target
# if [ "$LD_LIBRARY_PATH" != "" ];then
#   echo "source $prefix/bin/.\$(lsb_release -sr)/cfg.sh" >> $target
# fi
# echo "exec $prefix/bin/.\$(lsb_release -sr)/$cmd \"\$@\"" >> $target
echo "#!/bin/bash" > $target

if [[ $cmd =~ dboard ]]; then
    cat >> $target <<'EOF'

# # disable if not running on homehost
# if [[ -e .homehost ]]; then
︙
55
56
57
58
59
60
61



62




63

64

50
51
52
53
54
55
56
57
58
59
60
61
62
63
64

65
66








+
+
+

+
+
+
+
-
+


    exit 1
  fi
fi
EOF

fi

# echo "#!/bin/bash" > $target
# echo "exec $prefix/bin/.\$(lsb_release -sr)/$cmd \"\$@\"" >> $target

echo "lsbr=\$(lsb_release -sr)" >> $target
if [ "$LD_LIBRARY_PATH" != "" ];then
  echo "source $prefix/bin/.\$lsbr/cfg.sh" >> $target
fi

echo "if [[ -e \$lsbr ]];then source \$lsbr;fi" >> $target
# echo "if [[ -e \$lsbr ]];then source \$lsbr;fi" >> $target
echo "exec $prefix/bin/.\$lsbr/$cmd \"\$@\"" >> $target

This page was generated in about 0.109s by Fossil 2.24 [452f8e1ffc] 2024-03-26 15:36:00