Revision 1356

trunk/scripts/admb/admb.bat (revision 1356)
1 1
@echo off
2
@REM 
3
@REM  Copyright 2013 (c) ADMB Foundation
4
@REM 
2 5

  
3 6
setlocal EnableExtensions EnableDelayedExpansion
4 7

  
......
13 16
  echo "Error: Unable to unset ADMB_HOME=!ADMB_HOME!."
14 17
  goto EOF
15 18
)
16
for %%a in (%0.bat) do (
19
for %%a in (%0) do (
17 20
  set HAS_PATH=%%~$PATH:a
18 21
  if defined HAS_PATH (
19 22
    set ADMB_PATH="%%~dp$PATH:a"
trunk/scripts/admb/root-admb.bat (revision 1356)
5 5

  
6 6
setlocal EnableExtensions EnableDelayedExpansion
7 7

  
8
for %%a in (%0.bat) do (
8
for %%a in (%0) do (
9 9
  set HAS_PATH=%%~$PATH:a
10
  if not "!HAS_PATH!"=="" (
10
  if defined HAS_PATH (
11 11
    set ADMB_PATH=%%~dp$PATH:a
12 12
  ) else (
13 13
    set ADMB_PATH=%%~dpa
14 14
  )
15
)
16
if exist !ADMB_PATH!\bin\admb.bat (
17
  set ADMB_HOME=!ADMB_PATH!
18
  call "!ADMB_HOME!\bin\admb.bat" %*
19
) else (
20
  if exist !ADMB_PATH!build\dist\bin\admb.bat (
21
    set ADMB_HOME=!ADMB_PATH!build\dist
22
    call "!ADMB_HOME!\bin\admb.bat" %*
15
  if exist !ADMB_PATH!\bin\admb.cmd (
16
    set ADMB_HOME=!ADMB_PATH!
17
    call "!ADMB_HOME!\bin\admb" %*
18
  ) else (
19
    if exist !ADMB_PATH!build\dist\bin\admb.cmd (
20
      set ADMB_HOME=!ADMB_PATH!build\dist
21
      call "!ADMB_HOME!\bin\admb" %*
22
    )
23 23
  )
24
  goto EOF
24 25
)
26
:EOF
trunk/src/GNUmakefile (revision 1356)
116 116

  
117 117
all: revision dist contrib
118 118
ifndef BUILD_SHARED_LIBRARY
119
	$(MAKE) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="$(PWD)/${DISK}" --directory=../contrib build-ad2csv
119
	$(MAKE) CXXFLAGS="$(CXXFLAGS)" --directory=../contrib build-ad2csv
120 120
endif
121 121
	@echo ADMB build completed.
122 122
	@echo For installation, check README.txt.

Also available in: Unified diff