Change directory structure

This commit is contained in:
1024jp 2016-07-29 00:04:42 +09:00
parent 4d3b5fb7da
commit 90c91357c9
8 changed files with 16 additions and 25 deletions

View File

@ -1,11 +1,11 @@
language: objective-c
xcode_project: Project/NSData+GZIP.xcodeproj
xcode_project: Gzip.xcodeproj
matrix:
include:
- xcode_scheme: Tests OS X
- xcode_scheme: Gzip macOS
xcode_sdk: macosx
- xcode_scheme: Tests iOS
- xcode_scheme: Gzip iOS
xcode_sdk: iphonesimulator
osx_image: xcode8

View File

@ -33,6 +33,7 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
2A321EDF1D4A58C7002B0245 /* zlib */ = {isa = PBXFileReference; lastKnownFileType = folder; path = zlib; sourceTree = "<group>"; };
2A58A7571B00F414005FBBC2 /* Tests macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
2A58A75C1B00F414005FBBC2 /* GzipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GzipTests.swift; sourceTree = "<group>"; };
2A58A7611B00F42C005FBBC2 /* Data+Gzip.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+Gzip.swift"; sourceTree = "<group>"; };
@ -43,8 +44,7 @@
2AE0508B1D4A2C070040E4C9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2AE050991D4A2DC30040E4C9 /* Gzip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Gzip.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2AE050A81D4A33A30040E4C9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2AF7F0BE1B6E1CD100EBA69A /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = SOURCE_ROOT; };
2AFCA7931B661CB5006DF1F4 /* zlib */ = {isa = PBXFileReference; lastKnownFileType = folder; name = zlib; path = ../zlib; sourceTree = "<group>"; };
2AF7F0BE1B6E1CD100EBA69A /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -118,8 +118,7 @@
children = (
2A58A7611B00F42C005FBBC2 /* Data+Gzip.swift */,
);
name = Sources;
path = ../Sources;
path = Sources;
sourceTree = "<group>";
};
2A58A7661B00F5CF005FBBC2 /* Libraries */ = {
@ -155,13 +154,13 @@
2AE0508B1D4A2C070040E4C9 /* Info.plist */,
);
name = "Supporting Files";
path = Gzip;
path = Project;
sourceTree = "<group>";
};
2AFCA7941B661CBA006DF1F4 /* Modules */ = {
isa = PBXGroup;
children = (
2AFCA7931B661CB5006DF1F4 /* zlib */,
2A321EDF1D4A58C7002B0245 /* zlib */,
2A58A7661B00F5CF005FBBC2 /* Libraries */,
);
name = Modules;
@ -452,10 +451,6 @@
2A58A7831B00FBF0005FBBC2 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.wolfrosch.$(PRODUCT_NAME:rfc1034identifier)";
@ -467,10 +462,6 @@
2A58A7841B00FBF0005FBBC2 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.wolfrosch.$(PRODUCT_NAME:rfc1034identifier)";
@ -491,7 +482,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
INFOPLIST_FILE = Gzip/Info.plist;
INFOPLIST_FILE = Project/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
@ -500,7 +491,7 @@
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_INCLUDE_PATHS = ../zlib;
SWIFT_INCLUDE_PATHS = zlib;
SWIFT_VERSION = 3.0;
};
name = Debug;
@ -514,7 +505,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Gzip/Info.plist;
INFOPLIST_FILE = Project/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
@ -522,7 +513,7 @@
PRODUCT_NAME = Gzip;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_INCLUDE_PATHS = ../zlib;
SWIFT_INCLUDE_PATHS = zlib;
SWIFT_VERSION = 3.0;
};
name = Release;
@ -539,14 +530,14 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_DYNAMIC_NO_PIC = NO;
INFOPLIST_FILE = Gzip/Info.plist;
INFOPLIST_FILE = Project/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wolfrosch.Gzip;
PRODUCT_NAME = Gzip;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_INCLUDE_PATHS = ../zlib;
SWIFT_INCLUDE_PATHS = zlib;
TARGETED_DEVICE_FAMILY = "1,2";
VERSION_INFO_PREFIX = "";
};
@ -562,14 +553,14 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Gzip/Info.plist;
INFOPLIST_FILE = Project/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wolfrosch.Gzip;
PRODUCT_NAME = Gzip;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_INCLUDE_PATHS = ../zlib;
SWIFT_INCLUDE_PATHS = zlib;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSION_INFO_PREFIX = "";