Skip to content

Commit

Permalink
fixed Win install without R (#35)
Browse files Browse the repository at this point in the history
  • Loading branch information
tzipperle authored and danielhuppmann committed Mar 7, 2018
1 parent 8a8c6c3 commit e1ef629
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions install.bat
Expand Up @@ -4,24 +4,26 @@ set /p MESSAGE_IX=<.foo
del .foo
echo %MESSAGE_IX%

echo Python MESSAGE_IX setup
chdir ixmp
python setup.py install
where /q r
IF ERRORLEVEL 1 (
ECHO No valid installation of R found, skipped build and installation of rixmp package.
) ELSE (
rscript rixmp/build_rixmp.R [--verbose]
)
chdir ../
python setup.py install

echo R MESSAGE_IX setup
where /q r
IF ERRORLEVEL 1 (
ECHO No valid installation of R found, skipped build and installation of message_ix package.
ECHO No valid installation of R found, skipped build and installation of rixmp package.
@rem set ERRORLEVEL to 0 -> ignore R setup
VERIFY
) ELSE (
chdir ixmp
rscript rixmp/build_rixmp.R [--verbose]
chdir ../
rscript rmessageix/build_rmessageix.R [--verbose]
)

if %errorlevel% neq 0 exit GOTO InstallError
if %errorlevel% neq 0 GOTO InstallError

setx IXMP_PATH "%MESSAGE_IX%"

Expand Down

0 comments on commit e1ef629

Please sign in to comment.