Skip to content

Commit bf6fdbb

Browse files
aacuevasaacuevas
committed
Merge branch 'development' into dsp-common
2 parents dfea4ba + aa8125f commit bf6fdbb

6 files changed

Lines changed: 318 additions & 0 deletions

File tree

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

Lines changed: 3 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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,20 @@
319319
ReferencedContainer = "container:Plugins/SpikeSorter/SpikeSorter.xcodeproj">
320320
</BuildableReference>
321321
</BuildActionEntry>
322+
<BuildActionEntry
323+
buildForTesting = "YES"
324+
buildForRunning = "YES"
325+
buildForProfiling = "YES"
326+
buildForArchiving = "YES"
327+
buildForAnalyzing = "YES">
328+
<BuildableReference
329+
BuildableIdentifier = "primary"
330+
BlueprintIdentifier = "2749684C2003F902008E0E8D"
331+
BuildableName = "RhythmNode.bundle"
332+
BlueprintName = "RhythmNode"
333+
ReferencedContainer = "container:Plugins/RhythmNode/RhythmNode.xcodeproj">
334+
</BuildableReference>
335+
</BuildActionEntry>
322336
</BuildActionEntries>
323337
</BuildAction>
324338
<TestAction

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/* End PBXBuildFile section */
1414

1515
/* Begin PBXFileReference section */
16+
2749688D2003FFD5008E0E8D /* libokFrontPanel.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libokFrontPanel.dylib; path = ../../../../Resources/DLLs/libokFrontPanel.dylib; sourceTree = "<group>"; };
1617
E1C3F9781C99A20D00719A9F /* EventBroadcaster.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EventBroadcaster.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
1718
E1C3F97B1C99A20D00719A9F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1819
E1F557C31C9B020A0035F88B /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Plugin_Debug.xcconfig; sourceTree = "<group>"; };
@@ -35,12 +36,21 @@
3536
/* End PBXFrameworksBuildPhase section */
3637

3738
/* Begin PBXGroup section */
39+
2749688C2003FFD5008E0E8D /* Frameworks */ = {
40+
isa = PBXGroup;
41+
children = (
42+
2749688D2003FFD5008E0E8D /* libokFrontPanel.dylib */,
43+
);
44+
name = Frameworks;
45+
sourceTree = "<group>";
46+
};
3847
E1C3F96F1C99A20D00719A9F = {
3948
isa = PBXGroup;
4049
children = (
4150
E1F557C11C9B020A0035F88B /* Config */,
4251
E1C3F97A1C99A20D00719A9F /* EventBroadcaster */,
4352
E1C3F9791C99A20D00719A9F /* Products */,
53+
2749688C2003FFD5008E0E8D /* Frameworks */,
4454
);
4555
sourceTree = "<group>";
4656
};

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

Lines changed: 265 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,265 @@
1+
// !$*UTF8*$!
2+
{
3+
archiveVersion = 1;
4+
classes = {
5+
};
6+
objectVersion = 48;
7+
objects = {
8+
9+
/* Begin PBXBuildFile section */
10+
2785925B2004111A007FD314 /* RHD2000Thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2785925820041119007FD314 /* RHD2000Thread.cpp */; };
11+
2785925C2004111A007FD314 /* RHD2000Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2785925920041119007FD314 /* RHD2000Editor.cpp */; };
12+
2785925D2004111A007FD314 /* OpenEphysLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2785925A2004111A007FD314 /* OpenEphysLib.cpp */; };
13+
278592662004114A007FD314 /* rhd2000evalboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2785925F2004114A007FD314 /* rhd2000evalboard.cpp */; };
14+
278592672004114A007FD314 /* rhd2000datablock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 278592632004114A007FD314 /* rhd2000datablock.cpp */; };
15+
278592682004114A007FD314 /* rhd2000registers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 278592652004114A007FD314 /* rhd2000registers.cpp */; };
16+
2785926A200411BD007FD314 /* libokFrontPanel.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2785925420040EF2007FD314 /* libokFrontPanel.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
17+
2785926C200414B9007FD314 /* libokFrontPanel.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2785925420040EF2007FD314 /* libokFrontPanel.dylib */; };
18+
/* End PBXBuildFile section */
19+
20+
/* Begin PBXCopyFilesBuildPhase section */
21+
27859269200411B0007FD314 /* CopyFiles */ = {
22+
isa = PBXCopyFilesBuildPhase;
23+
buildActionMask = 2147483647;
24+
dstPath = "";
25+
dstSubfolderSpec = 10;
26+
files = (
27+
2785926A200411BD007FD314 /* libokFrontPanel.dylib in CopyFiles */,
28+
);
29+
runOnlyForDeploymentPostprocessing = 0;
30+
};
31+
/* End PBXCopyFilesBuildPhase section */
32+
33+
/* Begin PBXFileReference section */
34+
2749684D2003F902008E0E8D /* RhythmNode.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RhythmNode.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
35+
274968502003F902008E0E8D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
36+
2749687D2003FA38008E0E8D /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Debug.xcconfig; path = ../../Config/Plugin_Debug.xcconfig; sourceTree = "<group>"; };
37+
2749687E2003FA38008E0E8D /* Plugin_Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Release.xcconfig; path = ../../Config/Plugin_Release.xcconfig; sourceTree = "<group>"; };
38+
2785925420040EF2007FD314 /* libokFrontPanel.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libokFrontPanel.dylib; path = ../../../../../Resources/DLLs/libokFrontPanel.dylib; sourceTree = "<group>"; };
39+
2785925620041119007FD314 /* RHD2000Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RHD2000Editor.h; path = ../../../../../Source/Plugins/RhythmNode/RHD2000Editor.h; sourceTree = "<group>"; };
40+
2785925720041119007FD314 /* RHD2000Thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RHD2000Thread.h; path = ../../../../../Source/Plugins/RhythmNode/RHD2000Thread.h; sourceTree = "<group>"; };
41+
2785925820041119007FD314 /* RHD2000Thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RHD2000Thread.cpp; path = ../../../../../Source/Plugins/RhythmNode/RHD2000Thread.cpp; sourceTree = "<group>"; };
42+
2785925920041119007FD314 /* RHD2000Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RHD2000Editor.cpp; path = ../../../../../Source/Plugins/RhythmNode/RHD2000Editor.cpp; sourceTree = "<group>"; };
43+
2785925A2004111A007FD314 /* OpenEphysLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OpenEphysLib.cpp; path = ../../../../../Source/Plugins/RhythmNode/OpenEphysLib.cpp; sourceTree = "<group>"; };
44+
2785925F2004114A007FD314 /* rhd2000evalboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rhd2000evalboard.cpp; path = "../../../../../../Source/Plugins/RhythmNode/rhythm-api/rhd2000evalboard.cpp"; sourceTree = "<group>"; };
45+
278592602004114A007FD314 /* rhd2000evalboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhd2000evalboard.h; path = "../../../../../../Source/Plugins/RhythmNode/rhythm-api/rhd2000evalboard.h"; sourceTree = "<group>"; };
46+
278592612004114A007FD314 /* rhd2000datablock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhd2000datablock.h; path = "../../../../../../Source/Plugins/RhythmNode/rhythm-api/rhd2000datablock.h"; sourceTree = "<group>"; };
47+
278592622004114A007FD314 /* rhd2000registers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhd2000registers.h; path = "../../../../../../Source/Plugins/RhythmNode/rhythm-api/rhd2000registers.h"; sourceTree = "<group>"; };
48+
278592632004114A007FD314 /* rhd2000datablock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rhd2000datablock.cpp; path = "../../../../../../Source/Plugins/RhythmNode/rhythm-api/rhd2000datablock.cpp"; sourceTree = "<group>"; };
49+
278592642004114A007FD314 /* okFrontPanelDLL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = okFrontPanelDLL.h; path = "../../../../../../Source/Plugins/RhythmNode/rhythm-api/okFrontPanelDLL.h"; sourceTree = "<group>"; };
50+
278592652004114A007FD314 /* rhd2000registers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rhd2000registers.cpp; path = "../../../../../../Source/Plugins/RhythmNode/rhythm-api/rhd2000registers.cpp"; sourceTree = "<group>"; };
51+
/* End PBXFileReference section */
52+
53+
/* Begin PBXFrameworksBuildPhase section */
54+
2749684A2003F902008E0E8D /* Frameworks */ = {
55+
isa = PBXFrameworksBuildPhase;
56+
buildActionMask = 2147483647;
57+
files = (
58+
2785926C200414B9007FD314 /* libokFrontPanel.dylib in Frameworks */,
59+
);
60+
runOnlyForDeploymentPostprocessing = 0;
61+
};
62+
/* End PBXFrameworksBuildPhase section */
63+
64+
/* Begin PBXGroup section */
65+
274968442003F901008E0E8D = {
66+
isa = PBXGroup;
67+
children = (
68+
2785925320040ED3007FD314 /* Frameworks */,
69+
2749687C2003F9D9008E0E8D /* Config */,
70+
2749684F2003F902008E0E8D /* RhythmNode */,
71+
2749684E2003F902008E0E8D /* Products */,
72+
);
73+
sourceTree = "<group>";
74+
};
75+
2749684E2003F902008E0E8D /* Products */ = {
76+
isa = PBXGroup;
77+
children = (
78+
2749684D2003F902008E0E8D /* RhythmNode.bundle */,
79+
);
80+
name = Products;
81+
sourceTree = "<group>";
82+
};
83+
2749684F2003F902008E0E8D /* RhythmNode */ = {
84+
isa = PBXGroup;
85+
children = (
86+
2785925E20041120007FD314 /* rhythm-api */,
87+
2785925A2004111A007FD314 /* OpenEphysLib.cpp */,
88+
2785925920041119007FD314 /* RHD2000Editor.cpp */,
89+
2785925620041119007FD314 /* RHD2000Editor.h */,
90+
2785925820041119007FD314 /* RHD2000Thread.cpp */,
91+
2785925720041119007FD314 /* RHD2000Thread.h */,
92+
274968502003F902008E0E8D /* Info.plist */,
93+
);
94+
path = RhythmNode;
95+
sourceTree = "<group>";
96+
};
97+
2749687C2003F9D9008E0E8D /* Config */ = {
98+
isa = PBXGroup;
99+
children = (
100+
2749687D2003FA38008E0E8D /* Plugin_Debug.xcconfig */,
101+
2749687E2003FA38008E0E8D /* Plugin_Release.xcconfig */,
102+
);
103+
path = Config;
104+
sourceTree = "<group>";
105+
};
106+
2785925320040ED3007FD314 /* Frameworks */ = {
107+
isa = PBXGroup;
108+
children = (
109+
2785925420040EF2007FD314 /* libokFrontPanel.dylib */,
110+
);
111+
path = Frameworks;
112+
sourceTree = "<group>";
113+
};
114+
2785925E20041120007FD314 /* rhythm-api */ = {
115+
isa = PBXGroup;
116+
children = (
117+
278592642004114A007FD314 /* okFrontPanelDLL.h */,
118+
278592632004114A007FD314 /* rhd2000datablock.cpp */,
119+
278592612004114A007FD314 /* rhd2000datablock.h */,
120+
2785925F2004114A007FD314 /* rhd2000evalboard.cpp */,
121+
278592602004114A007FD314 /* rhd2000evalboard.h */,
122+
278592652004114A007FD314 /* rhd2000registers.cpp */,
123+
278592622004114A007FD314 /* rhd2000registers.h */,
124+
);
125+
path = "rhythm-api";
126+
sourceTree = "<group>";
127+
};
128+
/* End PBXGroup section */
129+
130+
/* Begin PBXNativeTarget section */
131+
2749684C2003F902008E0E8D /* RhythmNode */ = {
132+
isa = PBXNativeTarget;
133+
buildConfigurationList = 274968532003F902008E0E8D /* Build configuration list for PBXNativeTarget "RhythmNode" */;
134+
buildPhases = (
135+
27859269200411B0007FD314 /* CopyFiles */,
136+
274968492003F902008E0E8D /* Sources */,
137+
2749684A2003F902008E0E8D /* Frameworks */,
138+
2749684B2003F902008E0E8D /* Resources */,
139+
);
140+
buildRules = (
141+
);
142+
dependencies = (
143+
);
144+
name = RhythmNode;
145+
productName = RhythmNode;
146+
productReference = 2749684D2003F902008E0E8D /* RhythmNode.bundle */;
147+
productType = "com.apple.product-type.bundle";
148+
};
149+
/* End PBXNativeTarget section */
150+
151+
/* Begin PBXProject section */
152+
274968452003F901008E0E8D /* Project object */ = {
153+
isa = PBXProject;
154+
attributes = {
155+
LastUpgradeCheck = 0920;
156+
ORGANIZATIONNAME = "Open Ephys";
157+
TargetAttributes = {
158+
2749684C2003F902008E0E8D = {
159+
CreatedOnToolsVersion = 9.2;
160+
};
161+
};
162+
};
163+
buildConfigurationList = 274968482003F902008E0E8D /* Build configuration list for PBXProject "RhythmNode" */;
164+
compatibilityVersion = "Xcode 8.0";
165+
developmentRegion = en;
166+
hasScannedForEncodings = 0;
167+
knownRegions = (
168+
en,
169+
);
170+
mainGroup = 274968442003F901008E0E8D;
171+
productRefGroup = 2749684E2003F902008E0E8D /* Products */;
172+
projectDirPath = "";
173+
projectRoot = "";
174+
targets = (
175+
2749684C2003F902008E0E8D /* RhythmNode */,
176+
);
177+
};
178+
/* End PBXProject section */
179+
180+
/* Begin PBXResourcesBuildPhase section */
181+
2749684B2003F902008E0E8D /* Resources */ = {
182+
isa = PBXResourcesBuildPhase;
183+
buildActionMask = 2147483647;
184+
files = (
185+
);
186+
runOnlyForDeploymentPostprocessing = 0;
187+
};
188+
/* End PBXResourcesBuildPhase section */
189+
190+
/* Begin PBXSourcesBuildPhase section */
191+
274968492003F902008E0E8D /* Sources */ = {
192+
isa = PBXSourcesBuildPhase;
193+
buildActionMask = 2147483647;
194+
files = (
195+
2785925D2004111A007FD314 /* OpenEphysLib.cpp in Sources */,
196+
278592662004114A007FD314 /* rhd2000evalboard.cpp in Sources */,
197+
2785925B2004111A007FD314 /* RHD2000Thread.cpp in Sources */,
198+
2785925C2004111A007FD314 /* RHD2000Editor.cpp in Sources */,
199+
278592672004114A007FD314 /* rhd2000datablock.cpp in Sources */,
200+
278592682004114A007FD314 /* rhd2000registers.cpp in Sources */,
201+
);
202+
runOnlyForDeploymentPostprocessing = 0;
203+
};
204+
/* End PBXSourcesBuildPhase section */
205+
206+
/* Begin XCBuildConfiguration section */
207+
274968512003F902008E0E8D /* Debug */ = {
208+
isa = XCBuildConfiguration;
209+
baseConfigurationReference = 2749687D2003FA38008E0E8D /* Plugin_Debug.xcconfig */;
210+
buildSettings = {
211+
};
212+
name = Debug;
213+
};
214+
274968522003F902008E0E8D /* Release */ = {
215+
isa = XCBuildConfiguration;
216+
baseConfigurationReference = 2749687E2003FA38008E0E8D /* Plugin_Release.xcconfig */;
217+
buildSettings = {
218+
};
219+
name = Release;
220+
};
221+
274968542003F902008E0E8D /* Debug */ = {
222+
isa = XCBuildConfiguration;
223+
buildSettings = {
224+
INFOPLIST_FILE = RhythmNode/Info.plist;
225+
LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/RhythmNode.bundle/Contents/Frameworks";
226+
PRODUCT_BUNDLE_IDENTIFIER = com.openephys.RhythmNode;
227+
PRODUCT_NAME = "$(TARGET_NAME)";
228+
};
229+
name = Debug;
230+
};
231+
274968552003F902008E0E8D /* Release */ = {
232+
isa = XCBuildConfiguration;
233+
buildSettings = {
234+
INFOPLIST_FILE = RhythmNode/Info.plist;
235+
LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/RhythmNode.bundle/Contents/Frameworks";
236+
PRODUCT_BUNDLE_IDENTIFIER = com.openephys.RhythmNode;
237+
PRODUCT_NAME = "$(TARGET_NAME)";
238+
};
239+
name = Release;
240+
};
241+
/* End XCBuildConfiguration section */
242+
243+
/* Begin XCConfigurationList section */
244+
274968482003F902008E0E8D /* Build configuration list for PBXProject "RhythmNode" */ = {
245+
isa = XCConfigurationList;
246+
buildConfigurations = (
247+
274968512003F902008E0E8D /* Debug */,
248+
274968522003F902008E0E8D /* Release */,
249+
);
250+
defaultConfigurationIsVisible = 0;
251+
defaultConfigurationName = Release;
252+
};
253+
274968532003F902008E0E8D /* Build configuration list for PBXNativeTarget "RhythmNode" */ = {
254+
isa = XCConfigurationList;
255+
buildConfigurations = (
256+
274968542003F902008E0E8D /* Debug */,
257+
274968552003F902008E0E8D /* Release */,
258+
);
259+
defaultConfigurationIsVisible = 0;
260+
defaultConfigurationName = Release;
261+
};
262+
/* End XCConfigurationList section */
263+
};
264+
rootObject = 274968452003F901008E0E8D /* Project object */;
265+
}

‎Builds/MacOSX/Plugins/RhythmNode/RhythmNode/Info.plist‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>1</string>
21+
<key>NSHumanReadableCopyright</key>
22+
<string>Copyright © 2018 Open Ephys. All rights reserved.</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

‎Resources/DLLs/libokFrontPanel.dylib‎

-117 KB
Binary file not shown.

0 commit comments

Comments
 (0)