Commit 739c6b64 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov

miss mac build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68992 954022d7-b5bf-4e40-9824-e11837661b57
parent a51d2e11
......@@ -9293,6 +9293,31 @@ UnicodeConverter/test/testfiles/32_utf8.txt svn_mime_002dtype=application%2Focte
UnicodeConverter/test/testfiles/41_utf8.txt svn_mime_002dtype=application%2Foctet-stream
UnicodeConverter/test/testfiles/42_utf8.txt svn_mime_002dtype=application%2Foctet-stream
UnicodeConverter/test/testfiles/43_utf8.txt svn_mime_002dtype=application%2Foctet-stream
X2tConverter/build/Mac/X2tConverter svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter.xcworkspace svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter.xcworkspace/xcuserdata svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter.xcworkspace/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter.xcworkspace/xcuserdata/alexey.musinov.xcuserdatad/UserInterfaceState.xcuserstate svn_mime_002dtype=application%2Foctet-stream
X2tConverter/build/Mac/X2tConverter.xcworkspace/xcuserdata/alexey.musinov.xcuserdatad/xcdebugger svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter/X2tConverter svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.xcworkspace svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.xcworkspace/xcuserdata svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.xcworkspace/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.xcworkspace/xcuserdata/alexey.musinov.xcuserdatad/UserInterfaceState.xcuserstate svn_mime_002dtype=application%2Foctet-stream
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/xcuserdata svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverterCommandLineTool svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverterCommandLineTool/X2tConverterCommandLineTool svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverterCommandLineTool/X2tConverterCommandLineTool.xcodeproj svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverterCommandLineTool/X2tConverterCommandLineTool.xcodeproj/project.xcworkspace svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverterCommandLineTool/X2tConverterCommandLineTool.xcodeproj/project.xcworkspace/xcuserdata svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverterCommandLineTool/X2tConverterCommandLineTool.xcodeproj/project.xcworkspace/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverterCommandLineTool/X2tConverterCommandLineTool.xcodeproj/project.xcworkspace/xcuserdata/alexey.musinov.xcuserdatad/UserInterfaceState.xcuserstate svn_mime_002dtype=application%2Foctet-stream
X2tConverter/build/Mac/X2tConverterCommandLineTool/X2tConverterCommandLineTool.xcodeproj/xcuserdata svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverterCommandLineTool/X2tConverterCommandLineTool.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
X2tConverter/build/Mac/X2tConverterCommandLineTool/X2tConverterCommandLineTool.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes svnc_tsvn_003alogminsize=5
X2tConverter/test/TestIOSX2tConverter svnc_tsvn_003alogminsize=5
X2tConverter/test/TestIOSX2tConverter/TestIOSX2tConverter svnc_tsvn_003alogminsize=5
X2tConverter/test/TestIOSX2tConverter/TestIOSX2tConverter.xcodeproj svnc_tsvn_003alogminsize=5
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:TestIOSX2tConverter/TestIOSX2tConverter.xcodeproj">
</FileRef>
<FileRef
location = "group:TestMacX2tConverter/../X2tConverter/X2tConverter.xcodeproj">
</FileRef>
<FileRef
location = "group:TestMacX2tConverter/TestMacX2tConverter.xcodeproj">
</FileRef>
</Workspace>
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../ServerComponents/XlsxSerializerCom/Reader/BinaryWriter.h"
timestampString = "458210637.264768"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "3511"
endingLineNumber = "3511"
landmarkName = "writeTheme(BYTE* pData, long nLength, CString&amp; sFileOutput)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../ServerComponents/XlsxSerializerCom/Reader/BinaryWriter.h"
timestampString = "458210645.92566"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "3700"
endingLineNumber = "3700"
landmarkName = "getDefaultCellStyles(CString&amp; sFileInput, CString&amp; sFileOutput, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager, OOX::Spreadsheet::CIndexedColors* oIndexedColors, OOX::CTheme* pTheme, DocWrapper::FontProcessor&amp; oFontProcessor)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../ServerComponents/XlsxSerializerCom/Reader/BinaryWriter.h"
timestampString = "458211532.014696"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "3761"
endingLineNumber = "3761"
landmarkName = "getDefaultTableStyles(CString&amp; sFileInput, CString&amp; sFileOutput, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager, OOX::Spreadsheet::CIndexedColors* oIndexedColors, OOX::CTheme* pTheme, DocWrapper::FontProcessor&amp; oFontProcessor)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../ServerComponents/DesktopEditor/cximage/jpeg/rdjpgcom.c"
timestampString = "461258689.315854"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "233"
endingLineNumber = "233"
landmarkName = "process_COM()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../ServerComponents/DesktopEditor/cximage/jpeg/rdjpgcom.c"
timestampString = "461258691.60528"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "271"
endingLineNumber = "271"
landmarkName = "process_COM()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../ServerComponents/Common/3dParty/curl/src/tool_operate.c"
timestampString = "461258695.695935"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1789"
endingLineNumber = "1789"
landmarkName = "operate()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:X2tConverter.xcodeproj">
</FileRef>
</Workspace>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Build_framework_ios.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>44</integer>
</dict>
<key>X2tConverter.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>20</integer>
</dict>
<key>X2tConverter_framework.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>21</integer>
</dict>
<key>X2tConverter_ios.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>43</integer>
</dict>
<key>X2tConverter_mac.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>42</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>171E6AC11ACD5599005B8529</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>171E6ACB1ACD55FE005B8529</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>171E6ADE1ACD5617005B8529</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17C1E3E41AD40E2E001E3D18</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17C27A131AC2DB3C00E1D003</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17C27A1E1AC2DB3F00E1D003</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17C27A2E1AC2DC5D00E1D003</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17C8DEC11ACD696100902C85</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17DAB6A71ACC3790005AF479</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17DAB6B71ACC37A8005AF479</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17DAB6CA1ACC37C5005AF479</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17DAB6D41ACC37C5005AF479</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17DAB6E21ACC3840005AF479</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
//
// X2tConverter.h
// X2tConverter
//
// Created by alexey.musinov on 25.03.15.
// Copyright (c) 2015 Ascensio System SIA. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface X2tConverter : NSObject
- (int)sdk_docx2doct_bin:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_docx2doct:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_doct_bin2docx:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath fromChanges:(NSNumber*)fromChanges nsThemeDir:(NSString*)nsThemeDir;
- (int)sdk_doct2docx:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath fromChanges:(NSNumber*)fromChanges nsThemeDir:(NSString*)nsThemeDir;
- (int)sdk_xlsx2xlst_bin:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_xlsx2xlst:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_xlst_bin2xlsx:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath fromChanges:(NSNumber*)fromChanges nsThemeDir:(NSString*)nsThemeDir;
- (int)sdk_xlst2xlsx:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath fromChanges:(NSNumber*)fromChanges nsThemeDir:(NSString*)nsThemeDir;
- (int)sdk_pptx2pptt_bin:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_pptx2pptt:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_pptt_bin2pptx:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath fromChanges:(NSNumber*)fromChanges nsThemeDir:(NSString*)nsThemeDir;
- (int)sdk_pptt2pptx:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath fromChanges:(NSNumber*)fromChanges nsThemeDir:(NSString*)nsThemeDir;
- (int)sdk_csv2xlst:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_csv2xlsx:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_xlst2csv:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_xlsx2csv:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;
- (int)sdk_dir2zip:(NSString*)nsFrom nsTo:(NSString*)nsTo;
- (int)sdk_zip2dir:(NSString*)nsFrom nsTo:(NSString*)nsTo;
@end
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:X2tConverterCommandLineTool.xcodeproj">
</FileRef>
</Workspace>
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0640"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17DAB64D1ACC0F1C005AF479"
BuildableName = "X2tConverterCommandLineTool"
BlueprintName = "X2tConverterCommandLineTool"
ReferencedContainer = "container:X2tConverterCommandLineTool.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17DAB64D1ACC0F1C005AF479"
BuildableName = "X2tConverterCommandLineTool"
BlueprintName = "X2tConverterCommandLineTool"
ReferencedContainer = "container:X2tConverterCommandLineTool.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17DAB64D1ACC0F1C005AF479"
BuildableName = "X2tConverterCommandLineTool"
BlueprintName = "X2tConverterCommandLineTool"
ReferencedContainer = "container:X2tConverterCommandLineTool.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17DAB64D1ACC0F1C005AF479"
BuildableName = "X2tConverterCommandLineTool"
BlueprintName = "X2tConverterCommandLineTool"
ReferencedContainer = "container:X2tConverterCommandLineTool.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>X2tConverterCommandLineTool.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>17DAB64D1ACC0F1C005AF479</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
//
// main.m
// X2tConverterCommandLineTool
//
// Created by alexey.musinov on 01.04.15.
// Copyright (c) 2015 Ascensio System SIA. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "X2tConverter.h"
int main(int argc, const char * argv[]) {
@autoreleasepool {
//int * crash = NULL;//test
//*crash = 1;
NSArray *arguments = [[NSProcessInfo processInfo] arguments];
if (arguments && arguments.count >= 4) {
NSDate *startTime = [NSDate date];
NSString* fullFileName = arguments[1];
NSString* fullFileNameTo = arguments[2];
NSString* tempDir = arguments[3];
NSString* fontsPath = arguments[4];
X2tConverter* converter = [[X2tConverter alloc]init];
[converter sdk_docx2doct_bin:fullFileName nsTo:fullFileNameTo nsTemp:tempDir nsFontPath:fontsPath];
NSLog(@"%@ - time conversion: %fs", fullFileName, [[NSDate date] timeIntervalSinceDate:startTime]);
}
}
return 0;
}
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:X2tConverterMacOS.xcodeproj">
</FileRef>
</Workspace>
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