LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Global build system, build system bugfixes. 

git-svn-id: http://svn.drobilla.net/lad@154 a436a847-0d15-0410-975c-d299462d15a1
This commit is contained in:
dave 2006-10-04 07:11:09 +00:00
parent f0cd56f0be
commit 555deca292
22 changed files with 138 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BUILDING
View File

@ -1,19 +0,0 @@
At some point a spiffy build script of some variety should live here.
Until then, the build orders:
* Ingen:
flowcanvas
libslv2
ingen
* Patchage:
flowcanvas
patchage
(Everything else has no interdependencies)

1
Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS = flowcanvas patchage libslv2 omins ingen

15
README Normal file
View File

@ -0,0 +1,15 @@
This is not a "project", but an entire repository of code containing many
projects (checked out from http://codeson.net). The only common thread
tying it all together is that I wrote it. Hi. :)
There are build scripts in this directory for convenience, but every
subdirectory can be used individually as an independent (autotoolized)
project.
'./configure --help=recursive' will give you a (horribly large and bloated)
listing of all configure options which you can pass to the top level
configure script to build everything however you like.
Enjoy,
-Dave

17
configure.ac Normal file
View File

@ -0,0 +1,17 @@
AC_PREREQ(2.59)
AC_INIT([ingen],[svn],[drobilla@connect.carleton.ca])
AM_INIT_AUTOMAKE
AC_CONFIG_SUBDIRS([flowcanvas])
AC_CONFIG_SUBDIRS([patchage])
AC_CONFIG_SUBDIRS([libslv2])
AC_CONFIG_SUBDIRS([omins])
AC_CONFIG_SUBDIRS([ingen])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Now type 'make' to marvel at screenfuls of unintelligible junk])
AC_MSG_NOTICE([for what seems like days.])

2
flowcanvas/flowcanvas/FlowCanvas.h
View File

@ -74,7 +74,7 @@ public:
bool add_connection(boost::shared_ptr<Port> port1, bool add_connection(boost::shared_ptr<Port> port1,
boost::shared_ptr<Port> port2); boost::shared_ptr<Port> port2);
void add_connection(boost::shared_ptr<Connection> connection); bool add_connection(boost::shared_ptr<Connection> connection);
boost::shared_ptr<Connection> remove_connection(boost::shared_ptr<Port> port1, boost::shared_ptr<Connection> remove_connection(boost::shared_ptr<Port> port1,
boost::shared_ptr<Port> port2); boost::shared_ptr<Port> port2);

14
flowcanvas/src/FlowCanvas.cpp
View File

@ -479,10 +479,20 @@ FlowCanvas::add_connection(boost::shared_ptr<Port> port1, boost::shared_ptr<Port
} }
void bool
FlowCanvas::add_connection(boost::shared_ptr<Connection> c) FlowCanvas::add_connection(boost::shared_ptr<Connection> c)
{ {
m_connections.push_back(c); boost::shared_ptr<Port> src = c->source().lock();
boost::shared_ptr<Port> dst = c->dest().lock();
if (src && dst) {
src->add_connection(c);
dst->add_connection(c);
m_connections.push_back(c);
return true;
} else {
return false;
}
} }

12
flowcanvas/src/Port.cpp
View File

@ -127,11 +127,15 @@ Port::move_connections()
* A reference to the connection is not retained (only a weak_ptr is stored). * A reference to the connection is not retained (only a weak_ptr is stored).
*/ */
void void
Port::add_connection(boost::shared_ptr<Connection> c) Port::add_connection(boost::shared_ptr<Connection> connection)
{ {
//list<boost::weak_ptr<Connection> >::iterator i = find(m_connections.begin(), m_connections.end(), boost::weak_ptr<Connection>(c)); for (list<boost::weak_ptr<Connection> >::iterator i = m_connections.begin(); i != m_connections.end(); i++) {
//if (i == m_connections.end()) boost::shared_ptr<Connection> c = (*i).lock();
m_connections.push_back(c); if (c && c == connection)
return;
}
m_connections.push_back(connection);
} }

2
ingen/Makefile.am
View File

@ -1,4 +1,4 @@
SUBDIRS = src SUBDIRS = src patches
doc: doc/Doxyfile src/engine/*.h src/engine/*.cpp \ doc: doc/Doxyfile src/engine/*.h src/engine/*.cpp \
src/common/util/*.h \ src/common/util/*.h \

3
ingen/configure.ac
View File

@ -1,4 +1,4 @@
C_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([ingen],[0.4.0pre],[drobilla@connect.carleton.ca]) AC_INIT([ingen],[0.4.0pre],[drobilla@connect.carleton.ca])
AC_CONFIG_SRCDIR([src/common/util/CountedPtr.h]) AC_CONFIG_SRCDIR([src/common/util/CountedPtr.h])
AC_CONFIG_SRCDIR([src/common/interface/EngineInterface.h]) AC_CONFIG_SRCDIR([src/common/interface/EngineInterface.h])
@ -394,6 +394,7 @@ AC_CONFIG_FILES([src/common/interface/Makefile])
AC_CONFIG_FILES([src/libs/Makefile]) AC_CONFIG_FILES([src/libs/Makefile])
AC_CONFIG_FILES([src/libs/engine/Makefile]) AC_CONFIG_FILES([src/libs/engine/Makefile])
AC_CONFIG_FILES([src/libs/engine/tests/Makefile]) AC_CONFIG_FILES([src/libs/engine/tests/Makefile])
AC_CONFIG_FILES([src/libs/engine/events/Makefile])
AC_CONFIG_FILES([src/libs/client/Makefile]) AC_CONFIG_FILES([src/libs/client/Makefile])
AC_CONFIG_FILES([src/progs/Makefile]) AC_CONFIG_FILES([src/progs/Makefile])
AC_CONFIG_FILES([src/progs/server/Makefile]) AC_CONFIG_FILES([src/progs/server/Makefile])

3
ingen/src/Makefile.am
View File

@ -1,3 +1,4 @@
SUBDIRS = libs progs SUBDIRS = libs progs
DIST_SUBDIRS = common
DIST_SUBDIRS = $(SUBDIRS) common

2
ingen/src/libs/client/Makefile.am
View File

@ -7,7 +7,6 @@ libingenclient_la_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdata
libingenclient_la_LIBADD = @LXML2_LIBS@ @LOSC_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@ libingenclient_la_LIBADD = @LXML2_LIBS@ @LOSC_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@
libingenclient_la_SOURCES = \ libingenclient_la_SOURCES = \
ClientInterface.h \
OSCEngineSender.h \ OSCEngineSender.h \
OSCEngineSender.cpp \ OSCEngineSender.cpp \
OSCModelEngineInterface.h \ OSCModelEngineInterface.h \
@ -21,7 +20,6 @@ libingenclient_la_SOURCES = \
ModelEngineInterface.cpp \ ModelEngineInterface.cpp \
PresetModel.h \ PresetModel.h \
ControlModel.h \ ControlModel.h \
ObjectController.h \
ObjectModel.h \ ObjectModel.h \
ObjectModel.cpp \ ObjectModel.cpp \
NodeModel.h \ NodeModel.h \

16
ingen/src/libs/engine/Makefile.am
View File

@ -1,5 +1,4 @@
SUBDIRS = tests SUBDIRS = tests events
DIST_SUBDIRS = events
AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events
@ -12,6 +11,7 @@ noinst_LTLIBRARIES = libingen.la
libingen_la_SOURCES = \ libingen_la_SOURCES = \
util.h \ util.h \
tuning.h \ tuning.h \
events.h \
DataType.h \ DataType.h \
Node.h \ Node.h \
NodeBase.h \ NodeBase.h \
@ -31,7 +31,6 @@ libingen_la_SOURCES = \
DirectResponder.h \ DirectResponder.h \
OSCResponder.h \ OSCResponder.h \
OSCResponder.cpp \ OSCResponder.cpp \
ClientKey.h \
ClientBroadcaster.h \ ClientBroadcaster.h \
ClientBroadcaster.cpp \ ClientBroadcaster.cpp \
ObjectSender.h \ ObjectSender.h \
@ -68,7 +67,7 @@ libingen_la_SOURCES = \
Maid.cpp \ Maid.cpp \
MaidObject.h \ MaidObject.h \
Tree.h \ Tree.h \
ClientRecord.h \ TreeImplementation.h \
PluginLibrary.h \ PluginLibrary.h \
Plugin.h \ Plugin.h \
Plugin.cpp \ Plugin.cpp \
@ -88,12 +87,6 @@ libingen_la_SOURCES = \
AudioDriver.h \ AudioDriver.h \
MidiDriver.h \ MidiDriver.h \
midi.h \ midi.h \
../libingen_la/util/Semaphore.h \
../libingen_la/util/types.h \
../libingen_la/util/Path.h \
../libingen_la/util/Queue.h \
../libingen_la/interface/ClientInterface.h \
../libingen_la/interface/EngineInterface.h \
instantiations.cpp \ instantiations.cpp \
events/RegisterClientEvent.h \ events/RegisterClientEvent.h \
events/RegisterClientEvent.cpp \ events/RegisterClientEvent.cpp \
@ -213,7 +206,6 @@ endif
if WITH_LASH if WITH_LASH
libingen_la_SOURCES += \ libingen_la_SOURCES += \
LashDriver.h \ LashDriver.h \
LashDriver.cpp \ LashDriver.cpp
LashRestoreDoneEvent.h
endif endif

118
ingen/src/libs/engine/events/Makefile.am
View File

@ -1,65 +1,65 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = \ EXTRA_DIST = \
events/RegisterClientEvent.h \ RegisterClientEvent.h \
events/RegisterClientEvent.cpp \ RegisterClientEvent.cpp \
events/UnregisterClientEvent.h \ UnregisterClientEvent.h \
events/UnregisterClientEvent.cpp \ UnregisterClientEvent.cpp \
events/PingQueuedEvent.h \ PingQueuedEvent.h \
events/ActivateEvent.h \ ActivateEvent.h \
events/ActivateEvent.cpp \ ActivateEvent.cpp \
events/DeactivateEvent.h \ DeactivateEvent.h \
events/DeactivateEvent.cpp \ DeactivateEvent.cpp \
events/SetPortValueEvent.h \ SetPortValueEvent.h \
events/SetPortValueEvent.cpp \ SetPortValueEvent.cpp \
events/SetPortValueQueuedEvent.h \ SetPortValueQueuedEvent.h \
events/SetPortValueQueuedEvent.cpp \ SetPortValueQueuedEvent.cpp \
events/NoteOnEvent.h \ NoteOnEvent.h \
events/NoteOnEvent.cpp \ NoteOnEvent.cpp \
events/NoteOffEvent.h \ NoteOffEvent.h \
events/NoteOffEvent.cpp \ NoteOffEvent.cpp \
events/AllNotesOffEvent.h \ AllNotesOffEvent.h \
events/AllNotesOffEvent.cpp \ AllNotesOffEvent.cpp \
events/ConnectionEvent.h \ ConnectionEvent.h \
events/ConnectionEvent.cpp \ ConnectionEvent.cpp \
events/DisconnectionEvent.h \ DisconnectionEvent.h \
events/DisconnectionEvent.cpp \ DisconnectionEvent.cpp \
events/DisconnectNodeEvent.h \ DisconnectNodeEvent.h \
events/DisconnectNodeEvent.cpp \ DisconnectNodeEvent.cpp \
events/DisconnectPortEvent.h \ DisconnectPortEvent.h \
events/DisconnectPortEvent.cpp \ DisconnectPortEvent.cpp \
events/DestroyEvent.h \ DestroyEvent.h \
events/DestroyEvent.cpp \ DestroyEvent.cpp \
events/AddNodeEvent.h \ AddNodeEvent.h \
events/AddNodeEvent.cpp \ AddNodeEvent.cpp \
events/SetMetadataEvent.h \ SetMetadataEvent.h \
events/SetMetadataEvent.cpp \ SetMetadataEvent.cpp \
events/RequestMetadataEvent.h \ RequestMetadataEvent.h \
events/RequestMetadataEvent.cpp \ RequestMetadataEvent.cpp \
events/RequestPluginEvent.h \ RequestPluginEvent.h \
events/RequestPluginEvent.cpp \ RequestPluginEvent.cpp \
events/RequestObjectEvent.h \ RequestObjectEvent.h \
events/RequestObjectEvent.cpp \ RequestObjectEvent.cpp \
events/RequestPortValueEvent.h \ RequestPortValueEvent.h \
events/RequestPortValueEvent.cpp \ RequestPortValueEvent.cpp \
events/RequestAllObjectsEvent.h \ RequestAllObjectsEvent.h \
events/RequestAllObjectsEvent.cpp \ RequestAllObjectsEvent.cpp \
events/RequestPluginsEvent.h \ RequestPluginsEvent.h \
events/RequestPluginsEvent.cpp \ RequestPluginsEvent.cpp \
events/CreatePatchEvent.h \ CreatePatchEvent.h \
events/CreatePatchEvent.cpp \ CreatePatchEvent.cpp \
events/LoadPluginsEvent.h \ LoadPluginsEvent.h \
events/LoadPluginsEvent.cpp \ LoadPluginsEvent.cpp \
events/EnablePatchEvent.h \ EnablePatchEvent.h \
events/EnablePatchEvent.cpp \ EnablePatchEvent.cpp \
events/DisablePatchEvent.h \ DisablePatchEvent.h \
events/DisablePatchEvent.cpp \ DisablePatchEvent.cpp \
events/ClearPatchEvent.h \ ClearPatchEvent.h \
events/ClearPatchEvent.cpp \ ClearPatchEvent.cpp \
events/RenameEvent.h \ RenameEvent.h \
events/RenameEvent.cpp \ RenameEvent.cpp \
events/MidiLearnEvent.h \ MidiLearnEvent.h \
events/MidiLearnEvent.cpp \ MidiLearnEvent.cpp \
DSSIConfigureEvent.cpp \ DSSIConfigureEvent.cpp \
DSSIConfigureEvent.h \ DSSIConfigureEvent.h \
DSSIControlEvent.cpp \ DSSIControlEvent.cpp \

13
ingen/src/libs/engine/tests/Makefile.am
View File

@ -5,23 +5,16 @@ common_ldadd = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ -lrt
node_tree_test_LDADD = $(common_ldadd) node_tree_test_LDADD = $(common_ldadd)
queue_test_LDADD = $(common_ldadd) queue_test_LDADD = $(common_ldadd)
bin_PROGRAMS = node_tree_test queue_test list_test path_test bin_PROGRAMS = node_tree_test queue_test list_test
list_test_SOURCES = \ list_test_SOURCES = \
../List.h \ ../List.h \
list_test.cpp list_test.cpp
path_test_SOURCES = \
../../common/Path.h \
path_test.cpp
node_tree_test_SOURCES = \ node_tree_test_SOURCES = \
node_tree_test.cpp \ node_tree_test.cpp
../Tree.h \
../TreeImplementation.h
queue_test_SOURCES = \ queue_test_SOURCES = \
queue_test.cpp \ queue_test.cpp
../../common/Queue.h
endif # BUILD_UNIT_TESTS endif # BUILD_UNIT_TESTS

2
ingen/src/progs/Makefile.am
View File

@ -1,6 +1,6 @@
AM_CXXFLAGS = -I$(top_srcdir)/src/common AM_CXXFLAGS = -I$(top_srcdir)/src/common
DIST_SUBDIRS = python supercollider DIST_SUBDIRS = python supercollider patch_loader ingenuity server demolition
SUBDIRS = server SUBDIRS = server

5
ingen/src/progs/ingenuity/DSSIController.cpp
View File

@ -75,6 +75,8 @@ DSSIController::show_gui()
void void
DSSIController::update_program_menu() DSSIController::update_program_menu()
{ {
cerr << "FIXME: Program menu\n";
#if 0
m_program_menu.items().clear(); m_program_menu.items().clear();
const map<int, map<int, string> >& banks = node_model()->get_programs(); const map<int, map<int, string> >& banks = node_model()->get_programs();
@ -113,13 +115,14 @@ DSSIController::update_program_menu()
m_program_menu_item->set_sensitive(true); m_program_menu_item->set_sensitive(true);
m_banks_dirty = false; m_banks_dirty = false;
#endif
} }
void void
DSSIController::send_program_change(int bank, int program) DSSIController::send_program_change(int bank, int program)
{ {
App::instance().engine()->set_program(node_model()->path(), bank, program); //App::instance().engine()->set_program(node_model()->path(), bank, program);
} }

1
ingen/src/progs/ingenuity/DSSIController.h
View File

@ -20,6 +20,7 @@
#include <string> #include <string>
#include <gtkmm.h> #include <gtkmm.h>
#include "util/Path.h" #include "util/Path.h"
#include "NodeModel.h"
using std::string; using std::string;
using namespace Ingen::Client; using namespace Ingen::Client;

5
ingen/src/progs/ingenuity/Makefile.am
View File

@ -13,7 +13,6 @@ ingenuity_DEPENDENCIES = ../../libs/client/libingenclient.la
# FIXME: make engine have a separate include dir # FIXME: make engine have a separate include dir
if MONOLITHIC_INGENUITY if MONOLITHIC_INGENUITY
ingenuity_CXXFLAGS += -I$(top_srcdir)/src/libs ingenuity_CXXFLAGS += -I$(top_srcdir)/src/libs
#ingenuity_LDADD += @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt ../../libs/engine/libingen.la
ingenuity_LDADD += ../../libs/engine/libingen.la ingenuity_LDADD += ../../libs/engine/libingen.la
ingenuity_DEPENDENCIES += ../../libs/engine/libingen.la ingenuity_DEPENDENCIES += ../../libs/engine/libingen.la
endif endif
@ -58,14 +57,14 @@ ingenuity_SOURCES = \
PatchWindow.cpp \ PatchWindow.cpp \
WindowFactory.h \ WindowFactory.h \
WindowFactory.cpp \ WindowFactory.cpp \
../../common/types.h \
../../common/Path.h \
NodeModule.h \ NodeModule.h \
NodeModule.cpp \ NodeModule.cpp \
PatchPortModule.h \ PatchPortModule.h \
PatchPortModule.cpp \ PatchPortModule.cpp \
DSSIModule.h \ DSSIModule.h \
DSSIModule.cpp \ DSSIModule.cpp \
DSSIController.h \
DSSIController.cpp \
SubpatchModule.h \ SubpatchModule.h \
SubpatchModule.cpp \ SubpatchModule.cpp \
Port.h \ Port.h \

6
ingen/src/progs/ingenuity/PatchCanvas.cpp
View File

@ -174,10 +174,8 @@ PatchCanvas::connection(CountedPtr<ConnectionModel> cm)
boost::shared_ptr<LibFlowCanvas::Port> dst = get_port(dst_parent_name, cm->dst_port_path().name()); boost::shared_ptr<LibFlowCanvas::Port> dst = get_port(dst_parent_name, cm->dst_port_path().name());
if (src && dst) { if (src && dst) {
boost::shared_ptr<Connection> c(new Connection(shared_from_this(), cm, src, dst)); add_connection(boost::shared_ptr<Connection>(
src->add_connection(c); new Connection(shared_from_this(), cm, src, dst)));
dst->add_connection(c);
add_connection(c);
} else { } else {
cerr << "[Canvas] ERROR: Unable to find ports to create connection." << endl; cerr << "[Canvas] ERROR: Unable to find ports to create connection." << endl;
} }

2
ingen/src/progs/python/Makefile.am
View File

@ -1,4 +1,4 @@
SUBDIRS = scripts SUBDIRS = scripts
EXTRA_DIST = omecho.py omsynth.py OSC.py EXTRA_DIST = ingen.py ingenecho.py OSC.py

2
ingen/src/progs/supercollider/Makefile.am
View File

@ -1,2 +1,2 @@
EXTRA_DIST = Om.sc example.sc EXTRA_DIST = Ingen.sc example.sc

1
patchage/src/Makefile.am
View File

@ -16,6 +16,7 @@ patchage_SOURCES = \
StateManager.cpp \ StateManager.cpp \
PatchageModule.h \ PatchageModule.h \
PatchagePort.h \ PatchagePort.h \
Driver.h \
JackDriver.h \ JackDriver.h \
JackDriver.cpp \ JackDriver.cpp \
AlsaDriver.h \ AlsaDriver.h \