Skip to content

Commit

Permalink
fix: '../bsmacros.h' file not found
Browse files Browse the repository at this point in the history
  • Loading branch information
amisare committed Jun 22, 2020
1 parent 4901ed5 commit cecd339
Show file tree
Hide file tree
Showing 16 changed files with 300 additions and 231 deletions.
8 changes: 2 additions & 6 deletions BSDiff.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@ bsdiff and bspatch are libraries for ios.
s.osx.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER' => 'com.nn.BSDiff' }
s.ios.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER' => 'com.nn.BSDiff' }

s.source_files = 'BSDiff/*.{m,h}'

s.subspec 'bsdiff' do |ss|
ss.source_files = 'BSDiff/**/*.{c,h}'
ss.private_header_files = 'BSDiff/**/*.{h}'
end
s.source_files = 'BSDiff/*.{m,h}','BSDiff/**/*.{c,h}'
s.private_header_files = 'BSDiff/bsmacros.h'

end
8 changes: 4 additions & 4 deletions BSDiff.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
7A96957724A0CDA500FDEE7A /* bsmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A96957624A0CDA500FDEE7A /* bsmacros.h */; };
7A96959424A0D1AF00FDEE7A /* bsmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A96959324A0D1AF00FDEE7A /* bsmacros.h */; };
7AD3EF2F249490A7008A7958 /* BSDiff.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AD3EF25249490A6008A7958 /* BSDiff.framework */; };
7AD3EF34249490A7008A7958 /* BSDiffTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AD3EF33249490A7008A7958 /* BSDiffTests.m */; };
7AD3EF36249490A7008A7958 /* BSDiff.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AD3EF28249490A6008A7958 /* BSDiff.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand All @@ -28,7 +28,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
7A96957624A0CDA500FDEE7A /* bsmacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bsmacros.h; sourceTree = "<group>"; };
7A96959324A0D1AF00FDEE7A /* bsmacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bsmacros.h; sourceTree = "<group>"; };
7AD3EF25249490A6008A7958 /* BSDiff.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BSDiff.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7AD3EF28249490A6008A7958 /* BSDiff.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BSDiff.h; sourceTree = "<group>"; };
7AD3EF29249490A6008A7958 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -85,6 +85,7 @@
children = (
7AD3EF28249490A6008A7958 /* BSDiff.h */,
7AD3EF80249492F2008A7958 /* BSDiff.m */,
7A96959324A0D1AF00FDEE7A /* bsmacros.h */,
7AD3EF8224949322008A7958 /* bsdiff-4.3 */,
7AD3EF29249490A6008A7958 /* Info.plist */,
);
Expand All @@ -103,7 +104,6 @@
7AD3EF8224949322008A7958 /* bsdiff-4.3 */ = {
isa = PBXGroup;
children = (
7A96957624A0CDA500FDEE7A /* bsmacros.h */,
7AD3EF8324949322008A7958 /* bspatch.c */,
7AD3EF8424949322008A7958 /* bsdiff.c */,
);
Expand All @@ -125,7 +125,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
7A96957724A0CDA500FDEE7A /* bsmacros.h in Headers */,
7A96959424A0D1AF00FDEE7A /* bsmacros.h in Headers */,
7AD3EF36249490A7008A7958 /* BSDiff.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion BSDiff/bsdiff-4.3/bsdiff.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.c,v 1.1 2005/08/06 01:59:05
#include <string.h>
#include <unistd.h>

#include "bsmacros.h"
#include "../bsmacros.h"

#define MIN(x,y) (((x)<(y)) ? (x) : (y))

Expand Down
2 changes: 1 addition & 1 deletion BSDiff/bsdiff-4.3/bspatch.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:
#include <unistd.h>
#include <fcntl.h>

#include "bsmacros.h"
#include "../bsmacros.h"

static off_t offtin(u_char *buf)
{
Expand Down
File renamed without changes.
8 changes: 3 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
PODS:
- BSDiff (0.0.1):
- BSDiff/bsdiff (= 0.0.1)
- BSDiff/bsdiff (0.0.1)
- BSDiff (4.3.0.1)
- FileMD5Hash (2.0.0)

DEPENDENCIES:
Expand All @@ -17,9 +15,9 @@ EXTERNAL SOURCES:
:path: "."

SPEC CHECKSUMS:
BSDiff: c579b805195a5d077a22ed60e7c69962fd3fcccf
BSDiff: add53322b303fd287a0298688e6b166b294ebb0f
FileMD5Hash: 3ed69cc19a21ff4d30ae8833fc104275ad2c7de0

PODFILE CHECKSUM: 13314f980552422456b1b88da5d579bcc73bf9ff

COCOAPODS: 1.8.4
COCOAPODS: 1.9.3
16 changes: 7 additions & 9 deletions Pods/Local Podspecs/BSDiff.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cecd339

Please sign in to comment.