Skip to content

Commit

Permalink
osgeo4w: x86 updated to GRASS 6.4.4RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 15, 2014
1 parent 945be40 commit 5eddb74
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ms-windows/osgeo4w/package-nightly.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ REM * the Free Software Foundation; either version 2 of the License, or *
REM * (at your option) any later version. *
REM * *
REM ***************************************************************************
set GRASS_VERSION=6.4.3

set VERSION=%1
set PACKAGE=%2
set PACKAGENAME=%3
Expand Down Expand Up @@ -51,6 +49,7 @@ if "%ARCH%"=="x86" goto devenv_x86
goto devenv_x86_64

:devenv_x86
set GRASS_VERSION=6.4.4RC1
set VS90COMNTOOLS=%PF86%\Microsoft Visual Studio 9.0\Common7\Tools\
call "%PF86%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86

Expand All @@ -62,6 +61,7 @@ set CMAKE_OPT=^
goto devenv

:devenv_x86_64
set GRASS_VERSION=6.4.3
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
Expand Down
4 changes: 2 additions & 2 deletions ms-windows/osgeo4w/package.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ REM * the Free Software Foundation; either version 2 of the License, or *
REM * (at your option) any later version. *
REM * *
REM ***************************************************************************
set GRASS_VERSION=6.4.3

set VERSION=%1
set PACKAGE=%2
set PACKAGENAME=%3
Expand Down Expand Up @@ -51,6 +49,7 @@ if "%ARCH%"=="x86" goto devenv_x86
goto devenv_x86_64

:devenv_x86
set GRASS_VERSION=6.4.4RC1
set VS90COMNTOOLS=%PF86%\Microsoft Visual Studio 9.0\Common7\Tools\
call "%PF86%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86

Expand All @@ -60,6 +59,7 @@ set CMAKE_OPT=^
goto devenv

:devenv_x86_64
set GRASS_VERSION=6.4.3
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
Expand Down

0 comments on commit 5eddb74

Please sign in to comment.