Skip to content

Commit

Permalink
Update to latest stable HexFiend
Browse files Browse the repository at this point in the history 
Raise min supported macOS target to 10.14
Add unused HFByteTheme to dodge Swift+ObjC in the same package
  • Loading branch information
@LeoNatan
LeoNatan committed Dec 8, 2023
1 parent b83504d commit 0bf8ef0
Show file tree
Hide file tree
Showing 19 changed files with 711 additions and 625 deletions.
2 changes: 1 addition & 1 deletion HexFiend
Submodule HexFiend updated 82 files
+3 −0 .gitignore
+8 −0 HexFiend_2-Bridging-Header.h
+212 −15 HexFiend_2.xcodeproj/project.pbxproj
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Debug + CodeSign.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Debug + UnitTests.xcscheme
+2 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Documentation Generation.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Framework CI Tests.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Framework Only (Debug).xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Framework Only (Release).xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/HexFiend_Framework Tests.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/HexFiend_Framework_iOS.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/HexFiendling.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Release + CodeSign.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Release+MAS.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Test_BTree.xcscheme
+23 −20 License.txt
+31 −23 app/resources/Base.lproj/ChooseStringEncodingDialog.xib
+17 −10 app/resources/Base.lproj/MainMenu.xib
+37 −26 app/resources/Base.lproj/Preferences.xib
+16 −0 app/resources/ColorByteThemes/Default Vibrant.json5
+16 −0 app/resources/ColorByteThemes/Default.json5
+15 −1 app/sources/AppDelegate.h
+73 −18 app/sources/AppDelegate.m
+1 −1 app/sources/BaseDataDocument.h
+67 −36 app/sources/BaseDataDocument.m
+1 −1 app/sources/CLIController.m
+0 −15 app/sources/ChooseStringEncodingWindowController.h
+0 −104 app/sources/ChooseStringEncodingWindowController.m
+152 −0 app/sources/ChooseStringEncodingWindowController.swift
+7 −10 app/sources/DataInspectorRepresenter.m
+2 −1 app/sources/DataInspectorScrollView.m
+0 −2 app/sources/DiffDocument.m
+7 −6 app/sources/DiffTextViewContainer.m
+52 −0 app/sources/Encodings.swift
+58 −15 app/sources/HFBinaryTemplateController.m
+2 −2 app/sources/HFOpenAccessoryViewController.m
+9 −76 app/sources/HFTclTemplateController.m
+1 −1 app/sources/HFTemplateController.m
+21 −0 app/sources/HFTemplateFile.h
+13 −0 app/sources/HFTemplateFile.m
+19 −0 app/sources/MinimumVersionRequired.h
+90 −0 app/sources/MinimumVersionRequired.m
+20 −0 app/sources/TemplateAutodetection.h
+41 −0 app/sources/TemplateAutodetection.m
+23 −0 app/sources/TemplateMetadata.h
+130 −0 app/sources/TemplateMetadata.m
+2 −1 app/sources/TextDividerRepresenter.m
+52 −0 app/tcl/build.sh
+54 −0 docs/ByteThemes.md
+22 −0 docs/ReleaseNotes.html
+3 −3 documentation_tools/build_documentation.py
+0 −2 framework/sources/HFByteRangeAttributeArray.m
+158 −0 framework/sources/HFByteTheme.swift
+11 −0 framework/sources/HFByteThemeColor.h
+15 −6 framework/sources/HFController.h
+33 −17 framework/sources/HFController.m
+7 −3 framework/sources/HFEncodingManager.h
+10 −0 framework/sources/HFFunctions.h
+2 −1 framework/sources/HFLineCountingView.m
+1 −1 framework/sources/HFPasteboardOwner.m
+1 −3 framework/sources/HFRepresenterTextView.h
+38 −32 framework/sources/HFRepresenterTextView.m
+7 −3 framework/sources/HFTextRepresenter.m
+0 −2 framework/sources/HFVerticalScrollerRepresenter.m
+1 −0 framework/sources/HexFiend.h
+176 −0 templates/Apple/Applesauce WOZ.tcl
+14 −2 templates/Archives/GZIP.tcl
+2 −0 templates/Archives/TAR.tcl
+2 −2 templates/Archives/ZIP.tcl
+2 −0 templates/Audio/WAV.tcl
+983 −0 templates/Crypto/BTCBlock-extended.tcl
+174 −0 templates/Crypto/BTCBlock.tcl
+1 −1 templates/Executables/ELF.tcl
+1 −1 templates/Executables/Mach-O.tcl
+47 −0 templates/FileFormats/uf2.tcl
+2 −0 templates/Images/PNG.tcl
+11 −2 templates/Images/PSD.tcl
+54 −0 templates/Reference.md
+2 −0 templates/Utility/General.tcl
+1 −1 version.h
1,220 changes: 618 additions & 602 deletions HexFiendFramework/HexFiend.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions ...endFramework/HexFiend.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
1 change: 1 addition & 0 deletions HexFiendFramework/include/HexFiend/HFByteTheme.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../HexFiendShims/include/HFByteTheme.h
1 change: 1 addition & 0 deletions HexFiendFramework/include/HexFiend/HFByteThemeColor.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../HexFiend/framework/sources/HFByteThemeColor.h
1 change: 1 addition & 0 deletions HexFiendFramework/include/HexFiend/HexFiend-Swift.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../HexFiendShims/include/HexFiend-Swift.h
1 change: 1 addition & 0 deletions HexFiendFramework/src/HFByteTheme.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../HexFiendShims/include/HFByteTheme.h
1 change: 1 addition & 0 deletions HexFiendFramework/src/HFByteTheme.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../HexFiendShims/src/HFByteTheme.m
1 change: 1 addition & 0 deletions HexFiendFramework/src/HFByteThemeColor.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../HexFiend/framework/sources/HFByteThemeColor.h
1 change: 1 addition & 0 deletions HexFiendFramework/src/HexFiend-Swift.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../HexFiendShims/include/HexFiend-Swift.h
9 changes: 9 additions & 0 deletions HexFiendShims/include/HFByteTheme.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#import <Foundation/Foundation.h>
#import <HexFiend/HFByteThemeColor.h>

@interface HFByteTheme : NSObject

@property (readonly) struct HFByteThemeColor* darkColorTable;
@property (readonly) struct HFByteThemeColor* lightColorTable;

@end
1 change: 1 addition & 0 deletions HexFiendShims/include/HexFiend-Swift.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#import <HexFiend/HFByteTheme.h>
3 changes: 3 additions & 0 deletions HexFiendShims/src/HFByteTheme.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#import <HexFiend/HFByteTheme.h>

@implementation HFByteTheme @end
33 changes: 23 additions & 10 deletions LNPropertyListEditor/LNPropertyListEditor.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -12,7 +12,7 @@
391FF030208412CC00005D0F /* LNPropertyListRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 391FF02E208412CC00005D0F /* LNPropertyListRowView.m */; };
391FF0332084270400005D0F /* LNPropertyListOutlineView.h in Headers */ = {isa = PBXBuildFile; fileRef = 391FF0312084270400005D0F /* LNPropertyListOutlineView.h */; settings = {ATTRIBUTES = (Private, ); }; };
391FF0342084270400005D0F /* LNPropertyListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 391FF0322084270400005D0F /* LNPropertyListOutlineView.m */; };
3925913A263C52B100AF78D3 /* LNPropertyListCellTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 39259138263C52B100AF78D3 /* LNPropertyListCellTextField.h */; };
3925913A263C52B100AF78D3 /* LNPropertyListCellTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 39259138263C52B100AF78D3 /* LNPropertyListCellTextField.h */; settings = {ATTRIBUTES = (Private, ); }; };
3925913B263C52B100AF78D3 /* LNPropertyListCellTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 39259139263C52B100AF78D3 /* LNPropertyListCellTextField.m */; };
393E1872207F61C2002E6136 /* LNPropertyListEditorOutline.xib in Resources */ = {isa = PBXBuildFile; fileRef = 393E1871207F61C2002E6136 /* LNPropertyListEditorOutline.xib */; };
393E1875207F64A0002E6136 /* LNPropertyListEditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 393E1873207F64A0002E6136 /* LNPropertyListEditor.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand All @@ -32,12 +32,12 @@
39D1529023289668009124C8 /* LNPropertyListDatePickerPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D1528E23289668009124C8 /* LNPropertyListDatePickerPanel.m */; };
39D152962328A9C4009124C8 /* _LNPropertyListDatePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 39D152942328A9C4009124C8 /* _LNPropertyListDatePicker.h */; settings = {ATTRIBUTES = (Private, ); }; };
39D152972328A9C4009124C8 /* _LNPropertyListDatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D152952328A9C4009124C8 /* _LNPropertyListDatePicker.m */; };
39D55F2026D82C100013B105 /* LNPropertyListDataEditorPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 39D55F1E26D82C100013B105 /* LNPropertyListDataEditorPanel.h */; };
39D55F2026D82C100013B105 /* LNPropertyListDataEditorPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 39D55F1E26D82C100013B105 /* LNPropertyListDataEditorPanel.h */; settings = {ATTRIBUTES = (Private, ); }; };
39D55F2126D82C100013B105 /* LNPropertyListDataEditorPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D55F1F26D82C100013B105 /* LNPropertyListDataEditorPanel.m */; };
39DE8E942092030500ED16B4 /* LNPropertyListPopUpButtonCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 39DE8E922092030500ED16B4 /* LNPropertyListPopUpButtonCell.h */; settings = {ATTRIBUTES = (Private, ); }; };
39DE8E952092030500ED16B4 /* LNPropertyListPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 39DE8E932092030500ED16B4 /* LNPropertyListPopUpButtonCell.m */; };
39DE8E9C2092214400ED16B4 /* LNPropertyListEditor-Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 39DE8E9B2092214300ED16B4 /* LNPropertyListEditor-Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
39F537F3264305AF00AB263A /* NSObject+LNPropertyListValueSorting.h in Headers */ = {isa = PBXBuildFile; fileRef = 39F537F1264305AF00AB263A /* NSObject+LNPropertyListValueSorting.h */; };
39F537F3264305AF00AB263A /* NSObject+LNPropertyListValueSorting.h in Headers */ = {isa = PBXBuildFile; fileRef = 39F537F1264305AF00AB263A /* NSObject+LNPropertyListValueSorting.h */; settings = {ATTRIBUTES = (Private, ); }; };
39F537F4264305AF00AB263A /* NSObject+LNPropertyListValueSorting.m in Sources */ = {isa = PBXBuildFile; fileRef = 39F537F2264305AF00AB263A /* NSObject+LNPropertyListValueSorting.m */; };
/* End PBXBuildFile section */

Expand All @@ -53,7 +53,7 @@
isa = PBXContainerItemProxy;
containerPortal = 39D1276626D9254C007E64D1 /* HexFiend.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1070E7C728563E78C6C95AC7;
remoteGlobalIDString = AFF1D22ED47CE0FD180F70EB;
remoteInfo = HexFiend;
};
/* End PBXContainerItemProxy section */
Expand Down Expand Up @@ -214,12 +214,12 @@
39DE8E9C2092214400ED16B4 /* LNPropertyListEditor-Private.h in Headers */,
39DE8E942092030500ED16B4 /* LNPropertyListPopUpButtonCell.h in Headers */,
3946906C20976ED300B4A457 /* LNPropertyListDatePicker.h in Headers */,
39F537F3264305AF00AB263A /* NSObject+LNPropertyListValueSorting.h in Headers */,
3941486F2095E85900A21F96 /* LNPropertyListDatePickerCell.h in Headers */,
39F537F3264305AF00AB263A /* NSObject+LNPropertyListValueSorting.h in Headers */,
39D55F2026D82C100013B105 /* LNPropertyListDataEditorPanel.h in Headers */,
3925913A263C52B100AF78D3 /* LNPropertyListCellTextField.h in Headers */,
39D152962328A9C4009124C8 /* _LNPropertyListDatePicker.h in Headers */,
393E1875207F64A0002E6136 /* LNPropertyListEditor.h in Headers */,
3925913A263C52B100AF78D3 /* LNPropertyListCellTextField.h in Headers */,
393E1879207F68B4002E6136 /* LNPropertyListNode.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -253,7 +253,8 @@
393E1830207F6119002E6136 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1330;
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "Leo Natan";
TargetAttributes = {
393E1838207F6119002E6136 = {
Expand Down Expand Up @@ -375,9 +376,11 @@
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -438,8 +441,10 @@
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
Expand All @@ -465,10 +470,11 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DEAD_CODE_STRIPPING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
FRAMEWORK_VERSION = A;
IBC_ERRORS = NO;
IBC_NOTICES = NO;
Expand All @@ -480,6 +486,9 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.leonatan.LNPropertyListEditor;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand All @@ -496,10 +505,11 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DEAD_CODE_STRIPPING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
FRAMEWORK_VERSION = A;
IBC_ERRORS = NO;
IBC_NOTICES = NO;
Expand All @@ -511,6 +521,9 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER = com.leonatan.LNPropertyListEditor;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down
2 changes: 1 addition & 1 deletion ...ditor/LNPropertyListEditor.xcodeproj/xcshareddata/xcschemes/LNPropertyListEditor.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion LNPropertyListEditor/LNPropertyListEditor/Implementation/LNPropertyListEditor.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

@import ObjectiveC;

@interface LNPropertyListEditor () <NSOutlineViewDataSource, NSOutlineViewDelegate, NSTextFieldDelegate>
@interface LNPropertyListEditor () <NSOutlineViewDataSource, NSOutlineViewDelegate, NSTextFieldDelegate, NSMenuItemValidation>
{
IBOutlet NSMenu* _menuItem;

Expand Down
2 changes: 1 addition & 1 deletion LNPropertyListEditor/LNPropertyListEditor/Implementation/LNPropertyListPopUpButtonCell.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ + (void)load

- (NSRect)drawTitle:(NSAttributedString *)title withFrame:(NSRect)frame inView:(NSView *)controlView
{
BOOL isHighlited = self.backgroundStyle == NSBackgroundStyleDark;
BOOL isHighlited = self.backgroundStyle == NSBackgroundStyleEmphasized;
//All this to get the damn colors to match a text field. Ridiculous
NSColor* controlColor = self.isEnabled ? (isHighlited ? __enabledTextColorHighlight : (controlView.effectiveAppearance == __darkAppearanceCache ? NSColor.whiteColor : __enabledTextColor)) : (isHighlited ? __disabledTextColorHighlight : __disabledTextColor);
NSMutableAttributedString* attr = self.attributedTitle.mutableCopy;
Expand Down
2 changes: 1 addition & 1 deletion ...tyListEditorExample.xcodeproj/xcshareddata/xcschemes/LNPropertyListEditorExample.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
45 changes: 37 additions & 8 deletions prepare_spm_support.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

require 'fileutils'

shim_header_path = File.expand_path("HexFiendShims/include/")
shim_src_path = File.expand_path("HexFiendShims/src/")

include_path = File.expand_path("HexFiendFramework/include/")
src_path = File.expand_path("HexFiendFramework/src/")

Expand All @@ -20,21 +23,24 @@

require 'xcodeproj'

project_path = 'HexFiend/HexFiend_2.xcodeproj'
project = Xcodeproj::Project.open(project_path)
input_project_path = 'HexFiend/HexFiend_2.xcodeproj'
input_project = Xcodeproj::Project.open(input_project_path)

target = project.targets.select do |target|
input_target = input_project.targets.select do |target|
target.name == "HexFiend_Framework"
end.first

output_project_path = Pathname(File.expand_path("HexFiendFramework"))
output_project = Xcodeproj::Project.new(output_project_path.join("HexFiend.xcodeproj"))
output_target = output_project.new_target(:framework, 'HexFiend', :osx, '10.11')
output_project.build_configurations.each do |config|
config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
end
output_target = output_project.new_target(:framework, 'HexFiend', :osx, '10.14')

#headers
output_headers_group = output_project.new_group("Headers")

files = target.headers_build_phase.files.to_a.map do |pbx_header_file|
files = input_target.headers_build_phase.files.to_a.map do |pbx_header_file|
pbx_header_file
end.select do |pbx_header_file|
not(pbx_header_file.file_ref.real_path.to_s.include?("PrivilegedHelper"))
Expand All @@ -56,6 +62,19 @@
end
end

Dir.each_child(shim_header_path) do |shim_header_filename|
file = Pathname(File.expand_path(shim_header_filename, shim_header_path))

output_file_reference = output_headers_group.new_file(file)
output_build_file = output_target.headers_build_phase.add_file_reference(output_file_reference)

file2 = file.relative_path_from(src_path)
File.symlink(file2, File.join(src_path, File.basename(file)))

file3 = file.relative_path_from(File.join(include_path, "HexFiend"))
File.symlink(file3, File.join(File.join(include_path, "HexFiend"), File.basename(file)))
end

#manual
file = Pathname(File.expand_path("HexFiend/framework/tests/HFTest.h"))

Expand All @@ -70,10 +89,10 @@
#sources
output_sources_group = output_project.new_group("Sources")

files = target.source_build_phase.files.to_a.map do |pbx_build_file|
files = input_target.source_build_phase.files.to_a.map do |pbx_build_file|
pbx_build_file.file_ref.real_path
end.select do |path|
path.to_s.end_with?(".h", ".m", ".mm", ".swift")
path.to_s.end_with?(".h", ".m", ".mm")
end.select do |path|
not(path.to_s.include?("PrivilegedHelper"))
end.select do |path|
Expand All @@ -86,13 +105,23 @@
File.symlink(file2, File.join(src_path, File.basename(file)))
end

Dir.each_child(shim_src_path) do |shim_source_filename|
file = Pathname(File.expand_path(shim_source_filename, shim_src_path))

output_file_reference = output_sources_group.new_file(file)
output_target.add_file_references([output_file_reference])

file2 = file.relative_path_from(src_path)
File.symlink(file2, File.join(src_path, File.basename(file)))
end

infoPlistFile = Pathname(File.expand_path("HexFiend/framework/HexFiend_Framework-Info.plist")).relative_path_from(output_project_path)
infoPlistPreprocessFile = Pathname(File.expand_path("HexFiend/version.h")).relative_path_from(output_project_path)
output_target.build_configurations.each do |config|
config.build_settings["GCC_PREPROCESSOR_DEFINITIONS"] = ["HF_NO_PRIVILEGED_FILE_OPERATIONS=1"]
config.build_settings["INFOPLIST_PREFIX_HEADER"] = infoPlistPreprocessFile.to_s
config.build_settings["INFOPLIST_FILE"] = infoPlistFile.to_s
config.build_settings["INFOPLIST_PREPROCESS"] = target.build_configurations.first.build_settings["INFOPLIST_PREPROCESS"]
config.build_settings["INFOPLIST_PREPROCESS"] = input_target.build_configurations.first.build_settings["INFOPLIST_PREPROCESS"]
config.build_settings["PRODUCT_BUNDLE_IDENTIFIER"] = "com.ridiculousfish.HexFiend-Framework"
config.build_settings["WARNING_CFLAGS"] = "-Wno-conditional-uninitialized"
end
Expand Down

0 comments on commit 0bf8ef0

Please sign in to comment.