Skip to content

O
onlyoffice_core
Commit f501bf79 authored by Alexey.Musinov's avatar Alexey.Musinov
Browse files
Options

remove curl for ios

parent 7b617dc9
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 54 deletions
ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj
View file @ f501bf79
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
6967917D1D9E8AEE002CA4BA /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */; }; 6967917D1D9E8AEE002CA4BA /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */; };
6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */; }; 6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */; };
6967917F1D9E8AEE002CA4BA /* BinWriters.h in Headers */ = {isa = PBXBuildFile; fileRef = 6967917B1D9E8AEE002CA4BA /* BinWriters.h */; }; 6967917F1D9E8AEE002CA4BA /* BinWriters.h in Headers */ = {isa = PBXBuildFile; fileRef = 6967917B1D9E8AEE002CA4BA /* BinWriters.h */; };
69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */; };
69F181AF1C77274E00B2952B /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F181AD1C77274E00B2952B /* FileDownloader.h */; }; 69F181AF1C77274E00B2952B /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F181AD1C77274E00B2952B /* FileDownloader.h */; };
69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinReaderWriterDefines.h; path = ../../BinWriter/BinReaderWriterDefines.h; sourceTree = "<group>"; }; 696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinReaderWriterDefines.h; path = ../../BinWriter/BinReaderWriterDefines.h; sourceTree = "<group>"; };
6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BinWriters.cpp; path = ../../BinWriter/BinWriters.cpp; sourceTree = "<group>"; }; 6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BinWriters.cpp; path = ../../BinWriter/BinWriters.cpp; sourceTree = "<group>"; };
6967917B1D9E8AEE002CA4BA /* BinWriters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinWriters.h; path = ../../BinWriter/BinWriters.h; sourceTree = "<group>"; }; 6967917B1D9E8AEE002CA4BA /* BinWriters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinWriters.h; path = ../../BinWriter/BinWriters.h; sourceTree = "<group>"; };
69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = FileDownloader_mac.mm; path = ../../../Common/FileDownloader/FileDownloader_mac.mm; sourceTree = "<group>"; };
69F181AD1C77274E00B2952B /* FileDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader.h; path = ../../../Common/FileDownloader/FileDownloader.h; sourceTree = "<group>"; }; 69F181AD1C77274E00B2952B /* FileDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader.h; path = ../../../Common/FileDownloader/FileDownloader.h; sourceTree = "<group>"; };
69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownloader_curl.cpp; path = ../../../Common/FileDownloader/FileDownloader_curl.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
69F181AD1C77274E00B2952B /* FileDownloader.h */, 69F181AD1C77274E00B2952B /* FileDownloader.h */,
69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */, 69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */,
); );
name = Common; name = Common;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -339,7 +339,6 @@ ...@@ -339,7 +339,6 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */,
17C1FE961ACC42C4006B99B3 /* Common.cpp in Sources */, 17C1FE961ACC42C4006B99B3 /* Common.cpp in Sources */,
17C1FE971ACC42C4006B99B3 /* ChartFromToBinary.cpp in Sources */, 17C1FE971ACC42C4006B99B3 /* ChartFromToBinary.cpp in Sources */,
17C1FE981ACC42C4006B99B3 /* CSVReader.cpp in Sources */, 17C1FE981ACC42C4006B99B3 /* CSVReader.cpp in Sources */,
...@@ -348,6 +347,7 @@ ...@@ -348,6 +347,7 @@
17C1FE9B1ACC42C4006B99B3 /* CSVWriter.cpp in Sources */, 17C1FE9B1ACC42C4006B99B3 /* CSVWriter.cpp in Sources */,
69414A301CB51666003E771B /* ChartWriter.cpp in Sources */, 69414A301CB51666003E771B /* ChartWriter.cpp in Sources */,
6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */, 6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */,
69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */,
17C1FE9C1ACC42C4006B99B3 /* XlsxSerializer.cpp in Sources */, 17C1FE9C1ACC42C4006B99B3 /* XlsxSerializer.cpp in Sources */,
690FE0851E9BBD68004B26D0 /* Readers.cpp in Sources */, 690FE0851E9BBD68004B26D0 /* Readers.cpp in Sources */,
17C1FE9D1ACC42C4006B99B3 /* FontProcessor.cpp in Sources */, 17C1FE9D1ACC42C4006B99B3 /* FontProcessor.cpp in Sources */,
...@@ -379,6 +379,7 @@ ...@@ -379,6 +379,7 @@
unix, unix,
_IOS, _IOS,
DONT_WRITE_EMBEDDED_FONTS, DONT_WRITE_EMBEDDED_FONTS,
_XCODE,
); );
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
...@@ -416,6 +417,7 @@ ...@@ -416,6 +417,7 @@
unix, unix,
_IOS, _IOS,
DONT_WRITE_EMBEDDED_FONTS, DONT_WRITE_EMBEDDED_FONTS,
_XCODE,
); );
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
......
Common/FileDownloader/FileDownloader_mac.mm
View file @ f501bf79
#include "FileDownloader.h" #include "FileDownloader.h"
#include <Cocoa/Cocoa.h>
#if _IOS
#import <Foundation/Foundation.h>
#else
#include <Cocoa/Cocoa.h>
#endif
static NSString* StringWToNSString ( const std::wstring& Str ) static NSString* StringWToNSString ( const std::wstring& Str )
{ {
...@@ -34,21 +39,30 @@ public : ...@@ -34,21 +39,30 @@ public :
{ {
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *documentsDirectory = [paths objectAtIndex:0]; NSString *documentsDirectory = [paths objectAtIndex:0];
NSString *filePath = StringWToNSString ( m_sFilePath ); NSString *filePath = StringWToNSString ( m_sFilePath );
[urlData writeToFile:filePath atomically:YES]; [urlData writeToFile:filePath atomically:YES];
#ifndef _ASC_USE_ARC_ #if defined(_IOS)
return 0;
#else
#ifndef _ASC_USE_ARC_
[stringURL release]; [stringURL release];
[url release]; [url release];
[urlData release]; [urlData release];
#endif #endif
#endif
return 0; return 0;
} }
#ifndef _ASC_USE_ARC_
#if defined(_IOS)
return 1;
#else
#ifndef _ASC_USE_ARC_
[stringURL release]; [stringURL release];
[url release]; [url release];
#endif #endif
#endif
return 1; return 1;
} }
}; };
......
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.pbxproj
View file @ f501bf79
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
/* End PBXAggregateTarget section */ /* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
177C43321AD7C0EF00055DD7 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 177C432F1AD7C0D100055DD7 /* libcurl.a */; };
17C8DEC71ACD696100902C85 /* X2tConverter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17C27A191AC2DB3D00E1D003 /* X2tConverter.mm */; }; 17C8DEC71ACD696100902C85 /* X2tConverter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17C27A191AC2DB3D00E1D003 /* X2tConverter.mm */; };
17C8DECC1ACD696100902C85 /* X2tConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17C27A171AC2DB3D00E1D003 /* X2tConverter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 17C8DECC1ACD696100902C85 /* X2tConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17C27A171AC2DB3D00E1D003 /* X2tConverter.h */; settings = {ATTRIBUTES = (Public, ); }; };
691A8BD31E2FA68F00DCB54A /* liblibxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 691A8BD01E2FA67E00DCB54A /* liblibxml2.a */; }; 691A8BD31E2FA68F00DCB54A /* liblibxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 691A8BD01E2FA67E00DCB54A /* liblibxml2.a */; };
...@@ -59,20 +58,6 @@ ...@@ -59,20 +58,6 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
177C432E1AD7C0D100055DD7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 177C432A1AD7C0D000055DD7 /* libcurl.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = CD8AE2B416187F770095DC1B;
remoteInfo = curl;
};
177C43301AD7C0E400055DD7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 177C432A1AD7C0D000055DD7 /* libcurl.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = CD8AE2B316187F770095DC1B;
remoteInfo = curl;
};
17C8DEDB1ACD6A3900902C85 /* PBXContainerItemProxy */ = { 17C8DEDB1ACD6A3900902C85 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 17E17F561AC457CD00BEA2EA /* ASCOfficeDocxFile2Lib.xcodeproj */; containerPortal = 17E17F561AC457CD00BEA2EA /* ASCOfficeDocxFile2Lib.xcodeproj */;
...@@ -440,7 +425,6 @@ ...@@ -440,7 +425,6 @@
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
177C432A1AD7C0D000055DD7 /* libcurl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libcurl.xcodeproj; path = ../../../../Common/3dParty/curl/projects/Mac/libcurl.xcodeproj; sourceTree = "<group>"; };
17C27A171AC2DB3D00E1D003 /* X2tConverter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = X2tConverter.h; sourceTree = "<group>"; }; 17C27A171AC2DB3D00E1D003 /* X2tConverter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = X2tConverter.h; sourceTree = "<group>"; };
17C27A191AC2DB3D00E1D003 /* X2tConverter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = X2tConverter.mm; sourceTree = "<group>"; }; 17C27A191AC2DB3D00E1D003 /* X2tConverter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = X2tConverter.mm; sourceTree = "<group>"; };
17C8DED01ACD696100902C85 /* libX2tConverter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libX2tConverter.a; sourceTree = BUILT_PRODUCTS_DIR; }; 17C8DED01ACD696100902C85 /* libX2tConverter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libX2tConverter.a; sourceTree = BUILT_PRODUCTS_DIR; };
...@@ -509,21 +493,12 @@ ...@@ -509,21 +493,12 @@
69415F311CB51D41003E771B /* libASCOfficeDocxFile2Lib_ios.a in Frameworks */, 69415F311CB51D41003E771B /* libASCOfficeDocxFile2Lib_ios.a in Frameworks */,
69415F271CB51C37003E771B /* libOfficeUtils.a in Frameworks */, 69415F271CB51C37003E771B /* libOfficeUtils.a in Frameworks */,
698AF4C31C0745980080D889 /* libicu.a in Frameworks */, 698AF4C31C0745980080D889 /* libicu.a in Frameworks */,
177C43321AD7C0EF00055DD7 /* libcurl.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
177C432B1AD7C0D000055DD7 /* Products */ = {
isa = PBXGroup;
children = (
177C432F1AD7C0D100055DD7 /* libcurl.a */,
);
name = Products;
sourceTree = "<group>";
};
17C27A0B1AC2DB3C00E1D003 = { 17C27A0B1AC2DB3C00E1D003 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -548,7 +523,6 @@ ...@@ -548,7 +523,6 @@
69DA322C1CEE08DC00E10AF0 /* metafile.xcodeproj */, 69DA322C1CEE08DC00E10AF0 /* metafile.xcodeproj */,
69DA32261CEE087D00E10AF0 /* cximage.xcodeproj */, 69DA32261CEE087D00E10AF0 /* cximage.xcodeproj */,
698AF4BB1C0740960080D889 /* icu.xcodeproj */, 698AF4BB1C0740960080D889 /* icu.xcodeproj */,
177C432A1AD7C0D000055DD7 /* libcurl.xcodeproj */,
17E17F561AC457CD00BEA2EA /* ASCOfficeDocxFile2Lib.xcodeproj */, 17E17F561AC457CD00BEA2EA /* ASCOfficeDocxFile2Lib.xcodeproj */,
69DA32501CEE095900E10AF0 /* freetype.xcodeproj */, 69DA32501CEE095900E10AF0 /* freetype.xcodeproj */,
69DA325C1CEE09BB00E10AF0 /* PPTXFormatLib.xcodeproj */, 69DA325C1CEE09BB00E10AF0 /* PPTXFormatLib.xcodeproj */,
...@@ -859,7 +833,6 @@ ...@@ -859,7 +833,6 @@
69415FE21CB5245A003E771B /* PBXTargetDependency */, 69415FE21CB5245A003E771B /* PBXTargetDependency */,
69415FDF1CB5244D003E771B /* PBXTargetDependency */, 69415FDF1CB5244D003E771B /* PBXTargetDependency */,
698AF4C21C0745930080D889 /* PBXTargetDependency */, 698AF4C21C0745930080D889 /* PBXTargetDependency */,
177C43311AD7C0E400055DD7 /* PBXTargetDependency */,
69DA32EE1CEE100400E10AF0 /* PBXTargetDependency */, 69DA32EE1CEE100400E10AF0 /* PBXTargetDependency */,
17C8DEDC1ACD6A3900902C85 /* PBXTargetDependency */, 17C8DEDC1ACD6A3900902C85 /* PBXTargetDependency */,
); );
...@@ -936,10 +909,6 @@ ...@@ -936,10 +909,6 @@
ProductGroup = 69415FBE1CB5243F003E771B /* Products */; ProductGroup = 69415FBE1CB5243F003E771B /* Products */;
ProjectRef = 69415FBD1CB5243F003E771B /* jpeg.xcodeproj */; ProjectRef = 69415FBD1CB5243F003E771B /* jpeg.xcodeproj */;
}, },
{
ProductGroup = 177C432B1AD7C0D000055DD7 /* Products */;
ProjectRef = 177C432A1AD7C0D000055DD7 /* libcurl.xcodeproj */;
},
{ {
ProductGroup = 69415FBB1CB5243F003E771B /* Products */; ProductGroup = 69415FBB1CB5243F003E771B /* Products */;
ProjectRef = 69415FBA1CB5243F003E771B /* libpsd.xcodeproj */; ProjectRef = 69415FBA1CB5243F003E771B /* libpsd.xcodeproj */;
...@@ -1006,13 +975,6 @@ ...@@ -1006,13 +975,6 @@
/* End PBXProject section */ /* End PBXProject section */
/* Begin PBXReferenceProxy section */ /* Begin PBXReferenceProxy section */
177C432F1AD7C0D100055DD7 /* libcurl.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libcurl.a;
remoteRef = 177C432E1AD7C0D100055DD7 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
17E17F5B1AC457CD00BEA2EA /* libASCOfficeDocxFile2Lib_ios.a */ = { 17E17F5B1AC457CD00BEA2EA /* libASCOfficeDocxFile2Lib_ios.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
...@@ -1228,11 +1190,6 @@ ...@@ -1228,11 +1190,6 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
177C43311AD7C0E400055DD7 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = curl;
targetProxy = 177C43301AD7C0E400055DD7 /* PBXContainerItemProxy */;
};
17C8DEDC1ACD6A3900902C85 /* PBXTargetDependency */ = { 17C8DEDC1ACD6A3900902C85 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
name = ASCOfficeDocxFile2Lib_ios; name = ASCOfficeDocxFile2Lib_ios;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7