From 3bd4e1e9035b451869feeebf351a430a1cce5462 Mon Sep 17 00:00:00 2001 From: "smparkes@smparkes.net" Date: Tue, 11 Oct 2011 19:46:52 +0000 Subject: [PATCH] trying to cleanup/stabalize the xcode settings, remove a few deprectations, and plug some small leaks git-svn-id: https://zxing.googlecode.com/svn/trunk@1957 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- iphone/Barcodes/.gitignore | 1 + iphone/Barcodes/Barcodes-Info.plist | 8 +- .../Barcodes.xcodeproj/project.pbxproj | 73 +++++++++++++----- iphone/Barcodes/Classes/ArchiveController.m | 2 +- iphone/Barcodes/Classes/ScanViewController.m | 12 ++- .../Barcodes/Classes/ZXMainViewController.mm | 7 +- iphone/ScanTest/Icon.png | Bin 0 -> 3713 bytes .../ScanTest.xcodeproj/project.pbxproj | 14 +++- .../Classes/ZXingWidgetController.m | 3 +- .../ZXingWidget.xcodeproj/project.pbxproj | 2 + 10 files changed, 82 insertions(+), 40 deletions(-) create mode 100644 iphone/Barcodes/.gitignore create mode 100644 iphone/ScanTest/Icon.png diff --git a/iphone/Barcodes/.gitignore b/iphone/Barcodes/.gitignore new file mode 100644 index 000000000..4f405ccc6 --- /dev/null +++ b/iphone/Barcodes/.gitignore @@ -0,0 +1 @@ +xcuserdata \ No newline at end of file diff --git a/iphone/Barcodes/Barcodes-Info.plist b/iphone/Barcodes/Barcodes-Info.plist index 02bda47bf..5d32856a5 100644 --- a/iphone/Barcodes/Barcodes-Info.plist +++ b/iphone/Barcodes/Barcodes-Info.plist @@ -6,12 +6,10 @@ English CFBundleDisplayName ${PRODUCT_NAME} - CFBundleDocumentTypes - CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile - + icon.png CFBundleIdentifier com.rpechayr.barcodes CFBundleInfoDictionaryVersion @@ -49,9 +47,5 @@ UIStatusBarHidden - UTExportedTypeDeclarations - - UTImportedTypeDeclarations - diff --git a/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj b/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj index d8e6933ee..67c01c293 100755 --- a/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj +++ b/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -77,6 +77,13 @@ remoteGlobalIDString = D2AAC07D0554694100DB518D; remoteInfo = ZXingWidget; }; + 3BA9170D1444A22D00E067C5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1FB43017128FFDCD002D63E8 /* ZXingWidget.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1D60398D13DF7CAD006F4B51; + remoteInfo = ZXingTests; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -235,6 +242,7 @@ isa = PBXGroup; children = ( 1FB4301C128FFDCD002D63E8 /* libZXingWidget.a */, + 3BA9170E1444A22D00E067C5 /* ZXingTests.octest */, ); name = Products; sourceTree = ""; @@ -353,8 +361,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Barcodes" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -390,6 +401,13 @@ remoteRef = 1FB4301B128FFDCD002D63E8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 3BA9170E1444A22D00E067C5 /* ZXingTests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = ZXingTests.octest; + remoteRef = 3BA9170D1444A22D00E067C5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -551,7 +569,6 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Barcodes_Prefix.pch; - GCC_VERSION = 4.2; INFOPLIST_FILE = "Barcodes-Info.plist"; OTHER_LDFLAGS = ( "-all_load", @@ -565,12 +582,17 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Barcodes_Prefix.pch; - GCC_VERSION = 4.2; INFOPLIST_FILE = "Barcodes-Info.plist"; + OTHER_LDFLAGS = ( + "-all_load", + "-Objc", + ); PRODUCT_NAME = Barcodes; + PROVISIONING_PROFILE = ""; VALIDATE_PRODUCT = YES; }; name = Release; @@ -578,10 +600,14 @@ 1F81B3E012F1E42200659778 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Romain Pechayre"; + ARCHS = ( + i386, + armv6, + armv7, + ); + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; - GCC_VERSION = 4.2; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -590,8 +616,7 @@ ); IPHONEOS_DEPLOYMENT_TARGET = 4.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - PREBINDING = NO; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "27669F64-E861-4AE5-B39E-E93E68BFC37D"; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; }; name = Distribution; @@ -603,8 +628,11 @@ COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Barcodes_Prefix.pch; - GCC_VERSION = 4.2; INFOPLIST_FILE = "Barcodes-Info.plist"; + OTHER_LDFLAGS = ( + "-all_load", + "-Objc", + ); PRODUCT_NAME = Barcodes; VALIDATE_PRODUCT = YES; }; @@ -613,11 +641,15 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Romain Pechayre (2CQ4EGKG4S)"; + ARCHS = ( + i386, + armv6, + armv7, + ); + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = 4.2; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -625,8 +657,7 @@ "../ZXingWidget/Classes/**", ); IPHONEOS_DEPLOYMENT_TARGET = 4.1; - PREBINDING = NO; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "613CA1B9-372B-44AF-BDD8-9F204D0C27C9"; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; }; name = Debug; @@ -634,10 +665,14 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + ARCHS = ( + i386, + armv6, + armv7, + ); + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; - GCC_VERSION = 4.2; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -646,7 +681,7 @@ ); IPHONEOS_DEPLOYMENT_TARGET = 4.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - PREBINDING = NO; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; }; name = Release; diff --git a/iphone/Barcodes/Classes/ArchiveController.m b/iphone/Barcodes/Classes/ArchiveController.m index 3329fffef..ba3d13491 100644 --- a/iphone/Barcodes/Classes/ArchiveController.m +++ b/iphone/Barcodes/Classes/ArchiveController.m @@ -52,7 +52,7 @@ ScanCell *cell = (ScanCell *)[tableView dequeueReusableCellWithIdentifier:ScanIdentifier]; if (cell == nil) { - cell = [[[ScanCell alloc] initWithFrame:CGRectZero reuseIdentifier:ScanIdentifier] autorelease]; + cell = [[[ScanCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:ScanIdentifier] autorelease]; } // Configure the cell diff --git a/iphone/Barcodes/Classes/ScanViewController.m b/iphone/Barcodes/Classes/ScanViewController.m index 6f51ed6c6..b58edd00f 100644 --- a/iphone/Barcodes/Classes/ScanViewController.m +++ b/iphone/Barcodes/Classes/ScanViewController.m @@ -1,3 +1,4 @@ +// -*- Mode: ObjC; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- // // ScanViewController.m // ZXing @@ -71,7 +72,7 @@ - (UITableViewCell *)cellWithIdentifier:(NSString *)identifier inTableView:(UITableView *)tableView { UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:identifier]; if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:identifier] autorelease]; + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier] autorelease]; } return cell; } @@ -85,7 +86,8 @@ static NSString *DatetimeIdentifier = @"ScanViewDatetimeIdentifier"; UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:DatetimeIdentifier]; if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithFrame:CGRectMake(0, 0, 320, 34) reuseIdentifier:DatetimeIdentifier] autorelease]; + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:DatetimeIdentifier] autorelease]; + cell.frame = CGRectMake(0, 0, 320, 34); UILabel *label = [cell textLabel]; label.font = [UIFont systemFontOfSize:[UIFont systemFontSize] * 2.0 / 3.0]; label.textColor = [UIColor grayColor]; @@ -98,7 +100,8 @@ static NSString *BodyIdentifier = @"ScanViewBodyIdentifier"; UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:BodyIdentifier]; if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithFrame:CGRectMake(0, 0, 320, BODY_HEIGHT) reuseIdentifier:BodyIdentifier] autorelease]; + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:BodyIdentifier] autorelease]; + cell.frame = CGRectMake(0, 0, 320, BODY_HEIGHT); UITextView *textView = [[UITextView alloc] initWithFrame:CGRectInset(cell.contentView.bounds, 6, 6)]; textView.font = bodyFont; [textView setTag:TEXT_VIEW_TAG]; @@ -115,7 +118,8 @@ static NSString *ButtonIdentifier = @"ScanViewButtonIdentifier"; UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:ButtonIdentifier]; if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithFrame:CGRectMake(0, 0, 320, 44) reuseIdentifier:ButtonIdentifier] autorelease]; + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:ButtonIdentifier] autorelease]; + cell.frame = CGRectMake(0, 0, 320, 44); UILabel *label = [[UILabel alloc] initWithFrame:CGRectInset(cell.contentView.bounds, 6, 6)]; label.font = [UIFont boldSystemFontOfSize:[UIFont systemFontSize]]; [label setTag:BUTTON_LABEL_TAG]; diff --git a/iphone/Barcodes/Classes/ZXMainViewController.mm b/iphone/Barcodes/Classes/ZXMainViewController.mm index 96917dc20..943a39666 100644 --- a/iphone/Barcodes/Classes/ZXMainViewController.mm +++ b/iphone/Barcodes/Classes/ZXMainViewController.mm @@ -1,3 +1,4 @@ +// -*- Mode: ObjC; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- // // ZXMainViewController.m // Barcodes @@ -96,8 +97,8 @@ - (void)dealloc { - actions = nil; - result = nil; + [actions release]; + [result release]; [super dealloc]; } @@ -111,7 +112,7 @@ Scan * scan = [[Database sharedDatabase] addScanWithText:resultString]; [[NSUserDefaults standardUserDefaults] setObject:resultString forKey:@"lastScan"]; - ParsedResult *parsedResult = [[UniversalResultParser parsedResultForString:resultString] retain]; + ParsedResult *parsedResult = [UniversalResultParser parsedResultForString:resultString]; self.result = [parsedResult retain]; self.actions = [self.result.actions retain]; ScanViewController *scanViewController = [[ScanViewController alloc] initWithResult:parsedResult forScan:scan]; diff --git a/iphone/ScanTest/Icon.png b/iphone/ScanTest/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4ca7bf6ac280522eba57c9f017bedfccfa87cbb3 GIT binary patch literal 3713 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 literal 0 HcmV?d00001 diff --git a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj index 71e9a6b90..602d8a901 100755 --- a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj +++ b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj @@ -17,6 +17,7 @@ 28AD73600D9D9599002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD735F0D9D9599002E5188 /* MainWindow.xib */; }; 28C286E10D94DF7D0034E888 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28C286E00D94DF7D0034E888 /* RootViewController.mm */; }; 28F335F11007B36200424DE2 /* RootViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F335F01007B36200424DE2 /* RootViewController.xib */; }; + 3B0A5DB91444C492000EC568 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B0A5DB81444C492000EC568 /* Icon.png */; }; 3BCED5C8120F84C900131FA0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCED5C7120F84C900131FA0 /* AVFoundation.framework */; }; 3BCED5CE120F84E000131FA0 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCED5CD120F84E000131FA0 /* CoreVideo.framework */; }; 3BCED5EB120F885C00131FA0 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCED5EA120F885C00131FA0 /* CoreMedia.framework */; }; @@ -63,6 +64,7 @@ 28C286DF0D94DF7D0034E888 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = ""; }; 28C286E00D94DF7D0034E888 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = ""; }; 28F335F01007B36200424DE2 /* RootViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RootViewController.xib; sourceTree = ""; }; + 3B0A5DB81444C492000EC568 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; 3BCED5C7120F84C900131FA0 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 3BCED5CD120F84E000131FA0 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; 3BCED5EA120F885C00131FA0 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; @@ -154,6 +156,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 3B0A5DB81444C492000EC568 /* Icon.png */, E548755B119C62B9001CC0F8 /* beep-beep.aiff */, 28F335F01007B36200424DE2 /* RootViewController.xib */, 28AD735F0D9D9599002E5188 /* MainWindow.xib */, @@ -257,6 +260,7 @@ 28AD73600D9D9599002E5188 /* MainWindow.xib in Resources */, 28F335F11007B36200424DE2 /* RootViewController.xib in Resources */, E548755C119C62B9001CC0F8 /* beep-beep.aiff in Resources */, + 3B0A5DB91444C492000EC568 /* Icon.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -288,6 +292,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + "CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; EXPORTED_SYMBOLS_FILE = ""; @@ -301,7 +306,7 @@ OTHER_LDFLAGS = ""; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_NAME = ScanTest; - SDKROOT = iphoneos; + "PROVISIONING_PROFILE[sdk=*]" = ""; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; }; name = Debug; @@ -317,7 +322,6 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "ScanTest-Info.plist"; PRODUCT_NAME = ScanTest; - SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; name = Release; @@ -330,7 +334,7 @@ armv7, armv6, ); - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -340,6 +344,7 @@ "../ZXingWidget/Classes/**", ); IPHONEOS_DEPLOYMENT_TARGET = 4.0; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; WARNING_CFLAGS = ( "-Werror", @@ -358,7 +363,7 @@ armv7, armv6, ); - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -369,6 +374,7 @@ ); IPHONEOS_DEPLOYMENT_TARGET = 4.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; WARNING_CFLAGS = ( "-Werror", diff --git a/iphone/ZXingWidget/Classes/ZXingWidgetController.m b/iphone/ZXingWidget/Classes/ZXingWidgetController.m index 2a44dd1a2..b25631ecf 100644 --- a/iphone/ZXingWidget/Classes/ZXingWidgetController.m +++ b/iphone/ZXingWidget/Classes/ZXingWidgetController.m @@ -306,8 +306,7 @@ NSNumber* value = [NSNumber numberWithUnsignedInt:kCVPixelFormatType_32BGRA]; NSDictionary* videoSettings = [NSDictionary dictionaryWithObject:value forKey:key]; [captureOutput setVideoSettings:videoSettings]; - self.captureSession = [[AVCaptureSession alloc] init]; - [self.captureSession release]; + self.captureSession = [[[AVCaptureSession alloc] init] autorelease]; self.captureSession.sessionPreset = AVCaptureSessionPresetMedium; // 480x360 on a 4 [self.captureSession addInput:captureInput]; diff --git a/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj b/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj index db43861bc..0d595c910 100644 --- a/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj +++ b/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj @@ -1479,6 +1479,7 @@ ); GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../cpp/core/src; @@ -1504,6 +1505,7 @@ armv7, ); GCC_C_LANGUAGE_STANDARD = c99; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../cpp/core/src;