Remove travis build (#216)

This speed up PR process (requested by @K0R0L)
This build is deprecated, since build of project is moved
to another tool - `build_tool` since v5.5.0
And this config is never worked
See:
https://github.com/ONLYOFFICE/core/pull/29#issuecomment-306773327

.travis.yml

@@ -1,14 +0,0 @@
-language: cpp
-compiler: gcc
-dist: trusty
-addons:
-  apt:
-    packages:
-      - p7zip-full
-script:
-  - exit 0
-# Build fails anyway. See explanation in
-# https://github.com/ONLYOFFICE/core/pull/29#issuecomment-306773327
-  - cd Common/3dParty && ./make.sh
-  - cd ../../
-  - make

Common/3dParty/boost/boost.pri

@@ -1,8 +1,8 @@
-INCLUDEPATH += $$PWD/boost_1_58_0
+INCLUDEPATH += $$PWD/build/$$CORE_BUILDS_PLATFORM_PREFIX/include
 
 MSVC = vc140
 
-CORE_BOOST_LIBS = $$PWD/boost_1_58_0/build/$$CORE_BUILDS_PLATFORM_PREFIX/static
+CORE_BOOST_LIBS = $$PWD/build/$$CORE_BUILDS_PLATFORM_PREFIX/lib
 
 core_boost_libs {
 

Common/3dParty/boost/boost_ios.sh

@@ -51,7 +51,7 @@ SRCDIR=$TARBALLDIR
 
 BOOST_TARBALL=$TARBALLDIR/boost_$BOOST_VERSION2.tar.bz2
 BOOST_SRC=$SRCDIR/boost_${BOOST_VERSION2}
-PREFIXDIR=$BOOST_SRC/prefix
+PREFIXDIR=$SRCDIR/build/ios
 
 #===============================================================================
 # Functions
@@ -244,6 +244,7 @@ bootstrapBoost()
     BOOST_LIBS_COMMA=$(echo $BOOST_LIBS | sed -e "s/ /,/g")
     echo "Bootstrapping (with libs $BOOST_LIBS_COMMA)"
     ./bootstrap.sh --with-libraries=$BOOST_LIBS_COMMA
+    ./b2 headers
 
     doneSection
 }
@@ -285,12 +286,13 @@ generateOut()
     echo Generate Boost for iPhone
     mkdir -p $BOOST_SRC/build/ios/static
     for NAME in $BOOST_LIBS; do
+        rm -f $SRCDIR/build/ios/lib/libboost_${NAME}.a
         lipo -create $BOOST_SRC/iphone-build/stage/lib/libboost_${NAME}.a \
                      $BOOST_SRC/iphonesim-build/stage/lib/libboost_${NAME}.a \
-                     -o $BOOST_SRC/build/ios/static/libboost_${NAME}.a
+                     -o $SRCDIR/build/ios/lib/libboost_${NAME}.a
                      
-        lipo $BOOST_SRC/build/ios/static/libboost_${NAME}.a -remove i386 -o $BOOST_SRC/build/ios/static/libboost_${NAME}.a
-        lipo $BOOST_SRC/build/ios/static/libboost_${NAME}.a -remove armv4t -o $BOOST_SRC/build/ios/static/libboost_${NAME}.a
+        lipo $SRCDIR/build/ios/lib/libboost_${NAME}.a -remove i386 -o $SRCDIR/build/ios/lib/libboost_${NAME}.a
+        lipo $SRCDIR/build/ios/lib/libboost_${NAME}.a -remove armv4t -o $SRCDIR/build/ios/lib/libboost_${NAME}.a
     done
 
     doneSection

Common/base.pri

@@ -65,7 +65,7 @@ isEqual(QT_MAJOR_VERSION, 5) {
 
 ios {
     CONFIG += core_ios
-    DEFINES += _IOS IOS LINUX _LINUX _MAC _XCODE
+    DEFINES += _IOS IOS LINUX _LINUX MAC _MAC _XCODE
 }
 android {
     CONFIG += core_android
@@ -139,6 +139,17 @@ core_windows {
     QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
     QMAKE_CXXFLAGS -= -Zc:strictStrings
     QMAKE_CXXFLAGS += /MP
+
+    equals(TEMPLATE, app) {
+        core_win_64:QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE,5.02
+        core_win_32:QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE,5.01
+    }
+}
+
+core_linux {
+    equals(TEMPLATE, app) {
+        QMAKE_LFLAGS += -Wl,--rpath=./:./system
+    }
 }
 
 core_win_32 {

DesktopEditor/common/Directory.cpp

@@ -365,6 +365,118 @@ namespace NSDirectory
 #endif
 		return false;
 	}
+    bool CopyDirectory(const std::wstring& strSrc, const std::wstring& strDst, bool bIsRecursion)
+    {
+        if (!NSDirectory::Exists(strDst))
+            NSDirectory::CreateDirectory(strDst);
+
+#ifdef WIN32
+        WIN32_FIND_DATAW oFD;
+
+        std::wstring sSpec = strSrc + L"\\*.*";
+        HANDLE hRes = FindFirstFileW( sSpec.c_str(), &oFD );
+        if( INVALID_HANDLE_VALUE == hRes )
+            return false;
+        do
+        {
+            sSpec = oFD.cFileName;
+            if (sSpec != L"." && sSpec != L"..")
+            {
+                if( !( oFD.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) )
+                {
+                    NSFile::CFileBinary::Copy(strSrc + L"/" + sSpec, strDst + L"/" + sSpec);
+                }
+                else if (bIsRecursion)
+                {
+                    CopyDirectory(strSrc + L"/" + sSpec, strDst + L"/" + sSpec, bIsRecursion);
+                }
+            }
+        } while( FindNextFileW( hRes, &oFD ) );
+        FindClose( hRes );
+        return true;
+#endif
+
+#ifdef __linux__
+        BYTE* pUtf8 = NULL;
+        LONG lLen = 0;
+        NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strSrc.c_str(), strSrc.length(), pUtf8, lLen, false);
+        DIR *dp;
+        struct dirent *dirp;
+        if((dp  = opendir((char*)pUtf8)) != NULL)
+        {
+            while ((dirp = readdir(dp)) != NULL)
+            {
+                int nType = 0;
+                if(DT_REG == dirp->d_type)
+                    nType = 2;
+                else if (DT_DIR == dirp->d_type)
+                    nType = 1;
+                else if (DT_UNKNOWN == dirp->d_type)
+                {
+                     // XFS problem
+                     struct stat buff;
+                     std::string sTmp = std::string((char*)pUtf8) + "/" + std::string(dirp->d_name);
+                     stat(sTmp.c_str(), &buff);
+                     if (S_ISREG(buff.st_mode))
+                        nType = 2;
+                     else if (S_ISDIR(buff.st_mode))
+                        nType = 1;
+                }
+
+                if (2 == nType)
+                {
+                    std::wstring sName = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)dirp->d_name, strlen(dirp->d_name));
+                    NSFile::CFileBinary::Copy(strSrc + L"/" + sName, strDst + L"/" + sName);
+                }
+
+                if (bIsRecursion && (1 == nType))
+                {
+                    if(dirp->d_name[0] != '.')
+                    {
+                        std::wstring sName = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)dirp->d_name, strlen(dirp->d_name));
+                        CopyDirectory(strSrc + L"/" + sName, strDst + L"/" + sName, bIsRecursion);
+                    }
+                }
+            }
+            closedir(dp);
+        }
+        delete [] pUtf8;
+        return true;
+#endif
+
+#if defined(MAC) || defined (_IOS)
+        BYTE* pUtf8 = NULL;
+        LONG lLen = 0;
+        NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strSrc.c_str(), strSrc.length(), pUtf8, lLen, false);
+        DIR *dp;
+        struct dirent *dirp;
+        if((dp  = opendir((char*)pUtf8)) != NULL)
+        {
+            while ((dirp = readdir(dp)) != NULL)
+            {
+                if(DT_REG == dirp->d_type)
+                {
+                    std::wstring sName = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)dirp->d_name, strlen(dirp->d_name));
+                    NSFile::CFileBinary::Copy(strSrc + L"/" + sName, strDst + L"/" + sName);
+                }
+
+                if (bIsRecursion && DT_DIR == dirp->d_type)
+                {
+                    if(dirp->d_name[0] != '.')
+                    {
+                        std::wstring sName = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)dirp->d_name, strlen(dirp->d_name));
+                        CopyDirectory(strSrc + L"/" + sName, strDst + L"/" + sName, bIsRecursion);
+                    }
+                }
+            }
+            closedir(dp);
+        }
+        delete [] pUtf8;
+        return true;
+#endif
+
+        return false;
+    }
     void DeleteDirectory(const std::wstring& strDirectory, bool deleteRoot)
 	{
 		std::vector<std::wstring> aFiles = GetFiles(strDirectory);

DesktopEditor/common/Directory.h

@@ -33,6 +33,9 @@
 #if defined(CreateDirectory)
 #undef CreateDirectory
 #endif
+#if defined(CopyDirectory)
+#undef CopyDirectory
+#endif
 
 #ifndef _BUILD_DIRECTORY_CROSSPLATFORM_H_
 #define _BUILD_DIRECTORY_CROSSPLATFORM_H_
@@ -67,6 +70,7 @@ namespace NSDirectory
     KERNEL_DECL bool Exists(const std::wstring& strDirectory);
     KERNEL_DECL bool CreateDirectory(const std::wstring& strDirectory);
     KERNEL_DECL bool CreateDirectories(const std::wstring& strDirectory);
+    KERNEL_DECL bool CopyDirectory(const std::wstring& strSrc, const std::wstring& strDst, bool bIsRecursion = true);
     KERNEL_DECL void DeleteDirectory(const std::wstring& strDirectory, bool deleteRoot = true);
     KERNEL_DECL std::wstring GetFolderPath(const std::wstring& wsFolderPath);
     KERNEL_DECL std::wstring CreateTempFileWithUniqueName (const std::wstring & strFolderPathRoot, std::wstring Prefix);

DesktopEditor/doctrenderer/app_builder/docbuilder.pro

@@ -26,17 +26,6 @@ PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
 include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri)
 
-core_linux {
-    QMAKE_LFLAGS += -Wl,--rpath=./:./system
-}
-
-core_win_64 {
-    QMAKE_LFLAGS_CONSOLE  = /SUBSYSTEM:CONSOLE,5.02
-}
-core_win_32 {
-    QMAKE_LFLAGS_CONSOLE  = /SUBSYSTEM:CONSOLE,5.01
-}
-
 CUSTOM_VERSION_PATH = $$(DOCBUILDER_VERSION_PATH)
 isEmpty(CUSTOM_VERSION_PATH){
     CUSTOM_VERSION_PATH=.

DesktopEditor/doctrenderer/nativecontrol.cpp

@@ -145,6 +145,12 @@ void _SetFilePath(const v8::FunctionCallbackInfo<v8::Value>& args)
     CNativeControl* pNative = unwrap_nativeobject(args.This());
     pNative->SetFilePath(CV8Convert::ToString(args[0]));
 }
+void _GetImagesPath(const v8::FunctionCallbackInfo<v8::Value>& args)
+{
+    CNativeControl* pNative = unwrap_nativeobject(args.This());
+    std::string sReturn = NSFile::CUtf8Converter::GetUtf8StringFromUnicode(pNative->m_strImagesDirectory);
+    args.GetReturnValue().Set(v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), sReturn.c_str()));
+}
 
 void _GetFontsDirectory(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
@@ -554,6 +560,7 @@ v8::Handle<v8::ObjectTemplate> CreateNativeControlTemplate(v8::Isolate* isolate)
     result->Set(current, "ZipClose",           v8::FunctionTemplate::New(current, _zipCloseFile));
 
     result->Set(current, "getImageUrl", v8::FunctionTemplate::New(current, _GetImageUrl));
+    result->Set(current, "getImagesDirectory", v8::FunctionTemplate::New(current, _GetImagesPath));
 
     // возвращаем временный хэндл хитрым образом, который переносит наш хэндл в предыдущий HandleScope и не дает ему
     // уничтожиться при уничтожении "нашего" HandleScope - handle_scope
@@ -604,6 +611,7 @@ v8::Handle<v8::ObjectTemplate> CreateNativeControlTemplateBuilder(v8::Isolate* i
     result->Set(current, "ZipClose",           v8::FunctionTemplate::New(current, _zipCloseFile));
 
     result->Set(current, "getImageUrl", v8::FunctionTemplate::New(current, _GetImageUrl));
+    result->Set(current, "getImagesDirectory", v8::FunctionTemplate::New(current, _GetImagesPath));
 
     // возвращаем временный хэндл хитрым образом, который переносит наш хэндл в предыдущий HandleScope и не дает ему
     // уничтожиться при уничтожении "нашего" HandleScope - handle_scope

DesktopEditor/doctrenderer/nativecontrol.h

@@ -461,6 +461,7 @@ CNativeControl* unwrap_nativeobject(v8::Handle<v8::Object> obj);
 
 void _GetFilePath(const v8::FunctionCallbackInfo<v8::Value>& args);
 void _SetFilePath(const v8::FunctionCallbackInfo<v8::Value>& args);
+void _GetImagesPath(const v8::FunctionCallbackInfo<v8::Value>& args);
 
 void _GetFontsDirectory(const v8::FunctionCallbackInfo<v8::Value>& args);
 void _GetEditorType(const v8::FunctionCallbackInfo<v8::Value>& args);

X2tConverter/build/Qt/X2tConverter.pri

@@ -18,21 +18,10 @@ include(../../../Common/3dParty/icu/icu.pri)
 
 core_windows {
     QMAKE_LFLAGS += /INCREMENTAL:NO
-
-    contains(QMAKE_TARGET.arch, x86_64):{
-        QMAKE_LFLAGS_CONSOLE  = /SUBSYSTEM:CONSOLE,5.02
-    } else {
-        QMAKE_LFLAGS_CONSOLE  = /SUBSYSTEM:CONSOLE,5.01
-    }
-
 } else {
     QMAKE_CXXFLAGS += -Wall -Wno-ignored-qualifiers
 }
 
-core_linux {
-    QMAKE_LFLAGS += -Wl,--rpath=./:./system
-}
-
 DEFINES += UNICODE \
     _UNICODE \
     #DISABLE_FILE_DOWNLOADER \