osgeo4w: move desktop and browser executable to main bin

Author: jef-n

ms-windows/osgeo4w/browser.bat.tmpl

@@ -5,5 +5,5 @@ call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
 call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
 @echo off
 path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib
-set QGIS_PREFIX_PATH=@osgeo4w_msys@/apps/@package@
+set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
 start "Quantum GIS Browser" /B "%OSGEO4W_ROOT%"\@package@-browser.exe %*

ms-windows/osgeo4w/package-nightly.cmd

@@ -47,6 +47,8 @@ set SRCDIR=%CD%
 if "%BUILDDIR:~1,1%"==":" %BUILDDIR:~0,2%
 cd %BUILDDIR%
 
+if exist repackage goto package
+
 if not exist build.log goto build
 
 REM
@@ -140,6 +142,7 @@ echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 if errorlevel 1 goto error
 
+:package
 echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1
 
 cd ..
@@ -156,9 +159,14 @@ REM del %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py
 
 touch exclude
 
+move %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%.exe
+move %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser.exe
+
 tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
 	--exclude-from exclude ^
 	apps/%PACKAGENAME% ^
+	bin/%PACKAGENAME%.exe ^
+	bin/%PACKAGENAME%-browser.exe ^
 	bin/%PACKAGENAME%.bat.tmpl ^
 	bin/%PACKAGENAME%-browser.bat.tmpl ^
 	etc/postinstall/%PACKAGENAME%.bat ^

ms-windows/osgeo4w/package.cmd

@@ -206,8 +206,8 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-server-%VERSION%-%PACKAGE%.tar.bz2 ^
 	>>%LOG% 2>&1
 if errorlevel 1 goto error
 
-move apps\%PACKAGENAME%\bin\qgis.exe bin\%PACKAGENAME%.exe
-move apps\%PACKAGENAME%\bin\qbrowser.exe bin\%PACKAGENAME%-browser.exe
+move %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%.exe
+move %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser.exe
 tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
 	--exclude-from exclude ^
 	--exclude "*.pyc" ^

ms-windows/osgeo4w/postinstall-common.bat

@@ -1,4 +1,4 @@
 call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
 path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin
-set QGIS_PREFIX_PATH=%OSGEO4W_ROOT%\apps\@package@
+set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
 %OSGEO4W_ROOT%\apps\@package@\crssync

ms-windows/osgeo4w/postinstall-dev.bat

@@ -16,5 +16,5 @@ set OSGEO4W_ROOT=%O4W_ROOT%
 
 call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
 path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin
-set QGIS_PREFIX_PATH=%OSGEO4W_ROOT%\apps\@package@
+set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
 %OSGEO4W_ROOT%\apps\@package@\crssync

ms-windows/osgeo4w/qgis.bat.tmpl

@@ -5,5 +5,5 @@ call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
 call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
 @echo off
 path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib
-set QGIS_PREFIX_PATH=@osgeo4w_msys@/apps/@package@
+set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
 start "Quantum GIS" /B "%OSGEO4W_ROOT%"\bin\@package@.exe %*