Skip to content

Commit

Permalink
Update Windows menu shortcuts to menuinst 2 format (#272)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored May 29, 2024
2 parents 87e374e + dc7e959 commit 09794f7
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 26 deletions.
2 changes: 1 addition & 1 deletion recipe/install_grc.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ setlocal EnableDelayedExpansion
@echo on

if not exist "%PREFIX%\Menu" mkdir "%PREFIX%\Menu"
copy "%RECIPE_DIR%\menus\menu-grc-windows.json" "%PREFIX%\Menu"
copy "%RECIPE_DIR%\menus\gnuradio-grc.json" "%PREFIX%\Menu"
copy "%RECIPE_DIR%\menus\grc.ico" "%PREFIX%\Menu"
if errorlevel 1 exit 1

Expand Down
2 changes: 1 addition & 1 deletion recipe/install_qtgui.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ setlocal EnableDelayedExpansion
@echo on

if not exist "%PREFIX%\Menu" mkdir "%PREFIX%\Menu"
copy "%RECIPE_DIR%\menus\menu-gr_filter_design-windows.json" "%PREFIX%\Menu"
copy "%RECIPE_DIR%\menus\gnuradio-qtgui.json" "%PREFIX%\Menu"

cd build
cmake -P gr-qtgui/cmake_install.cmake
Expand Down
21 changes: 21 additions & 0 deletions recipe/menus/gnuradio-grc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"$id": "https://schemas.conda.io/menuinst-1.schema.json",
"$schema": "https://json-schema.org/draft-07/schema",
"menu_name": "{{ DISTRIBUTION_NAME }}",
"menu_items": [
{
"name": "GNU Radio Companion",
"description": "Flowgraph builder for GNU Radio",
"command": [
"{{ BIN_DIR }}/gnuradio-companion"
],
"icon": "{{ MENU_DIR }}/grc.{{ ICON_EXT }}",
"platforms": {
"win": {
"desktop": false,
"quicklaunch": false
}
}
}
]
}
20 changes: 20 additions & 0 deletions recipe/menus/gnuradio-qtgui.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"$id": "https://schemas.conda.io/menuinst-1.schema.json",
"$schema": "https://json-schema.org/draft-07/schema",
"menu_name": "{{ DISTRIBUTION_NAME }}",
"menu_items": [
{
"name": "GNU Radio Filter Design Tool",
"description": "Graphical filter design tool for GNU Radio",
"command": [
"{{ BIN_DIR }}/gr_filter_design"
],
"platforms": {
"win": {
"desktop": false,
"quicklaunch": false
}
}
}
]
}
11 changes: 0 additions & 11 deletions recipe/menus/menu-gr_filter_design-windows.json

This file was deleted.

12 changes: 0 additions & 12 deletions recipe/menus/menu-grc-windows.json

This file was deleted.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source:


build:
number: 7
number: 8

requirements:
build:
Expand Down

0 comments on commit 09794f7

Please sign in to comment.