pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win-nix] refactoring

Browse Source
This commit is contained in:
Maxim Kadushkin
2017-07-13 14:30:16 +03:00
parent c4ee2f900b
commit ae3053e20d
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win-linux/ASCDocumentEditor.pro
View File

@ -7,11 +7,9 @@ INCLUDEPATH += $$PWD/src/prop \
$$PWD/src
HEADERS += \
src/clogger.h \
src/prop/defines_p.h
SOURCES += \
src/clogger.cpp \
src/prop/csplash.cpp \
src/prop/ccefeventsimpl.cpp \
src/prop/cmainpanelimpl.cpp \

2
win-linux/defaults.pri
View File

@ -39,6 +39,7 @@ HEADERS += \
$$PWD/src/csplash.h \
$$PWD/src/cmessage.h \
$$PWD/src/cfilechecker.h \
$$PWD/src/clogger.h \
$$PWD/src/clangater.h
# src/ctabbar_p.h \
# src/ctabstyle.h \
@ -61,6 +62,7 @@ SOURCES += \
$$PWD/src/cmainpanel.cpp \
$$PWD/src/cmessage.cpp \
$$PWD/src/cfilechecker.cpp \
$$PWD/src/clogger.cpp \
$$PWD/src/clangater.cpp
# src/ctabstyle.cpp
# src/casclabel.cpp

17
win-linux/package/windows/common.iss
View File

@ -135,7 +135,6 @@ function CheckCommandlineParam(inpn: String) : Boolean; forward;
function StartsWith(SubStr, S: String) : Boolean; forward;
function StringReplace(S, oldSubString, newSubString: String) : String; forward;
procedure CleanDir(path: string); forward;
procedure DirectoryCopy(SourcePath, DestPath: string); forward;
//procedure checkArchitectureVersion; forward;
@ -282,9 +281,14 @@ begin
end;
function PrepareToInstall(var NeedsRestart: Boolean): String;
var
path: string;
begin
CleanDir(ExpandConstant('{app}\editors\web-apps'));
CleanDir(ExpandConstant('{app}\editors\sdkjs'));
path := ExpandConstant('{app}\editors\web-apps');
if DirExists(path) then DelTree(path, true, true, true)
path := ExpandConstant('{app}\editors\sdkjs');
if DirExists(path) then DelTree(path, true, true, true)
end;
function getAppMutex(P: String): String;
@ -498,13 +502,6 @@ begin
end;
end;
procedure CleanDir(path: string);
begin
if DirExists(path) then begin
DelTree(path, true, true, true)
end;
end;
[Dirs]
Name: {commonappdata}\{#APP_PATH}\webdata\cloud; Flags: uninsalwaysuninstall;