Changeset 50417


Ignore:
Timestamp:
Jan 24, 2012, 11:33:06 AM (13 years ago)
Author:
martinl
Message:

winGRASS: extra mingw/msys packages should be copied to apps/msys

Location:
grass/branches/releasebranch_6_4/mswindows
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi

    r50399 r50417  
    490490        FileWrite $0 '$\r$\n'
    491491        FileWrite $0 'rem set path to freetype dll$\r$\n'
    492         FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib;$INSTALL_DIR\lib$\r$\n'
     492        FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib;$INSTALL_DIR\msys\bin;$INSTALL_DIR\lib$\r$\n'
    493493        FileWrite $0 '$\r$\n'
    494494        FileWrite $0 'rem set dependecies path$\r$\n'

  • grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh

    r50399 r50417  
    145145cp mswindows/osgeo4w/config.h.switch $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h
    146146cp mswindows/osgeo4w/config.h.vc $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass
     147mkdir -p $OSGEO4W_ROOT_MSYS/etc/preremove
    147148sed -e "s#@VERSION@#$VERSION#g" -e "s#@osgeo4w@#$OSGEO4W_ROOT#g" \
    148149    mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/${GRASS_EXECUTABLE}.bat
    … …  
    156157    mswindows/osgeo4w/preremove.bat >$OSGEO4W_ROOT_MSYS/etc/preremove/${GRASS_EXECUTABLE}.bat
    157158
    158 if [ -f /c/mingw/bin/libgnurx-0.dll ]; then
    159     cp /c/mingw/bin/libgnurx-0.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin
    160     cp /c/mingw/bin/libiconv-2.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin
    161     cp /c/mingw/bin/libintl-8.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin
    162 fi
    163 
    164159if [ -n "$PACKAGE" ]; then
    165160    log building vc libraries
    … …  
    188183        bin/${GRASS_EXECUTABLE}.bat.tmpl \
    189184        bin/${GRASS_EXECUTABLE}.tmpl \
    190         bin/libintl3.dll \
    191         bin/libiconv2.dll \
    192         bin/regex2.dll \
     185        apps/msys/bin/libintl3.dll \
     186        apps/msys/bin/libiconv2.dll \
     187        apps/msys/bin/regex2.dll \
    193188        etc/postinstall/${GRASS_EXECUTABLE}.bat \
    194189        etc/preremove/${GRASS_EXECUTABLE}.bat

  • grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat

    r50390 r50417  
    99del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@
    1010del "%OSGEO4W_ROOT%"\apps\grass\grass-@VERSION@\etc\fontcap
     11del "%OSGEO4W_ROOT%"\apps\msys\bin\libintl3.dll
     12del "%OSGEO4W_ROOT%"\apps\msys\bin\libiconv2.dll
     13del "%OSGEO4W_ROOT%"\apps\msys\bin\regex2.dll
Note: See TracChangeset for help on using the changeset viewer.