Browse Source

Rename new-session-manager executable to nsm-legacy-gui to prevent future confusion.

tags/v1.3.2
Nils 2 years ago
parent
commit
9257a456ad
No known key found for this signature in database GPG Key ID: 28C6A306F2909FEE
6 changed files with 20 additions and 15 deletions
  1. +3
    -0
      CHANGELOG
  2. +6
    -5
      README.md
  3. +6
    -6
      meson.build
  4. +1
    -1
      meson_options.txt
  5. +2
    -2
      src/legacy-gui.cpp
  6. +2
    -1
      src/org.linuxaudio.nsm-legacy-gui.desktop

+ 3
- 0
CHANGELOG View File

@@ -1,3 +1,6 @@
v.1.3.2
Rename new-session-manager executable to nsm-legacy-gui to prevent future confusion.

v1.3.1
Add header copyright even to unchanged files to adhere to stricter packaging requirements.
Meson can now switch off individual executables and will stop/error when trying to build without dependencies.


+ 6
- 5
README.md View File

@@ -37,7 +37,7 @@ It is highly recommended to use Argodejo ( https://www.laborejo.org/argodejo/ )
user interface. In fact, if you install Argodejo in you distribution it will install NSM as
dependency and you don't need to do anything yourself with this software package.

This repository also contains the legacy FLTK interface simply called `new-session-manager`,
This repository also contains the legacy FLTK interface simply called `nsm-legacy-gui`,
symlinked to `non-session-manager` for backwards compatibility. (e.g. autostart scripts etc.)

## Supported Clients
@@ -69,9 +69,10 @@ This is a software package that will compile and install multiple executables:
* It has no GUI.
* Dependencies are `JACK Audio Connection Kit` and `liblo`, the OSC library.
* Can be deactivated (see below) `-Djackpatch=false`
* `new-session-manager`, Legacy GUI for the user
* `nsm-legacy-gui`, Legacy GUI for the user
* Formerly known as "non-session-manager"
* Dependencies are `FLTK` and `liblo`, the OSC library.
* Can be deactivated (see below) `-Dnew-session-manager=false`
* Can be deactivated (see below) `-Dlegacy-gui=false`
* `nsm-proxy`, NSM GUI Client to run any program without direct NSM support
* Dependencies are `FLTK`, `fluid` (FLTK Editor/compiler, maybe in the same package as FLTK, maybe not) and `liblo`, the OSC library.
* Can be deactivated (see below) `-Dnsm-proxy=false`
@@ -80,7 +81,7 @@ This is a software package that will compile and install multiple executables:
```
meson build --prefix=/usr
#or disable individual build targets:
#meson build --prefix=/usr -Dnew-session-manager=false -Dnsm-proxy=false -Djackpatch=false
#meson build --prefix=/usr -Dlegacy-gui=false -Dnsm-proxy=false -Djackpatch=false
cd build && ninja
sudo ninja install
```
@@ -94,5 +95,5 @@ can find each other.
Some distributions (and possibly local laws) prevent a forked software project from creating
executable files under the same name, if the name itself is an original work subject to copyright,
which it arguably is for the "NON-"-suite. Therefore New Session Manager renamed
`non-session-manager` to `new-session-manager`. Installing will also create a symlink to
`non-session-manager` to `nsm-legacy-gui`. Installing will also create a symlink to
`non-session-manager` for backwards compatibility. (e.g. autostart scripts etc.).

+ 6
- 6
meson.build View File

@@ -28,7 +28,7 @@ threaddep = dependency('threads')
jackdep = dependency('jack', required: get_option('jackpatch')) #and not 'libjack'

cc = meson.get_compiler('c')
fltkdep = cc.find_library('fltk', required: get_option('new-session-manager') or get_option('nsm-proxy'))
fltkdep = cc.find_library('fltk', required: get_option('nsm-legacy-gui') or get_option('nsm-proxy'))
fluid = find_program('fluid', required: get_option('nsm-proxy'))


@@ -86,18 +86,18 @@ if get_option('nsm-proxy')
)
endif

if get_option('new-session-manager')
if get_option('nsm-legacy-gui')

executable('new-session-manager',
sources: ['src/session-manager.cpp', 'src/debug.cpp', 'src/Endpoint.cpp', 'src/Thread.cpp', 'src/FL/Fl_Scalepack.C'],
executable('nsm-legacy-gui',
sources: ['src/legacy-gui.cpp', 'src/debug.cpp', 'src/Endpoint.cpp', 'src/Thread.cpp', 'src/FL/Fl_Scalepack.C'],
dependencies: [fltkdep, liblodep, threaddep],
install: true,
)

install_data('src/org.linuxaudio.new-session-manager.desktop', install_dir : get_option('datadir') / 'applications')
install_data('src/org.linuxaudio.nsm-legacy-gui.desktop', install_dir : get_option('datadir') / 'applications')

meson.add_install_script('sh', '-c',
'ln -sf new-session-manager ${DESTDIR}@0@/@1@/non-session-manager'.format(
'ln -sf nsm-legacy-gui ${DESTDIR}@0@/@1@/non-session-manager'.format(
get_option('prefix'), get_option('bindir')))

endif

+ 1
- 1
meson_options.txt View File

@@ -1,4 +1,4 @@
option('new-session-manager', type : 'boolean', value : true, description : 'Build new-session-manager GUI')
option('nsm-legacy-gui', type : 'boolean', value : true, description : 'Build nsm-legacy-gui, symlinked as non-session-manager')
option('jackpatch', type : 'boolean', value : true, description : 'Build jackpatch client')
option('nsm-proxy', type : 'boolean', value : true, description : 'Build nsm-proxy client with GUI.')



src/session-manager.cpp → src/legacy-gui.cpp View File

@@ -51,8 +51,8 @@
#include <time.h>
#include <getopt.h>

#define APP_NAME "New-Session-Manager"
#define APP_TITLE "New Session Manager"
#define APP_NAME "NSM Legacy GUI"
#define APP_TITLE "NSM Legacy GUI"

#pragma GCC diagnostic ignored "-Wunused-result"


src/org.linuxaudio.new-session-manager.desktop → src/org.linuxaudio.nsm-legacy-gui.desktop View File

@@ -4,7 +4,8 @@ Name=New Session Manager (Legacy GUI)
Comment=Audio session manager (Legacy GUI)
Comment[fr]=Gestionnaire de session audio (Ancienne GUI)
Comment[pt]=Gestor de sessões audio (Antiga GUI)
Exec=new-session-manager
Comment[de]=Verwaltet Audiositzungen (Alte Oberfläche)
Exec=nsm-legacy-gui
Terminal=false
StartupNotify=false
Version=1.0

Loading…
Cancel
Save