Skip to content

Commit 823ac56

Browse files
committed
osgeo4w: also follow designer batch rename in nightly build
(cherry picked from commit 9d5aabc)
1 parent 0f042f8 commit 823ac56

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ms-windows/osgeo4w/package-nightly.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ if errorlevel 1 (echo creation of desktop postinstall failed & goto error)
234234
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversions@/%GRASS_VERSIONS%/g' preremove-dev.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
235235
if errorlevel 1 (echo creation of desktop preremove failed & goto error)
236236

237-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' designer-qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\designer-%PACKAGENAME%.bat.tmpl
237+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' designer.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-designer.bat.tmpl
238238
if errorlevel 1 (echo creation of designer template failed & goto error)
239239
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' qgis.reg.tmpl >%PKGDIR%\bin\qgis.reg.tmpl
240240
if errorlevel 1 (echo creation of registry template & goto error)
@@ -287,7 +287,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
287287
bin/%PACKAGENAME%-bin.exe ^
288288
bin/%PACKAGENAME%-browser-bin.exe ^
289289
%batches% ^
290-
bin/designer-%PACKAGENAME%.bat.tmpl ^
290+
bin/%PACKAGENAME%-designer.bat.tmpl ^
291291
bin/python-%PACKAGENAME%.bat.tmpl ^
292292
etc/postinstall/%PACKAGENAME%.bat ^
293293
etc/preremove/%PACKAGENAME%.bat

ms-windows/osgeo4w/postinstall-dev.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
textreplace -std -t bin\designer-@package@.bat
1+
textreplace -std -t bin\@package@-designer.bat
22
textreplace -std -t bin\python-@package@.bat
33

44
for %%g in (@grassversions@) do (
@@ -13,8 +13,8 @@ for %%g in (@grassversions@) do (
1313
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Browser @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-browser-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\browser.ico"
1414
)
1515

16-
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\designer-@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
17-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\designer-@package@.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
16+
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-designer.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
17+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-designer.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
1818

1919
set O4W_ROOT=%OSGEO4W_ROOT%
2020
set OSGEO4W_ROOT=%OSGEO4W_ROOT:\=\\%

ms-windows/osgeo4w/preremove-dev.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ for %%g in (@grassversions@) do (
1010
del "%OSGEO4W_STARTMENU%\Qt Designer with QGIS @version@ custom widgets (Nightly).lnk"
1111
del "%ALLUSERSPROFILE%\Desktop\Qt Designer with QGIS @version@ custom widgets (Nightly).lnk"
1212

13-
del "%OSGEO4W_ROOT%"\bin\designer-@package@.bat
13+
del "%OSGEO4W_ROOT%"\bin\@package@-designer.bat
1414
del "%OSGEO4W_ROOT%"\bin\python-@package@.bat
1515
del "%OSGEO4W_ROOT%"\apps\@package@\python\qgis\qgisconfig.py
1616
del "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.reg

0 commit comments

Comments
 (0)