Skip to content
Snippets Groups Projects

Nsdwrap 3342

Merged Punn, Kamal requested to merge nsdwrap-3342 into main

Merge request reports

Pipeline #505377 passed

Pipeline passed for ba185da6 on nsdwrap-3342

Merged by Gibbs, IanGibbs, Ian 1 year ago (Jan 5, 2024 4:16pm UTC)

Merge details

  • Changes merged into with 120ff412.
  • Deleted the source branch.

Pipeline #505663 failed

Pipeline failed for 120ff412 on main

Deployed to ma‎in‎ 1 year ago

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
1 #!/usr/bin/env xdg-open
2 [Desktop Entry]
3 Encoding=UTF-8
4 Name=CrystalPlan
5 Comment=CrystalPlan
6 Exec=/usr/local/bin/vgl-wrapper.sh /usr/bin/crystalplan.py
  • paraview.desktop 0 → 100644
    1 [Desktop Entry]
    2 Version=1.0
    3 Type=Application
    4 Name=ParaView
    5 Comment=Parallel visualization application
    6 Exec=/usr/bin/paraview
    7 TryExec=paraview
    8 Icon=/usr/share/icons/hicolor/96x96/apps/paraview
  • quicknxs1.desktop 0 → 100644
    1 #!/usr/bin/env xdg-open
    2 [Desktop Entry]
    3 Encoding=UTF-8
    4 Name=QuickNXS (Magnetism Reflectometer)
    5 Exec=quicknxs3
    6 Icon=/SNS/software/images/quicknxs.png
  • quicknxs1.desktop 0 → 100644
    1 #!/usr/bin/env xdg-open
    2 [Desktop Entry]
    3 Encoding=UTF-8
    4 Name=QuickNXS (Magnetism Reflectometer)
    5 Exec=quicknxs3
  • 61 65 install -m 644 mantidworkbenchqa.desktop %{buildroot}%{_datadir}/applications/
    62 66 install -m 644 jupyter.sns.desktop %{buildroot}%{_datadir}/applications/
    63 67 install -m 644 jupyter.local.desktop %{buildroot}%{_datadir}/applications/
    68 install -m 644 quicknxs2.local.desktop %{buildroot}%{_datadir}/applications/
  • quicknxs1.desktop 0 → 100644
    1 #!/usr/bin/env xdg-open
  • Lots of little comments. I think you'd benefit from merging !40 (merged) into this so we can test that the rpm builds. The "big" problem is that the images for the menu items need to be in this repository (see pyrs) and the names of the desktop files in the spec don't match the files you created.

  • Punn, Kamal added 1 commit

    added 1 commit

    • c780f6db - modified few files and added png files

    Compare with previous version

  • Punn, Kamal added 2 commits

    added 2 commits

    Compare with previous version

  • Punn, Kamal added 1 commit

    added 1 commit

    • a32775b6 - modified nsd-app-wrap.spec file with correct package names

    Compare with previous version

  • Punn, Kamal added 1 commit

    added 1 commit

    • 661adbd7 - added the command git config --global --add safe.directory /tmp as suggested...

    Compare with previous version

  • Punn, Kamal added 1 commit

    added 1 commit

    • 07fa86dc - added crystalplan.png file and modified its desktop file

    Compare with previous version

  • The crystalplan.png appears to be missing from the rpm

    $ rpm -qlp ~/rpmbuild/RPMS/noarch/nsd-app-wrap-1.50-1.el9.noarch.rpm 
    /usr/bin/addie
    /usr/bin/crystalplan
    /usr/bin/drtsans
    /usr/bin/gsas2
    /usr/bin/jupyter
    /usr/bin/licorne
    /usr/bin/mantidpython
    /usr/bin/mantidpythonnightly
    /usr/bin/mantidpythonqa
    /usr/bin/mantidtotalscattering
    /usr/bin/mantidworkbench
    /usr/bin/mantidworkbenchnightly
    /usr/bin/mantidworkbenchqa
    /usr/bin/neutron-imaging
    /usr/bin/nr_launcher
    /usr/bin/nsd-app-wrap.sh
    /usr/bin/nsd-conda-wrap.sh
    /usr/bin/paraview
    /usr/bin/pyrs
    /usr/bin/quicknxs
    /usr/bin/quicknxs3
    /usr/bin/refred
    /usr/bin/sasview
    /usr/bin/shiver
    /usr/bin/snapred
    /usr/share/applications/crystalplan.desktop
    /usr/share/applications/jupyter.local.desktop
    /usr/share/applications/jupyter.sns.desktop
    /usr/share/applications/mantidworkbench.desktop
    /usr/share/applications/mantidworkbenchnightly.desktop
    /usr/share/applications/mantidworkbenchqa.desktop
    /usr/share/applications/paraview.desktop
    /usr/share/applications/pyrs.desktop
    /usr/share/applications/quicknxs.desktop
    /usr/share/doc/nsd-app-wrap
    /usr/share/doc/nsd-app-wrap/README.md
    /usr/share/licenses/nsd-app-wrap
    /usr/share/licenses/nsd-app-wrap/LICENSE
    /usr/share/pixmaps/jupyter.svg
    /usr/share/pixmaps/mantid_workbench.png
    /usr/share/pixmaps/mantid_workbenchnightly.png
    /usr/share/pixmaps/mantid_workbenchqa.png
    /usr/share/pixmaps/paraview.png
    /usr/share/pixmaps/pyrs.png
    /usr/share/pixmaps/quicknxs.png
  • I didn't verify that the desktop files change the menus b/c I can't install anywhere. I'm willing to test that after we deploy it to bl100-analysis1. It may take a little help from John L to install so we don't have a broken version in the dnf repo

  • Author Contributor

    i was missing a line in spec file so added the same for crystalplan install -m 644 crystalplan.png %{buildroot}/%{_datadir}/pixmaps/ in nsd-app-wrap.spec

  • Punn, Kamal added 1 commit

    added 1 commit

    • ba185da6 - added crystalplan install line in nsd-app-wrap.spec file

    Compare with previous version

  • The rpm "looks" ok to me now

  • Peterson, Peter approved this merge request

    approved this merge request

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading