Skip to content

Commit

Permalink
Differentiate client name from configuration directory name.
Browse files Browse the repository at this point in the history
  • Loading branch information
ahlstromcj committed Nov 4, 2024
1 parent 640f61a commit 20a1fa5
Show file tree
Hide file tree
Showing 38 changed files with 236 additions and 141 deletions.
9 changes: 8 additions & 1 deletion INSTALL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
INSTALL for Seq66 v. 0.99.15 and above
Chris Ahlstrom
2015-09-10 to 2024-10-25
2015-09-10 to 2024-11-04

Getting Seq66 requires building the code or going to "ahlstromcj/seq66" on
GitHub to get an installation package or a Windows release executable.
Expand Down Expand Up @@ -67,6 +67,13 @@ Autotools Build and Install:
should make soft links to /usr/share/automake files in the aux-files
directory. Then try the above commands again.

Another variation is to change the client/port name from the default,
which is "seq66". Add an option like the following:

$ ./configure --with-client=myseqclient

This change will show up in the MIDI I/O tabs in Edit / Preferences.

Also note that the qmake executable must exist. If it is not found,
check for the existence of an alternate name (e.g. qmake-qt5) and
make a soft link to it.
Expand Down
4 changes: 3 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \
$(top_srcdir)/aux-files/mkinstalldirs \
$(top_srcdir)/include/config.h.in ChangeLog INSTALL NEWS \
README.md TODO aux-files/compile aux-files/config.guess \
aux-files/config.rpath aux-files/config.sub aux-files/depcomp \
aux-files/config.rpath aux-files/config.sub \
aux-files/install-sh aux-files/ltmain.sh aux-files/missing \
aux-files/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
Expand Down Expand Up @@ -253,6 +253,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
API_VERSION = @API_VERSION@
APP_BUILD_ISSUE = @APP_BUILD_ISSUE@
APP_BUILD_OS = @APP_BUILD_OS@
APP_ENGINE = @APP_ENGINE@
APP_NAME = @APP_NAME@
Expand All @@ -266,6 +267,7 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLIENT_NAME = @CLIENT_NAME@
CONFIG_DIR_NAME = @CONFIG_DIR_NAME@
CONFIG_NAME = @CONFIG_NAME@
COVFLAGS = @COVFLAGS@
CPP = @CPP@
Expand Down
6 changes: 5 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NEWS for Seq66 0.99.16
Chris Ahlstrom
2015-07-10 to 2024-11-02
2015-07-10 to 2024-11-04

# Change Log

Expand All @@ -9,6 +9,7 @@ Chris Ahlstrom
### Changed

- Refined documentation about the Import/Export functionality.
- Added CONFIG\_DIR\_NAME and cleaned up configure.ac.

### Fixed

Expand All @@ -17,6 +18,9 @@ Chris Ahlstrom
### Added

- Added 120 PPQN to the list of supported PPQNs.
- Added a "config directory" macro to configure.ac and seq-feature
functions to access it. Differentiates between client and directory
name.

## [0.99.15]

Expand Down
2 changes: 2 additions & 0 deletions Seq66cli/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
API_VERSION = @API_VERSION@
APP_BUILD_ISSUE = @APP_BUILD_ISSUE@
APP_BUILD_OS = @APP_BUILD_OS@
APP_ENGINE = @APP_ENGINE@
APP_NAME = @APP_NAME@
Expand All @@ -231,6 +232,7 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLIENT_NAME = @CLIENT_NAME@
CONFIG_DIR_NAME = @CONFIG_DIR_NAME@
CONFIG_NAME = @CONFIG_NAME@
COVFLAGS = @COVFLAGS@
CPP = @CPP@
Expand Down
2 changes: 2 additions & 0 deletions Seq66qt5/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
API_VERSION = @API_VERSION@
APP_BUILD_ISSUE = @APP_BUILD_ISSUE@
APP_BUILD_OS = @APP_BUILD_OS@
APP_ENGINE = @APP_ENGINE@
APP_NAME = @APP_NAME@
Expand All @@ -233,6 +234,7 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLIENT_NAME = @CLIENT_NAME@
CONFIG_DIR_NAME = @CONFIG_DIR_NAME@
CONFIG_NAME = @CONFIG_NAME@
COVFLAGS = @COVFLAGS@
CPP = @CPP@
Expand Down
4 changes: 2 additions & 2 deletions aux-files/ltmain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

PROGRAM=libtool
PACKAGE=libtool
VERSION="2.4.7 Debian-2.4.7-7"
VERSION="2.4.7 Debian-2.4.7-8"
package_revision=2.4.7


Expand Down Expand Up @@ -2296,7 +2296,7 @@ include the following information:
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
version: $progname $scriptversion Debian-2.4.7-7
version: $progname $scriptversion Debian-2.4.7-8
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Expand Down
133 changes: 67 additions & 66 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -685,9 +685,11 @@ BUILD_PORTMIDI_TRUE
BUILD_DOCS_FALSE
BUILD_DOCS_TRUE
ICON_NAME
CONFIG_DIR_NAME
CONFIG_NAME
CLIENT_NAME
APP_BUILD_OS
APP_BUILD_ISSUE
APP_ENGINE
APP_TYPE
APP_NAME
Expand Down Expand Up @@ -882,6 +884,7 @@ with_aix_soname
with_gnu_ld
with_sysroot
enable_libtool_lock
with_client
enable_docs
enable_jack
enable_jack_session
Expand Down Expand Up @@ -1598,6 +1601,7 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
--with-client Change name of client/port from default
--with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)
--with-alsa-inc-prefix=PFX
Prefix where include libraries are (optional)
Expand Down Expand Up @@ -5616,6 +5620,17 @@ ac_build_testing="no"
ac_build_qt="yes"


ac_app_name="qseq66"
ac_app_type="qt"
ac_app_engine="rtmidi"
ac_app_build_issue="Linux"
ac_app_build_os="Linux"
ac_client_name="seq66"
ac_config_name="qseq66"
ac_config_dir_name="seq66"
ac_icon_name="qseq66"


case $host_os in
*cygwin* | *msys* | windows*) ac_build_windows="yes";;
* ) ac_build_windows="no";;
Expand All @@ -5642,21 +5657,7 @@ printf "%s\n" "#define APP_TYPE \"qt5\"" >>confdefs.h

printf "%s\n" "#define APP_ENGINE \"rtmidi\"" >>confdefs.h

ac_build_os="'$(uname -srm)'"



printf "%s\n" "#define APP_BUILD_OS \"$ac_build_os\"" >>confdefs.h




printf "%s\n" "#define APP_BUILD_ISSUE \"GNU/Linux\"" >>confdefs.h



printf "%s\n" "#define CLIENT_NAME \"seq66\"" >>confdefs.h

ac_app_build_os="'$(uname -srm)'"

SEQ66_SUITE_NAME="SEQ66"

Expand Down Expand Up @@ -17341,6 +17342,19 @@ seq66pixdir="${datadir}/pixmaps/seq66-${SEQ66_API_VERSION}"




# Check whether --with-client was given.
if test ${with_client+y}
then :
withval=$with_client; ac_client_name=$withval
fi



printf "%s\n" "#define CLIENT_NAME \"$ac_client_name\"" >>confdefs.h



CFLAGS="${CFLAGS} -I/usr/local/include "
CXXFLAGS="${CXXFLAGS} -I/usr/local/include "
LDFLAGS="${LDFLAGS} -L/usr/local/lib "
Expand Down Expand Up @@ -18668,18 +18682,6 @@ fi
if test "$rtmidi" != "no" -o "$both" != "no" ; then
ac_build_rtmidi="yes"

printf "%s\n" "#define APP_NAME \"qseq66\"" >>confdefs.h


printf "%s\n" "#define APP_ENGINE \"rtmidi\"" >>confdefs.h


printf "%s\n" "#define CONFIG_NAME \"qseq66\"" >>confdefs.h


printf "%s\n" "#define ICON_NAME \"qseq66\"" >>confdefs.h


printf "%s\n" "#define RTMIDI_SUPPORT 1" >>confdefs.h

alsa_save_CFLAGS="$CFLAGS"
Expand Down Expand Up @@ -19167,23 +19169,11 @@ if test "$cli" != "no" ; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: rtmidi command-line build enabled" >&5
printf "%s\n" "rtmidi command-line build enabled" >&6; };

printf "%s\n" "#define APP_NAME \"seq66cli\"" >>confdefs.h


printf "%s\n" "#define APP_CLI 1" >>confdefs.h


printf "%s\n" "#define APP_TYPE \"cli\"" >>confdefs.h


printf "%s\n" "#define APP_ENGINE \"rtmidi\"" >>confdefs.h


printf "%s\n" "#define CONFIG_NAME \"seq66cli\"" >>confdefs.h


printf "%s\n" "#define ICON_NAME \"qseq66\"" >>confdefs.h

ac_app_name="seq66cli"
ac_app_type="cli"
ac_config_name="seq66cli"
if test "$mingw" != "yes" ; then
ac_build_rtcli="yes"
ac_build_qtmidi="no"
Expand Down Expand Up @@ -19673,21 +19663,8 @@ fi


if test "$ac_build_qt" != "no" ; then

printf "%s\n" "#define APP_NAME \"qseq66\"" >>confdefs.h


printf "%s\n" "#define APP_ENGINE \"rtmidi\"" >>confdefs.h


printf "%s\n" "#define APP_TYPE \"qt5\"" >>confdefs.h


printf "%s\n" "#define CONFIG_NAME \"qseq66\"" >>confdefs.h


printf "%s\n" "#define ICON_NAME \"qseq66\"" >>confdefs.h

ac_app_name="qseq66"
ac_app_type="qt"
if test "$ac_build_windows" != "yes" ; then
alsa_save_CFLAGS="$CFLAGS"
alsa_save_LDFLAGS="$LDFLAGS"
Expand Down Expand Up @@ -21716,17 +21693,11 @@ fi
if test "$portmidi" != "no" ; then
ac_build_portmidi="yes"
ac_build_rtmidi="no"
ac_app_name="seq66portmidi"
ac_config_name="seq66portmidi"

printf "%s\n" "#define PORTMIDI_SUPPORT 1" >>confdefs.h


printf "%s\n" "#define APP_NAME \"seq66portmidi\"" >>confdefs.h


printf "%s\n" "#define CONFIG_NAME \"seq66portmidi\"" >>confdefs.h


printf "%s\n" "#define ICON_NAME \"qseq66\"" >>confdefs.h
printf "%s\n" "#define PORTMIDI_SUPPORT 1" >>confdefs.h

alsa_save_CFLAGS="$CFLAGS"
alsa_save_LDFLAGS="$LDFLAGS"
Expand Down Expand Up @@ -22200,6 +22171,36 @@ printf "%s\n" "$as_me: Portmidi build disabled" >&6;};
fi


printf "%s\n" "#define APP_NAME \"$ac_app_name\"" >>confdefs.h


printf "%s\n" "#define APP_TYPE \"$ac_app_type\"" >>confdefs.h


printf "%s\n" "#define APP_ENGINE \"$ac_app_engine\"" >>confdefs.h


printf "%s\n" "#define APP_BUILD_ISSUE \"GNU/Linux\"" >>confdefs.h


printf "%s\n" "#define APP_BUILD_OS \"$ac_app_build_os\"" >>confdefs.h


printf "%s\n" "#define CLIENT_NAME \"$ac_client_name\"" >>confdefs.h


printf "%s\n" "#define CONFIG_NAME \"$ac_config_name\"" >>confdefs.h


printf "%s\n" "#define CONFIG_DIR_NAME \"$ac_config_dir_name\"" >>confdefs.h


printf "%s\n" "#define ICON_NAME \"$ac_icon_name\"" >>confdefs.h








Expand Down
Loading

0 comments on commit 20a1fa5

Please sign in to comment.