Skip to content

Commit c7db8b8

Browse files
author
joel
committed
1 parent 95d56cd commit c7db8b8

File tree

2 files changed

+32
-20
lines changed

2 files changed

+32
-20
lines changed

FuseHFS.xcodeproj/project.pbxproj

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
283BD8AC1149985C003F9F55 /* mount_fusefs_hfs in CopyFiles */ = {isa = PBXBuildFile; fileRef = 283BD8A6114997EB003F9F55 /* mount_fusefs_hfs */; };
1110
2842B7D711AFC0100031D3AE /* libfuse_ino64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2842B7D611AFC0100031D3AE /* libfuse_ino64.dylib */; };
1211
2861C557113A706600D0447F /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2861C556113A706600D0447F /* libiconv.dylib */; };
1312
286A10A411AF17D7001EEF69 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2861C556113A706600D0447F /* libiconv.dylib */; };
@@ -27,22 +26,25 @@
2726
289FB925113BE5CE00409A62 /* libhfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 289FB8D9113BE43300409A62 /* libhfs.a */; };
2827
289FB936113BE62200409A62 /* hfs.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F0DEBE1139382300C3718A /* hfs.c */; };
2928
28A3D9C0122C570A00A7869C /* fuse_wait.c in Sources */ = {isa = PBXBuildFile; fileRef = 28A3D9B6122C56F700A7869C /* fuse_wait.c */; };
30-
28A3D9C1122C570D00A7869C /* fuse_wait in Resources */ = {isa = PBXBuildFile; fileRef = 28A3D9BA122C56FD00A7869C /* fuse_wait */; };
3129
28A3D9C9122C577900A7869C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28A3D9C8122C577900A7869C /* CoreFoundation.framework */; };
3230
28E2DF7F11495919002DF364 /* ck_btree.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F0DE6B1139382300C3718A /* ck_btree.c */; };
3331
28E2DF8011495919002DF364 /* ck_mdb.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F0DE6D1139382300C3718A /* ck_mdb.c */; };
3432
28E2DF8111495919002DF364 /* ck_volume.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F0DE6F1139382300C3718A /* ck_volume.c */; };
3533
28E2DF8211495919002DF364 /* hfsck.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F0DE711139382300C3718A /* hfsck.c */; };
3634
28E2DF8311495919002DF364 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F0DE731139382300C3718A /* main.c */; };
3735
28E2DF8411495919002DF364 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F0DE761139382300C3718A /* util.c */; };
38-
28E2DF93114959B2002DF364 /* fusefs_hfs in Resources */ = {isa = PBXBuildFile; fileRef = 8DD76FB20486AB0100D96B5E /* fusefs_hfs */; };
3936
28E2DF9B11495B01002DF364 /* suid.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F0DEF91139382300C3718A /* suid.c */; };
4037
28E2DF9C11495B01002DF364 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F0DF041139382400C3718A /* version.c */; };
4138
28E2E0251149647E002DF364 /* libhfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 289FB8D9113BE43300409A62 /* libhfs.a */; };
42-
28E2E031114964A5002DF364 /* fusefs_hfs.util in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28E2E02111496478002DF364 /* fusefs_hfs.util */; };
39+
28E2E031114964A5002DF364 /* fusefs_hfs.util in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28E2E02111496478002DF364 /* fusefs_hfs.util */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
4340
28E2E033114964B1002DF364 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 28E72DB6114956C700084372 /* util.c */; };
4441
28E72DD61149586900084372 /* libhfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 289FB8D9113BE43300409A62 /* libhfs.a */; };
4542
5D41D08B197B0DA2007A4650 /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D41D089197B0DA2007A4650 /* log.c */; };
43+
5DA0E4AA278383AC00368F1F /* log.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA0E4A9278383AC00368F1F /* log.h */; };
44+
5DA0E4AB2784155600368F1F /* fusefs_hfs in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8DD76FB20486AB0100D96B5E /* fusefs_hfs */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
45+
5DA0E4AC2784156700368F1F /* fuse_wait in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28A3D9BA122C56FD00A7869C /* fuse_wait */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
46+
5DA0E4AD278416C800368F1F /* mount_fusefs_hfs in Resources */ = {isa = PBXBuildFile; fileRef = 283BD8A6114997EB003F9F55 /* mount_fusefs_hfs */; };
47+
5DA0E4AE278424A500368F1F /* hfsck in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28E72DD01149585D00084372 /* hfsck */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
4648
FFD708650EE669A60026C014 /* fusefs_hfs.c in Sources */ = {isa = PBXBuildFile; fileRef = FFD708640EE669A60026C014 /* fusefs_hfs.c */; };
4749
FFD708760EE66DA70026C014 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = FFD708750EE66DA70026C014 /* main.c */; };
4850
/* End PBXBuildFile section */
@@ -104,9 +106,11 @@
104106
isa = PBXCopyFilesBuildPhase;
105107
buildActionMask = 2147483647;
106108
dstPath = "";
107-
dstSubfolderSpec = 1;
109+
dstSubfolderSpec = 6;
108110
files = (
109-
283BD8AC1149985C003F9F55 /* mount_fusefs_hfs in CopyFiles */,
111+
5DA0E4AE278424A500368F1F /* hfsck in CopyFiles */,
112+
5DA0E4AC2784156700368F1F /* fuse_wait in CopyFiles */,
113+
5DA0E4AB2784155600368F1F /* fusefs_hfs in CopyFiles */,
110114
28E2E031114964A5002DF364 /* fusefs_hfs.util in CopyFiles */,
111115
);
112116
runOnlyForDeploymentPostprocessing = 0;
@@ -348,6 +352,7 @@
348352
28F0DF061139382400C3718A /* xhfs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xhfs.h; sourceTree = "<group>"; };
349353
28F0DF071139382400C3718A /* xhfs.tcl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xhfs.tcl; sourceTree = "<group>"; };
350354
5D41D089197B0DA2007A4650 /* log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = log.c; sourceTree = "<group>"; };
355+
5DA0E4A9278383AC00368F1F /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = "<group>"; };
351356
639BA9851675AA9E00A9518F /* fuse_wait copy */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "fuse_wait copy"; sourceTree = BUILT_PRODUCTS_DIR; };
352357
8DD76FB20486AB0100D96B5E /* fusefs_hfs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fusefs_hfs; sourceTree = BUILT_PRODUCTS_DIR; };
353358
FFD708640EE669A60026C014 /* fusefs_hfs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fusefs_hfs.c; sourceTree = "<group>"; };
@@ -419,6 +424,7 @@
419424
isa = PBXGroup;
420425
children = (
421426
5D41D089197B0DA2007A4650 /* log.c */,
427+
5DA0E4A9278383AC00368F1F /* log.h */,
422428
FFD708640EE669A60026C014 /* fusefs_hfs.c */,
423429
28B5BB7811B548D400FF8BC7 /* fusefs_hfs.h */,
424430
FFD708750EE66DA70026C014 /* main.c */,
@@ -756,6 +762,7 @@
756762
buildActionMask = 2147483647;
757763
files = (
758764
286A118211AF26C6001EEF69 /* bootblocks.h in Headers */,
765+
5DA0E4AA278383AC00368F1F /* log.h in Headers */,
759766
);
760767
runOnlyForDeploymentPostprocessing = 0;
761768
};
@@ -896,6 +903,7 @@
896903
developmentRegion = English;
897904
hasScannedForEncodings = 1;
898905
knownRegions = (
906+
English,
899907
en,
900908
);
901909
mainGroup = 08FB7794FE84155DC02AAC07 /* HFSLives */;
@@ -918,8 +926,7 @@
918926
isa = PBXResourcesBuildPhase;
919927
buildActionMask = 2147483647;
920928
files = (
921-
28A3D9C1122C570D00A7869C /* fuse_wait in Resources */,
922-
28E2DF93114959B2002DF364 /* fusefs_hfs in Resources */,
929+
5DA0E4AD278416C800368F1F /* mount_fusefs_hfs in Resources */,
923930
);
924931
runOnlyForDeploymentPostprocessing = 0;
925932
};
@@ -1061,6 +1068,7 @@
10611068
"\"$(SRCROOT)/hfsutils-3.2.6/libhfs\"",
10621069
"\"/usr/local/lib\"",
10631070
);
1071+
MACOSX_DEPLOYMENT_TARGET = 12.1;
10641072
OTHER_CFLAGS = (
10651073
"-D_FILE_OFFSET_BITS=64",
10661074
"-D__DARWIN_64_BIT_INO_T=1",
@@ -1087,6 +1095,7 @@
10871095
"\"$(SRCROOT)/hfsutils-3.2.6/libhfs\"",
10881096
"\"/usr/local/lib\"",
10891097
);
1098+
MACOSX_DEPLOYMENT_TARGET = 12.1;
10901099
OTHER_CFLAGS = (
10911100
"-D_FILE_OFFSET_BITS=64",
10921101
"-D__DARWIN_64_BIT_INO_T=1",
@@ -1101,21 +1110,21 @@
11011110
1DEB928A08733DD80010E9CD /* Debug */ = {
11021111
isa = XCBuildConfiguration;
11031112
buildSettings = {
1104-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
1113+
ARCHS = x86_64;
11051114
GCC_OPTIMIZATION_LEVEL = 0;
11061115
GCC_WARN_ABOUT_RETURN_TYPE = YES;
11071116
GCC_WARN_UNUSED_VARIABLE = YES;
1108-
MACOSX_DEPLOYMENT_TARGET = 10.6;
1117+
MACOSX_DEPLOYMENT_TARGET = 12.1;
11091118
};
11101119
name = Debug;
11111120
};
11121121
1DEB928B08733DD80010E9CD /* Release */ = {
11131122
isa = XCBuildConfiguration;
11141123
buildSettings = {
1115-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
1124+
ARCHS = x86_64;
11161125
GCC_WARN_ABOUT_RETURN_TYPE = YES;
11171126
GCC_WARN_UNUSED_VARIABLE = YES;
1118-
MACOSX_DEPLOYMENT_TARGET = 10.6;
1127+
MACOSX_DEPLOYMENT_TARGET = 12.1;
11191128
};
11201129
name = Release;
11211130
};
@@ -1219,6 +1228,7 @@
12191228
ALWAYS_SEARCH_USER_PATHS = NO;
12201229
COMBINE_HIDPI_IMAGES = YES;
12211230
COPY_PHASE_STRIP = NO;
1231+
CURRENT_PROJECT_VERSION = 0.1.5;
12221232
DEPLOYMENT_LOCATION = NO;
12231233
DSTROOT = "/tmp/$(PROJECT_NAME).dst";
12241234
GCC_DYNAMIC_NO_PIC = NO;
@@ -1231,7 +1241,8 @@
12311241
INSTALL_GROUP = admin;
12321242
INSTALL_OWNER = "";
12331243
"INSTALL_OWNER[sdk=*]" = root;
1234-
INSTALL_PATH = /System/Library/Filesystems;
1244+
INSTALL_PATH = /Library/Filesystems;
1245+
MARKETING_VERSION = 0.1.5;
12351246
OTHER_LDFLAGS = (
12361247
"-framework",
12371248
Foundation,
@@ -1251,6 +1262,7 @@
12511262
ALWAYS_SEARCH_USER_PATHS = NO;
12521263
COMBINE_HIDPI_IMAGES = YES;
12531264
COPY_PHASE_STRIP = NO;
1265+
CURRENT_PROJECT_VERSION = 0.1.5;
12541266
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
12551267
DEPLOYMENT_LOCATION = NO;
12561268
DSTROOT = "/tmp/$(PROJECT_NAME).dst";
@@ -1261,7 +1273,8 @@
12611273
INFOPLIST_FILE = "fusefs_hfs-Info.plist";
12621274
INSTALL_GROUP = admin;
12631275
INSTALL_OWNER = "";
1264-
INSTALL_PATH = /System/Library/Filesystems;
1276+
INSTALL_PATH = /Library/Filesystems;
1277+
MARKETING_VERSION = 0.1.5;
12651278
OTHER_LDFLAGS = (
12661279
"-framework",
12671280
Foundation,

FuseHFS.xcodeproj/xcuserdata/joel.xcuserdatad/xcschemes/FS Bundle.xcscheme

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,29 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
3232
</TestAction>
3333
<LaunchAction
34+
buildConfiguration = "Release"
3435
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3536
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
3637
launchStyle = "0"
3738
useCustomWorkingDirectory = "NO"
38-
buildConfiguration = "Release"
3939
ignoresPersistentStateOnLaunch = "NO"
4040
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
4142
allowLocationSimulation = "YES">
42-
<AdditionalOptions>
43-
</AdditionalOptions>
4443
</LaunchAction>
4544
<ProfileAction
45+
buildConfiguration = "Release"
4646
shouldUseLaunchSchemeArgsEnv = "YES"
4747
savedToolIdentifier = ""
4848
useCustomWorkingDirectory = "NO"
49-
buildConfiguration = "Release"
5049
debugDocumentVersioning = "YES">
5150
</ProfileAction>
5251
<AnalyzeAction

0 commit comments

Comments
 (0)