Revision 1001

trunk/scripts/admb/adlink (revision 1001)
12 12
if [[ "$1" == "--help" ]]; then help; exit; fi
13 13

  
14 14
unset shared
15
sym=-s
15
sym=
16 16
opt=
17 17
while getopts "dgrso" A; do
18 18
  case $A in
......
40 40
  fi 
41 41
done
42 42

  
43
if [ -z $CXX ]; then
44
  if [ -f $ADMB_HOME/bin/admb-cfg.sh ]; then
45
    source $ADMB_HOME/bin/admb-cfg.sh
43
if [ -z "$CXX" ]; then
44
  if [ -f "$ADMB_HOME/bin/admb-cfg.sh" ]; then
45
    source "$ADMB_HOME/bin/admb-cfg.sh"
46 46
  else
47 47
    CXX=c++
48 48
  fi
......
62 62
  LDFLAGS="--static $LDFLAGS"
63 63
fi
64 64

  
65
CMD="$CXX $LDFLAGS $objects \"$ADMB_HOME\"/lib/libadmb$opt.a \"$ADMB_HOME\"/contrib/lib/libcontrib$opt.a"
65
CMD="$CXX $LDFLAGS $objects \"$ADMB_HOME\"/contrib/lib/libcontrib$opt.a \"$ADMB_HOME\"/lib/libadmb$opt.a"
66 66
echo $CMD
67 67
eval $CMD
68 68

  
trunk/scripts/admb/adcomp (revision 1001)
31 31
  file=$file.cpp
32 32
fi
33 33

  
34
if [ -z $CXX ]; then
35
  if [ -f $ADMB_HOME/bin/admb-cfg.sh ]; then
36
    source $ADMB_HOME/bin/admb-cfg.sh
34
if [ -z "$CXX" ]; then
35
  if [ -f "$ADMB_HOME/bin/admb-cfg.sh" ]; then
36
    source "$ADMB_HOME/bin/admb-cfg.sh"
37 37
  else
38 38
    CXX=c++
39 39
  fi
trunk/scripts/admb/admb (revision 1001)
11 11
if [[ "$1" == "-help" ]]; then help; exit; fi
12 12
if [[ "$1" == "--help" ]]; then help; exit; fi
13 13

  
14
if [ ! -z $ADMB_HOME ]; then
14
if [ ! -z "$ADMB_HOME" ]; then
15 15
unset ADMB_HOME
16 16
fi
17 17

  
18 18
FILE=$0
19 19
DIRECTORY=$(cd `dirname $FILE` && pwd)
20
while [ -h ${FILE} ]; do 
20
while [ -h "${FILE}" ]; do 
21 21
  pushd $DIRECTORY &> /dev/null
22 22
  FILE=$(readlink $DIRECTORY/admb)
23 23
  DIRECTORY=$(cd `dirname $FILE` && pwd)
24 24
  popd &> /dev/null
25 25
done
26
pushd $DIRECTORY/.. &> /dev/null
26
pushd "$DIRECTORY/.." &> /dev/null
27 27
declare -rx ADMB_HOME="$PWD"
28 28
popd &> /dev/null
29 29
PATH=$ADMB_HOME/bin:$PATH
trunk/scripts/admb/adlink.bat (revision 1001)
19 19
if %%a==-g set sym=
20 20
if %%a==-r set r=
21 21
if %%a==-s (
22
  set libs="%ADMB_HOME%\lib\libadmb.a" "%ADMB_HOME%\contrib\lib\libcontrib.a"
22
  set libs="%ADMB_HOME%\contrib\lib\libcontrib.a" "%ADMB_HOME%\lib\libadmb.a" 
23 23
)
24 24
)
25
if not defined libs set libs="%ADMB_HOME%\lib\libadmbo.a" "%ADMB_HOME%\contrib\lib\libcontribo.a"
25
if not defined libs set libs="%ADMB_HOME%\contrib\lib\libcontribo.a" "%ADMB_HOME%\lib\libadmbo.a" 
26 26

  
27 27
if %linker%==g++ (set out=-o %model%) else (set def=-def %model%.def^
28 28
 --driver-name g++ & set out=--output-lib lib%model%.a -o %model%.dll)

Also available in: Unified diff