Skip to content

Commit debaa7b

Browse files
aacuevasaacuevas
committed
Merge remote-tracking branch 'personal/NWB' into newChannelObjects
2 parents 2fe19ec + 71d995b commit debaa7b

78 files changed

Lines changed: 1405 additions & 200 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/*.pbxuser
118118
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/xcuserdata
119119
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.xcworkspace
120120
Introjucer/Builds/MacOSX/build
121+
Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
122+
Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace
121123

122124
# 9. Plugin build dirs
123125
build/

‎Builds/Linux/Makefile.plugins‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
66

77
PLUGIN_DIR := ../../Source/Plugins
8+
COMMON_DIR := ../../Source/Plugins/CommonLibs
89

910
ifndef CONFIG
1011
CONFIG=Debug
1112
endif
1213

1314
ifeq ($(CONFIG),Debug)
14-
BINDIR := $(CURDIR)/build/intermediate/Debug
15+
BINDIR := $(CURDIR)/build
1516
LIBDIR := $(CURDIR)/build/intermediate/Debug
1617
OBJDIR := $(CURDIR)/build/intermediate/plugins/Debug
1718
OUTDIR := $(CURDIR)/build/plugins
@@ -20,50 +21,59 @@ ifeq ($(CONFIG),Debug)
2021
TARGET_ARCH := -march=native
2122
endif
2223

23-
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "OEPLUGIN" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
24+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
2425
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -std=c++11 -fPIC -rdynamic
2526
CXXFLAGS += $(CFLAGS)
2627
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic
2728
LDDEPS :=
28-
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "OEPLUGIN" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
29+
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
2930

30-
CLEANCMD = rm -rf $(OUTDIR)/* $(OBJDIR)
31+
CLEANCMD = rm -rf $(OUTDIR)/* $(OBJDIR) $(BINDIR)/$(addsuffix .so,$(notdir $(COMMONDIRS)))
3132
endif
3233

3334
ifeq ($(CONFIG),Release)
3435
BINDIR := $(CURDIR)/build
35-
LIBDIR := $(CURDIR)/build
36+
LIBDIR := $(CURDIR)/build/intermediate/Release
3637
OBJDIR := $(CURDIR)/build/intermediate/plugins/Release
3738
OUTDIR := $(CURDIR)/build/plugins
3839

3940
ifeq ($(TARGET_ARCH),)
4041
TARGET_ARCH := -march=native
4142
endif
4243

43-
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "OEPLUGIN" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
44+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
4445
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 -fPIC -rdynamic
4546
CXXFLAGS += $(CFLAGS)
4647
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic
4748
LDDEPS1 :=
48-
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "OEPLUGIN" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
49+
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
4950

50-
CLEANCMD = rm -rf $(OUTDIR)/* $(OBJDIR)
51+
CLEANCMD = rm -rf $(OUTDIR)/* $(OBJDIR) $(BINDIR)/$(addsuffix .so,$(notdir $(COMMONDIRS)))
5152
endif
5253

54+
LIB_PREFIX :=
55+
5356
export
5457

5558
SUBDIRS := $(wildcard $(PLUGIN_DIR)/*)
59+
COMMONDIRS := $(wildcard $(COMMON_DIR)/*)
60+
61+
.PHONY: clean all notify $(SUBDIRS) $(notdir $(SUBDIRS)) clean/$(notdir $(SUBDIRS)) libs $(COMMONDIRS)
5662

57-
.PHONY: clean all notify $(SUBDIRS)
63+
all: notify libs $(SUBDIRS)
5864

59-
all: notify $(SUBDIRS)
65+
libs: $(COMMONDIRS)
6066

6167
notify:
6268
@echo "Building Open-Ephys Plugins"
6369

6470
PLUGINNAME=$(shell echo $@ | rev | cut -d'/' -f-1 | rev)
6571

66-
$(SUBDIRS):
72+
# if there are a .jucer file in the plugin folder - try to find Makefile in the Source/ folder
73+
$(SUBDIRS): CXXFLAGS += -D "OEPLUGIN" -I $(CURDIR)/../../Source/Plugins/CommonLibs
74+
$(COMMONDIRS): OUTDIR := $(BINDIR)
75+
$(COMMONDIRS): LIB_PREFIX := lib
76+
$(SUBDIRS) $(COMMONDIRS):
6777
@if [ -f $@/*.jucer ] && ([ -f $@/Source/Makefile ]); then \
6878
echo "Found jucer project for" $(PLUGINNAME) "..."; \
6979
$(MAKE) -C $@/Source clean ; \
@@ -72,20 +82,18 @@ $(SUBDIRS):
7282
$(MAKE) -C $@ ; fi \
7383
fi
7484

75-
# if there are a .jucer file in the plugin folder - try to find Makefile in the Source/ folder
76-
%::
77-
@if [ -f $(PLUGIN_DIR)/$@/*.jucer ] && ([ -f $(PLUGIN_DIR)/$@/Source/Makefile ]); then \
78-
echo "Found jucer project for" $(PLUGINNAME) "..."; \
79-
$(MAKE) -C $(PLUGIN_DIR)/$@/Source clean ; \
80-
$(MAKE) -C $(PLUGIN_DIR)/$@/Source TARGET:=$@.so; \
81-
else if [ -f $(PLUGIN_DIR)/$@/Makefile ]; then \
82-
$(MAKE) -C $(PLUGIN_DIR)/$@ clean ; \
83-
$(MAKE) -C $(PLUGIN_DIR)/$@ ; fi \
84-
fi
85+
86+
.SECONDEXPANSION:
87+
$(notdir $(SUBDIRS)): $$(PLUGIN_DIR)/$$@
8588

8689
clean:
8790
@echo Cleaning open-ephys plugins
8891
@$(CLEANCMD)
8992

93+
$(addprefix clean/,$(notdir $(SUBDIRS))):
94+
@echo Cleaning $(notdir $@)
95+
$(MAKE) -C $(PLUGIN_DIR)/$(notdir $@) clean
96+
97+
9098
#plugin name from $SUBDIRS goal
9199
#$@ | rev | cut -d'/' -f-1 | rev; \

‎Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Builds/MacOSX/OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme‎

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "609761DEC9151D2CDD50270C"
17+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
1818
BuildableName = "open-ephys.app"
19-
BlueprintName = "open-ephys"
19+
BlueprintName = "open-ephys (App)"
2020
ReferencedContainer = "container:open-ephys.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -48,6 +48,20 @@
4848
ReferencedContainer = "container:Plugins/BasicSpikeDisplay/BasicSpikeDisplay.xcodeproj">
4949
</BuildableReference>
5050
</BuildActionEntry>
51+
<BuildActionEntry
52+
buildForTesting = "YES"
53+
buildForRunning = "YES"
54+
buildForProfiling = "YES"
55+
buildForArchiving = "YES"
56+
buildForAnalyzing = "YES">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "E1D300271DAEBBBD0050E0F8"
60+
BuildableName = "BinaryWriter.bundle"
61+
BlueprintName = "BinaryWriter"
62+
ReferencedContainer = "container:Plugins/BinaryWriter/BinaryWriter.xcodeproj">
63+
</BuildableReference>
64+
</BuildActionEntry>
5165
<BuildActionEntry
5266
buildForTesting = "YES"
5367
buildForRunning = "YES"
@@ -104,6 +118,20 @@
104118
ReferencedContainer = "container:Plugins/FilterNode/FilterNode.xcodeproj">
105119
</BuildableReference>
106120
</BuildActionEntry>
121+
<BuildActionEntry
122+
buildForTesting = "YES"
123+
buildForRunning = "YES"
124+
buildForProfiling = "YES"
125+
buildForArchiving = "YES"
126+
buildForAnalyzing = "YES">
127+
<BuildableReference
128+
BuildableIdentifier = "primary"
129+
BlueprintIdentifier = "E14A22111DA80A9700134197"
130+
BuildableName = "JuliaProcessor.bundle"
131+
BlueprintName = "JuliaProcessor"
132+
ReferencedContainer = "container:Plugins/JuliaProcessor/JuliaProcessor.xcodeproj">
133+
</BuildableReference>
134+
</BuildActionEntry>
107135
<BuildActionEntry
108136
buildForTesting = "YES"
109137
buildForRunning = "YES"
@@ -160,6 +188,20 @@
160188
ReferencedContainer = "container:Plugins/NetworkEvents/NetworkEvents.xcodeproj">
161189
</BuildableReference>
162190
</BuildActionEntry>
191+
<BuildActionEntry
192+
buildForTesting = "YES"
193+
buildForRunning = "YES"
194+
buildForProfiling = "YES"
195+
buildForArchiving = "YES"
196+
buildForAnalyzing = "YES">
197+
<BuildableReference
198+
BuildableIdentifier = "primary"
199+
BlueprintIdentifier = "E1F91DE31DBE670500FF13EA"
200+
BuildableName = "NWBFormat.bundle"
201+
BlueprintName = "NWBFormat"
202+
ReferencedContainer = "container:Plugins/NWBFormat/NWBFormat.xcodeproj">
203+
</BuildableReference>
204+
</BuildActionEntry>
163205
<BuildActionEntry
164206
buildForTesting = "YES"
165207
buildForRunning = "YES"
@@ -270,9 +312,9 @@
270312
<MacroExpansion>
271313
<BuildableReference
272314
BuildableIdentifier = "primary"
273-
BlueprintIdentifier = "609761DEC9151D2CDD50270C"
315+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
274316
BuildableName = "open-ephys.app"
275-
BlueprintName = "open-ephys"
317+
BlueprintName = "open-ephys (App)"
276318
ReferencedContainer = "container:open-ephys.xcodeproj">
277319
</BuildableReference>
278320
</MacroExpansion>
@@ -293,9 +335,9 @@
293335
runnableDebuggingMode = "0">
294336
<BuildableReference
295337
BuildableIdentifier = "primary"
296-
BlueprintIdentifier = "609761DEC9151D2CDD50270C"
338+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
297339
BuildableName = "open-ephys.app"
298-
BlueprintName = "open-ephys"
340+
BlueprintName = "open-ephys (App)"
299341
ReferencedContainer = "container:open-ephys.xcodeproj">
300342
</BuildableReference>
301343
</BuildableProductRunnable>
@@ -311,9 +353,9 @@
311353
<MacroExpansion>
312354
<BuildableReference
313355
BuildableIdentifier = "primary"
314-
BlueprintIdentifier = "609761DEC9151D2CDD50270C"
356+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
315357
BuildableName = "open-ephys.app"
316-
BlueprintName = "open-ephys"
358+
BlueprintName = "open-ephys (App)"
317359
ReferencedContainer = "container:open-ephys.xcodeproj">
318360
</BuildableReference>
319361
</MacroExpansion>

‎Builds/MacOSX/Plugins/ArduinoOutput/ArduinoOutput.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
/* Begin PBXFileReference section */
1717
E1F557B21C9AF1660035F88B /* ArduinoOutput.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ArduinoOutput.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
1818
E1F557B51C9AF1660035F88B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
19-
E1F557BE1C9AFE210035F88B /* Plugin.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Plugin.xcconfig; sourceTree = "<group>"; };
2019
E1F557BF1C9AFE210035F88B /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Plugin_Debug.xcconfig; sourceTree = "<group>"; };
2120
E1F557C01C9AFE210035F88B /* Plugin_Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Plugin_Release.xcconfig; sourceTree = "<group>"; };
2221
E1F557C61C9B040E0035F88B /* ArduinoOutput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArduinoOutput.cpp; sourceTree = "<group>"; };
@@ -68,7 +67,6 @@
6867
E1F557BD1C9AFE210035F88B /* Config */ = {
6968
isa = PBXGroup;
7069
children = (
71-
E1F557BE1C9AFE210035F88B /* Plugin.xcconfig */,
7270
E1F557BF1C9AFE210035F88B /* Plugin_Debug.xcconfig */,
7371
E1F557C01C9AFE210035F88B /* Plugin_Release.xcconfig */,
7472
);

‎Builds/MacOSX/Plugins/BasicSpikeDisplay/BasicSpikeDisplay.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
/* Begin PBXFileReference section */
1919
E1F557E81C9B0C600035F88B /* BasicSpikeDisplay.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BasicSpikeDisplay.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
2020
E1F557EB1C9B0C600035F88B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
21-
E1F557F21C9B0CA90035F88B /* Plugin.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Plugin.xcconfig; sourceTree = "<group>"; };
2221
E1F557F31C9B0CA90035F88B /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Plugin_Debug.xcconfig; sourceTree = "<group>"; };
2322
E1F557F41C9B0CA90035F88B /* Plugin_Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Plugin_Release.xcconfig; sourceTree = "<group>"; };
2423
E1F557F71C9B0DAC0035F88B /* OpenEphysLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpenEphysLib.cpp; sourceTree = "<group>"; };
@@ -74,7 +73,6 @@
7473
E1F557F11C9B0CA90035F88B /* Config */ = {
7574
isa = PBXGroup;
7675
children = (
77-
E1F557F21C9B0CA90035F88B /* Plugin.xcconfig */,
7876
E1F557F31C9B0CA90035F88B /* Plugin_Debug.xcconfig */,
7977
E1F557F41C9B0CA90035F88B /* Plugin_Release.xcconfig */,
8078
);

0 commit comments

Comments
 (0)