Skip to content

Commit 8017f33

Browse files
aacuevasaacuevas
committed
Fix event triggered average build issues
1 parent 35904d4 commit 8017f33

2 files changed

Lines changed: 77 additions & 85 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
buildForAnalyzing = "YES">
132132
<BuildableReference
133133
BuildableIdentifier = "primary"
134-
BlueprintIdentifier = "038981D21FA2EFB500D25D7A"
134+
BlueprintIdentifier = "274EC0321FC30DB200242F92"
135135
BuildableName = "EvntTrigAvg.bundle"
136136
BlueprintName = "EvntTrigAvg"
137137
ReferencedContainer = "container:Plugins/EvntTrigAvg/EvntTrigAvg.xcodeproj">

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

Lines changed: 76 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,22 @@
66
objectVersion = 48;
77
objects = {
88

9-
/* Begin PBXBuildFile section */
10-
038C244D1FA389C4006EA927 /* EvntTrigAvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 038981DE1FA2F00200D25D7A /* EvntTrigAvg.cpp */; };
11-
038C244E1FA389C4006EA927 /* EvntTrigAvgCanvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 038981E31FA2F00300D25D7A /* EvntTrigAvgCanvas.cpp */; };
12-
038C244F1FA389C4006EA927 /* EvntTrigAvgEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 038981E21FA2F00200D25D7A /* EvntTrigAvgEditor.cpp */; };
13-
038C24501FA38A0F006EA927 /* OpenEphysLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 038981E11FA2F00200D25D7A /* OpenEphysLib.cpp */; };
14-
/* End PBXBuildFile section */
15-
169
/* Begin PBXFileReference section */
17-
038981D31FA2EFB500D25D7A /* EvntTrigAvg.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EvntTrigAvg.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
18-
038981D61FA2EFB500D25D7A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
19-
038981DD1FA2F00200D25D7A /* EvntTrigAvg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvg.h; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvg.h; sourceTree = "<group>"; };
20-
038981DE1FA2F00200D25D7A /* EvntTrigAvg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvg.cpp; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvg.cpp; sourceTree = "<group>"; };
21-
038981DF1FA2F00200D25D7A /* EvntTrigAvgCanvas.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvgCanvas.h; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgCanvas.h; sourceTree = "<group>"; };
22-
038981E01FA2F00200D25D7A /* EvntTrigAvgEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvgEditor.h; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgEditor.h; sourceTree = "<group>"; };
23-
038981E11FA2F00200D25D7A /* OpenEphysLib.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OpenEphysLib.cpp; path = ../../../../../../Source/Plugins/EvntTrigAvg/OpenEphysLib.cpp; sourceTree = "<group>"; };
24-
038981E21FA2F00200D25D7A /* EvntTrigAvgEditor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvgEditor.cpp; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgEditor.cpp; sourceTree = "<group>"; };
25-
038981E31FA2F00300D25D7A /* EvntTrigAvgCanvas.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvgCanvas.cpp; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgCanvas.cpp; sourceTree = "<group>"; };
26-
038981E51FA2F04100D25D7A /* Plugin_Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Release.xcconfig; path = ../../Config/Plugin_Release.xcconfig; sourceTree = "<group>"; };
27-
038981E61FA2F04100D25D7A /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Debug.xcconfig; path = ../../Config/Plugin_Debug.xcconfig; sourceTree = "<group>"; };
10+
274EC0331FC30DB200242F92 /* EvntTrigAvg.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EvntTrigAvg.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
11+
274EC0361FC30DB200242F92 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
12+
274EC04F1FC30EFE00242F92 /* EvntTrigAvgEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvgEditor.h; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgEditor.h; sourceTree = "<group>"; };
13+
274EC0501FC30EFE00242F92 /* EvntTrigAvgEditor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvgEditor.cpp; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgEditor.cpp; sourceTree = "<group>"; };
14+
274EC0511FC30EFE00242F92 /* EvntTrigAvg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvg.cpp; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvg.cpp; sourceTree = "<group>"; };
15+
274EC0521FC30EFE00242F92 /* EvntTrigAvgCanvas.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvgCanvas.cpp; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgCanvas.cpp; sourceTree = "<group>"; };
16+
274EC0531FC30EFE00242F92 /* EvntTrigAvgCanvas.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvgCanvas.h; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgCanvas.h; sourceTree = "<group>"; };
17+
274EC0541FC30EFE00242F92 /* EvntTrigAvg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvg.h; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvg.h; sourceTree = "<group>"; };
18+
274EC0551FC30EFE00242F92 /* OpenEphysLib.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OpenEphysLib.cpp; path = ../../../../../Source/Plugins/EvntTrigAvg/OpenEphysLib.cpp; sourceTree = "<group>"; };
19+
274EC0591FC3105100242F92 /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Debug.xcconfig; path = ../../Config/Plugin_Debug.xcconfig; sourceTree = "<group>"; };
20+
274EC05A1FC3105100242F92 /* Plugin_Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Release.xcconfig; path = ../../Config/Plugin_Release.xcconfig; sourceTree = "<group>"; };
2821
/* End PBXFileReference section */
2922

3023
/* Begin PBXFrameworksBuildPhase section */
31-
038981D01FA2EFB500D25D7A /* Frameworks */ = {
24+
274EC0301FC30DB200242F92 /* Frameworks */ = {
3225
isa = PBXFrameworksBuildPhase;
3326
buildActionMask = 2147483647;
3427
files = (
@@ -38,108 +31,109 @@
3831
/* End PBXFrameworksBuildPhase section */
3932

4033
/* Begin PBXGroup section */
41-
038981CA1FA2EFB500D25D7A = {
34+
274EC02A1FC30DB200242F92 = {
4235
isa = PBXGroup;
4336
children = (
44-
038981E41FA2F02500D25D7A /* Config */,
45-
038981D51FA2EFB500D25D7A /* EvntTrigAvg */,
46-
038981D41FA2EFB500D25D7A /* Products */,
37+
274EC0351FC30DB200242F92 /* EvntTrigAvg */,
38+
274EC0341FC30DB200242F92 /* Products */,
4739
);
4840
sourceTree = "<group>";
4941
};
50-
038981D41FA2EFB500D25D7A /* Products */ = {
42+
274EC0341FC30DB200242F92 /* Products */ = {
5143
isa = PBXGroup;
5244
children = (
53-
038981D31FA2EFB500D25D7A /* EvntTrigAvg.bundle */,
45+
274EC0331FC30DB200242F92 /* EvntTrigAvg.bundle */,
5446
);
5547
name = Products;
5648
sourceTree = "<group>";
5749
};
58-
038981D51FA2EFB500D25D7A /* EvntTrigAvg */ = {
50+
274EC0351FC30DB200242F92 /* EvntTrigAvg */ = {
5951
isa = PBXGroup;
6052
children = (
61-
038981DC1FA2EFDA00D25D7A /* Source */,
62-
038981D61FA2EFB500D25D7A /* Info.plist */,
53+
274EC0581FC30F5900242F92 /* Config */,
54+
274EC04C1FC30E5D00242F92 /* Source */,
55+
274EC0361FC30DB200242F92 /* Info.plist */,
6356
);
6457
path = EvntTrigAvg;
6558
sourceTree = "<group>";
6659
};
67-
038981DC1FA2EFDA00D25D7A /* Source */ = {
60+
274EC04C1FC30E5D00242F92 /* Source */ = {
6861
isa = PBXGroup;
6962
children = (
70-
038981DE1FA2F00200D25D7A /* EvntTrigAvg.cpp */,
71-
038981DD1FA2F00200D25D7A /* EvntTrigAvg.h */,
72-
038981E31FA2F00300D25D7A /* EvntTrigAvgCanvas.cpp */,
73-
038981DF1FA2F00200D25D7A /* EvntTrigAvgCanvas.h */,
74-
038981E21FA2F00200D25D7A /* EvntTrigAvgEditor.cpp */,
75-
038981E01FA2F00200D25D7A /* EvntTrigAvgEditor.h */,
76-
038981E11FA2F00200D25D7A /* OpenEphysLib.cpp */,
63+
274EC0511FC30EFE00242F92 /* EvntTrigAvg.cpp */,
64+
274EC0541FC30EFE00242F92 /* EvntTrigAvg.h */,
65+
274EC0521FC30EFE00242F92 /* EvntTrigAvgCanvas.cpp */,
66+
274EC0531FC30EFE00242F92 /* EvntTrigAvgCanvas.h */,
67+
274EC0501FC30EFE00242F92 /* EvntTrigAvgEditor.cpp */,
68+
274EC04F1FC30EFE00242F92 /* EvntTrigAvgEditor.h */,
69+
274EC0551FC30EFE00242F92 /* OpenEphysLib.cpp */,
7770
);
78-
path = Source;
71+
name = Source;
7972
sourceTree = "<group>";
8073
};
81-
038981E41FA2F02500D25D7A /* Config */ = {
74+
274EC0581FC30F5900242F92 /* Config */ = {
8275
isa = PBXGroup;
8376
children = (
84-
038981E61FA2F04100D25D7A /* Plugin_Debug.xcconfig */,
85-
038981E51FA2F04100D25D7A /* Plugin_Release.xcconfig */,
77+
274EC0591FC3105100242F92 /* Plugin_Debug.xcconfig */,
78+
274EC05A1FC3105100242F92 /* Plugin_Release.xcconfig */,
8679
);
87-
path = Config;
80+
name = Config;
8881
sourceTree = "<group>";
8982
};
9083
/* End PBXGroup section */
9184

9285
/* Begin PBXNativeTarget section */
93-
038981D21FA2EFB500D25D7A /* EvntTrigAvg */ = {
86+
274EC0321FC30DB200242F92 /* EvntTrigAvg */ = {
9487
isa = PBXNativeTarget;
95-
buildConfigurationList = 038981D91FA2EFB500D25D7A /* Build configuration list for PBXNativeTarget "EvntTrigAvg" */;
88+
buildConfigurationList = 274EC0391FC30DB200242F92 /* Build configuration list for PBXNativeTarget "EvntTrigAvg" */;
9689
buildPhases = (
97-
038981CF1FA2EFB500D25D7A /* Sources */,
98-
038981D01FA2EFB500D25D7A /* Frameworks */,
99-
038981D11FA2EFB500D25D7A /* Resources */,
90+
274EC02F1FC30DB200242F92 /* Sources */,
91+
274EC0301FC30DB200242F92 /* Frameworks */,
92+
274EC0311FC30DB200242F92 /* Resources */,
10093
);
10194
buildRules = (
10295
);
10396
dependencies = (
10497
);
10598
name = EvntTrigAvg;
10699
productName = EvntTrigAvg;
107-
productReference = 038981D31FA2EFB500D25D7A /* EvntTrigAvg.bundle */;
100+
productReference = 274EC0331FC30DB200242F92 /* EvntTrigAvg.bundle */;
108101
productType = "com.apple.product-type.bundle";
109102
};
110103
/* End PBXNativeTarget section */
111104

112105
/* Begin PBXProject section */
113-
038981CB1FA2EFB500D25D7A /* Project object */ = {
106+
274EC02B1FC30DB200242F92 /* Project object */ = {
114107
isa = PBXProject;
115108
attributes = {
116-
LastUpgradeCheck = 0900;
109+
LastUpgradeCheck = 0910;
117110
ORGANIZATIONNAME = "Open Ephys";
118111
TargetAttributes = {
119-
038981D21FA2EFB500D25D7A = {
120-
CreatedOnToolsVersion = 9.0.1;
112+
274EC0321FC30DB200242F92 = {
113+
CreatedOnToolsVersion = 9.1;
114+
ProvisioningStyle = Automatic;
121115
};
122116
};
123117
};
124-
buildConfigurationList = 038981CE1FA2EFB500D25D7A /* Build configuration list for PBXProject "EvntTrigAvg" */;
118+
buildConfigurationList = 274EC02E1FC30DB200242F92 /* Build configuration list for PBXProject "EvntTrigAvg" */;
125119
compatibilityVersion = "Xcode 8.0";
126120
developmentRegion = en;
127121
hasScannedForEncodings = 0;
128122
knownRegions = (
129123
en,
130124
);
131-
mainGroup = 038981CA1FA2EFB500D25D7A;
132-
productRefGroup = 038981D41FA2EFB500D25D7A /* Products */;
125+
mainGroup = 274EC02A1FC30DB200242F92;
126+
productRefGroup = 274EC0341FC30DB200242F92 /* Products */;
133127
projectDirPath = "";
134128
projectRoot = "";
135129
targets = (
136-
038981D21FA2EFB500D25D7A /* EvntTrigAvg */,
130+
274EC0321FC30DB200242F92 /* EvntTrigAvg */,
137131
);
138132
};
139133
/* End PBXProject section */
140134

141135
/* Begin PBXResourcesBuildPhase section */
142-
038981D11FA2EFB500D25D7A /* Resources */ = {
136+
274EC0311FC30DB200242F92 /* Resources */ = {
143137
isa = PBXResourcesBuildPhase;
144138
buildActionMask = 2147483647;
145139
files = (
@@ -149,82 +143,80 @@
149143
/* End PBXResourcesBuildPhase section */
150144

151145
/* Begin PBXSourcesBuildPhase section */
152-
038981CF1FA2EFB500D25D7A /* Sources */ = {
146+
274EC02F1FC30DB200242F92 /* Sources */ = {
153147
isa = PBXSourcesBuildPhase;
154148
buildActionMask = 2147483647;
155149
files = (
156-
038C24501FA38A0F006EA927 /* OpenEphysLib.cpp in Sources */,
157-
038C244D1FA389C4006EA927 /* EvntTrigAvg.cpp in Sources */,
158-
038C244E1FA389C4006EA927 /* EvntTrigAvgCanvas.cpp in Sources */,
159-
038C244F1FA389C4006EA927 /* EvntTrigAvgEditor.cpp in Sources */,
160150
);
161151
runOnlyForDeploymentPostprocessing = 0;
162152
};
163153
/* End PBXSourcesBuildPhase section */
164154

165155
/* Begin XCBuildConfiguration section */
166-
038981D71FA2EFB500D25D7A /* Debug */ = {
156+
274EC0371FC30DB200242F92 /* Debug */ = {
167157
isa = XCBuildConfiguration;
168-
baseConfigurationReference = 038981E61FA2F04100D25D7A /* Plugin_Debug.xcconfig */;
158+
baseConfigurationReference = 274EC0591FC3105100242F92 /* Plugin_Debug.xcconfig */;
169159
buildSettings = {
170160
};
171161
name = Debug;
172162
};
173-
038981D81FA2EFB500D25D7A /* Release */ = {
163+
274EC0381FC30DB200242F92 /* Release */ = {
174164
isa = XCBuildConfiguration;
175-
baseConfigurationReference = 038981E51FA2F04100D25D7A /* Plugin_Release.xcconfig */;
165+
baseConfigurationReference = 274EC05A1FC3105100242F92 /* Plugin_Release.xcconfig */;
176166
buildSettings = {
177167
};
178168
name = Release;
179169
};
180-
038981DA1FA2EFB500D25D7A /* Debug */ = {
170+
274EC03A1FC30DB200242F92 /* Debug */ = {
181171
isa = XCBuildConfiguration;
182172
buildSettings = {
173+
CODE_SIGN_STYLE = Automatic;
174+
COMBINE_HIDPI_IMAGES = YES;
183175
INFOPLIST_FILE = EvntTrigAvg/Info.plist;
184-
PRODUCT_BUNDLE_IDENTIFIER = "open-ephys.EvntTrigAvg";
176+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
177+
PRODUCT_BUNDLE_IDENTIFIER = com.openephys.EvntTrigAvg;
185178
PRODUCT_NAME = "$(TARGET_NAME)";
179+
SKIP_INSTALL = YES;
180+
WRAPPER_EXTENSION = bundle;
186181
};
187182
name = Debug;
188183
};
189-
038981DB1FA2EFB500D25D7A /* Release */ = {
184+
274EC03B1FC30DB200242F92 /* Release */ = {
190185
isa = XCBuildConfiguration;
191186
buildSettings = {
192-
HEADER_SEARCH_PATHS = (
193-
../../../../JuceLibraryCode,
194-
../../../../JuceLibraryCode/modules,
195-
../../../../Source/Plugins/Headers,
196-
../../../../Source/Plugins/CommonLibs,
197-
"$(MAC_PACKAGE_DIR)/include",
198-
"$(inherited)",
199-
);
187+
CODE_SIGN_STYLE = Automatic;
188+
COMBINE_HIDPI_IMAGES = YES;
200189
INFOPLIST_FILE = EvntTrigAvg/Info.plist;
201-
PRODUCT_BUNDLE_IDENTIFIER = "open-ephys.EvntTrigAvg";
190+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
191+
PRODUCT_BUNDLE_IDENTIFIER = com.openephys.EvntTrigAvg;
202192
PRODUCT_NAME = "$(TARGET_NAME)";
193+
SKIP_INSTALL = YES;
194+
WRAPPER_EXTENSION = bundle;
203195
};
204196
name = Release;
205197
};
206198
/* End XCBuildConfiguration section */
207199

208200
/* Begin XCConfigurationList section */
209-
038981CE1FA2EFB500D25D7A /* Build configuration list for PBXProject "EvntTrigAvg" */ = {
201+
274EC02E1FC30DB200242F92 /* Build configuration list for PBXProject "EvntTrigAvg" */ = {
210202
isa = XCConfigurationList;
211203
buildConfigurations = (
212-
038981D71FA2EFB500D25D7A /* Debug */,
213-
038981D81FA2EFB500D25D7A /* Release */,
204+
274EC0371FC30DB200242F92 /* Debug */,
205+
274EC0381FC30DB200242F92 /* Release */,
214206
);
215207
defaultConfigurationIsVisible = 0;
216208
defaultConfigurationName = Release;
217209
};
218-
038981D91FA2EFB500D25D7A /* Build configuration list for PBXNativeTarget "EvntTrigAvg" */ = {
210+
274EC0391FC30DB200242F92 /* Build configuration list for PBXNativeTarget "EvntTrigAvg" */ = {
219211
isa = XCConfigurationList;
220212
buildConfigurations = (
221-
038981DA1FA2EFB500D25D7A /* Debug */,
222-
038981DB1FA2EFB500D25D7A /* Release */,
213+
274EC03A1FC30DB200242F92 /* Debug */,
214+
274EC03B1FC30DB200242F92 /* Release */,
223215
);
224216
defaultConfigurationIsVisible = 0;
225217
defaultConfigurationName = Release;
226218
};
227219
/* End XCConfigurationList section */
228220
};
229-
rootObject = 038981CB1FA2EFB500D25D7A /* Project object */;
221+
rootObject = 274EC02B1FC30DB200242F92 /* Project object */;
230222
}

0 commit comments

Comments
 (0)