Skip to content

Commit

Permalink
Libmacgpg as a symlink.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mento committed May 15, 2013
1 parent a2bbbbd commit b9d0c9e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 92 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -16,3 +16,4 @@ profile
*.moved-aside
.DS_Store
Dependencies/GPGTools_Core
Dependencies/Libmacgpg
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

1 change: 0 additions & 1 deletion Dependencies/Libmacgpg
Submodule Libmacgpg deleted from 4b4f7c
88 changes: 0 additions & 88 deletions GPGServices.xcodeproj/project.pbxproj
Expand Up @@ -54,41 +54,6 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
301B027A16FB61BE00802C47 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 307FE34D16D42765006E8265 /* Libmacgpg.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 30DF7CB816D39EAA00C8225C;
remoteInfo = installerHelper;
};
307FE35416D42766006E8265 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 307FE34D16D42765006E8265 /* Libmacgpg.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
remoteInfo = Libmacgpg;
};
307FE35616D42766006E8265 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 307FE34D16D42765006E8265 /* Libmacgpg.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 30C8B38E139503A800F49AA1;
remoteInfo = UnitTest;
};
307FE35816D42766006E8265 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 307FE34D16D42765006E8265 /* Libmacgpg.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1B46CFCC161555DF00CF9C5F;
remoteInfo = org.gpgtools.Libmacgpg.xpc;
};
307FE35B16D42776006E8265 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 307FE34D16D42765006E8265 /* Libmacgpg.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
remoteInfo = Libmacgpg;
};
8EDC4076133F650800D0A101 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8EDC405B133F650800D0A101 /* ZipKit.xcodeproj */;
Expand Down Expand Up @@ -157,7 +122,6 @@
3058B7D014D56C6700AA8881 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/VerificationResultsWindow.xib; sourceTree = "<group>"; };
3058B7D314D56C6A00AA8881 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
305E3FE216FFD70000CE05C2 /* InProgressWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = InProgressWindow.xib; sourceTree = "<group>"; };
307FE34D16D42765006E8265 /* Libmacgpg.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Libmacgpg.xcodeproj; path = Dependencies/Libmacgpg/Libmacgpg.xcodeproj; sourceTree = "<group>"; };
30B2054214D56EBF00AE9583 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.xib.strings; sourceTree = "<group>"; };
30B2054414D56EBF00AE9583 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PrivateKeyChooserWindow.xib.strings; sourceTree = "<group>"; };
30B2054614D56EBF00AE9583 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/RecipientWindow.xib.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -297,7 +261,6 @@
22CA686C12DFD8B400ED919C /* Dependencies */ = {
isa = PBXGroup;
children = (
307FE34D16D42765006E8265 /* Libmacgpg.xcodeproj */,
8EDC405B133F650800D0A101 /* ZipKit.xcodeproj */,
);
name = Dependencies;
Expand Down Expand Up @@ -358,17 +321,6 @@
path = Images;
sourceTree = "<group>";
};
307FE34E16D42765006E8265 /* Products */ = {
isa = PBXGroup;
children = (
307FE35516D42766006E8265 /* Libmacgpg.framework */,
307FE35716D42766006E8265 /* UnitTest.octest */,
307FE35916D42766006E8265 /* org.gpgtools.Libmacgpg.xpc */,
301B027B16FB61BE00802C47 /* installerHelper */,
);
name = Products;
sourceTree = "<group>";
};
30B2057A14D56F3500AE9583 /* Strings */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -460,7 +412,6 @@
buildRules = (
);
dependencies = (
307FE35C16D42776006E8265 /* PBXTargetDependency */,
8EDC40F4133F6B3E00D0A101 /* PBXTargetDependency */,
);
name = GPGServices;
Expand Down Expand Up @@ -493,10 +444,6 @@
mainGroup = 29B97314FDCFA39411CA2CEA /* GPGServices */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 307FE34E16D42765006E8265 /* Products */;
ProjectRef = 307FE34D16D42765006E8265 /* Libmacgpg.xcodeproj */;
},
{
ProductGroup = 8EDC405C133F650800D0A101 /* Products */;
ProjectRef = 8EDC405B133F650800D0A101 /* ZipKit.xcodeproj */;
Expand All @@ -510,34 +457,6 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
301B027B16FB61BE00802C47 /* installerHelper */ = {
isa = PBXReferenceProxy;
fileType = "compiled.mach-o.executable";
path = installerHelper;
remoteRef = 301B027A16FB61BE00802C47 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
307FE35516D42766006E8265 /* Libmacgpg.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Libmacgpg.framework;
remoteRef = 307FE35416D42766006E8265 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
307FE35716D42766006E8265 /* UnitTest.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = UnitTest.octest;
remoteRef = 307FE35616D42766006E8265 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
307FE35916D42766006E8265 /* org.gpgtools.Libmacgpg.xpc */ = {
isa = PBXReferenceProxy;
fileType = "compiled.mach-o.executable";
path = org.gpgtools.Libmacgpg.xpc;
remoteRef = 307FE35816D42766006E8265 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8EDC4077133F650800D0A101 /* ZipKit.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
Expand Down Expand Up @@ -642,11 +561,6 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
307FE35C16D42776006E8265 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Libmacgpg;
targetProxy = 307FE35B16D42776006E8265 /* PBXContainerItemProxy */;
};
8EDC40F4133F6B3E00D0A101 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = ZipKit;
Expand Down Expand Up @@ -775,7 +689,6 @@
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
"\"$(SRCROOT)/Dependencies/Libmacgpg/build/$CONFIGURATION\"",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/Dependencies/zipkit/build/$CONFIGURATION\"";
Expand Down Expand Up @@ -803,7 +716,6 @@
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
"\"$(SRCROOT)/Dependencies/Libmacgpg/build/$CONFIGURATION\"",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/Dependencies/zipkit/build/$CONFIGURATION\"";
Expand Down
1 change: 1 addition & 0 deletions Makefile
Expand Up @@ -2,6 +2,7 @@ PROJECT = GPGServices
TARGET = GPGServices
PRODUCT = GPGServices.service
MAKE_DEFAULT = Dependencies/GPGTools_Core/newBuildSystem/Makefile.default
NEED_LIBMACGPG = 1


-include $(MAKE_DEFAULT)
Expand Down

0 comments on commit b9d0c9e

Please sign in to comment.