FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dump "sed" stuff.

Browse Source
This commit is contained in:
Martin Rotter 2021-01-20 19:48:22 +01:00
parent ff969016db
commit f0f3d7dfe2
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/nsis/NSIS.definitions.nsh.in
View File

@ -1,6 +1,6 @@
; This file is part of RSS Guard. ; This file is part of RSS Guard.
; ;
; Copyright (C) 2011-2015 by Martin Rotter <rotter.martinos@gmail.com> ; Copyright (C) 2011-2021 by Martin Rotter <rotter.martinos@gmail.com>
; ;
; RSS Guard is free software: you can redistribute it and/or modify ; RSS Guard is free software: you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by ; it under the terms of the GNU General Public License as published by
@ -20,7 +20,7 @@
!define APP_VERSION "@APP_VERSION@" !define APP_VERSION "@APP_VERSION@"
!define APP_NAME "@APP_NAME@" !define APP_NAME "@APP_NAME@"
!define EXE_NAME "@EXE_NAME@" !define EXE_NAME "@EXE_NAME@"
!define README_FILE "README" ;!define README_FILE "README"
!define LICENSE_FILE "@PWD@\..\..\resources\text\COPYING_GNU_GPL" !define LICENSE_FILE "@PWD@\..\..\resources\text\COPYING_GNU_GPL"
!define MUI_ICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico" !define MUI_ICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico"
!define MUI_UNICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico" !define MUI_UNICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico"

5
resources/nsis/NSIS.template.in
View File

@ -1,6 +1,6 @@
; This file is part of RSS Guard. ; This file is part of RSS Guard.
; ;
; Copyright (C) 2011-2014 by Martin Rotter <rotter.martinos@gmail.com> ; Copyright (C) 2011-2021 by Martin Rotter <rotter.martinos@gmail.com>
; ;
; RSS Guard is free software: you can redistribute it and/or modify ; RSS Guard is free software: you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by ; it under the terms of the GNU General Public License as published by
@ -15,6 +15,9 @@
; You should have received a copy of the GNU General Public License ; You should have received a copy of the GNU General Public License
; along with RSS Guard. If not, see <http:;www.gnu.org/licenses/>. ; along with RSS Guard. If not, see <http:;www.gnu.org/licenses/>.
;--------------------------------
; Unicode baby.
Unicode True
;-------------------------------- ;--------------------------------
; Do necessary inclusions. ; Do necessary inclusions.

2
resources/scripts/7za

@ -1 +1 @@
Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9 Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749

4
src/librssguard/services/standard/gui/formeditstandardaccount.cpp
View File

@ -15,7 +15,3 @@ void FormEditStandardAccount::apply() {
applyInternal<StandardServiceRoot>(); applyInternal<StandardServiceRoot>();
accept(); accept();
} }
void FormEditStandardAccount::setEditableAccount(ServiceRoot* editable_account) {
FormAccountDetails::setEditableAccount(editable_account);
}

3
src/librssguard/services/standard/gui/formeditstandardaccount.h
View File

@ -11,9 +11,6 @@ class FormEditStandardAccount : public FormAccountDetails {
protected slots: protected slots:
virtual void apply(); virtual void apply();
protected:
virtual void setEditableAccount(ServiceRoot* editable_account);
}; };
#endif // FORMEDITSTANDARDACCOUNT_H #endif // FORMEDITSTANDARDACCOUNT_H

6
src/rssguard/rssguard.pro
View File

@ -52,11 +52,11 @@ unix: LIBS += -L$$OUT_PWD/../librssguard/ -lrssguard
win32 { win32 {
# Prepare files for NSIS. # Prepare files for NSIS.
SEDREPLACE = "s|@APP_VERSION@|$$APP_VERSION|g; s|@APP_WIN_ARCH@|$$APP_WIN_ARCH|g; s|@APP_REVISION@|$$APP_REVISION|g; s|@APP_NAME@|$$APP_NAME|g; s|@APP_LOW_NAME@|$$APP_LOW_NAME|g; s|@EXE_NAME@|$${APP_LOW_NAME}.exe|g; s|@PWD@|$$replace(PWD, /, \\\\)|g; s|@OUT_PWD@|$$replace(OUT_PWD, /, \\\\)|g" SEDREPLACE = "| ForEach-Object { $_ -replace '@APP_VERSION@', '$$APP_VERSION' -replace '@APP_WIN_ARCH@', '$$APP_WIN_ARCH' -replace '@APP_REVISION@', '$$APP_REVISION' -replace '@APP_NAME@', '$$APP_NAME' -replace '@APP_LOW_NAME@', '$$APP_LOW_NAME' -replace '@EXE_NAME@', '$${APP_LOW_NAME}.exe' -replace '@PWD@', '$$replace(PWD, /, \\\\)' -replace '@OUT_PWD@', '$$replace(OUT_PWD, /, \\\\)' }"
message($$MSG_PREFIX: Sed replace string: \"$$SEDREPLACE\") message($$MSG_PREFIX: Sed replace string: \"$$SEDREPLACE\")
FULLSEDCMD = "$$shell_path($$shell_quote($$PWD/../../resources/scripts/sed/sed.exe)) -e \"$$SEDREPLACE\" \"$$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.definitions.nsh.in))\" > \"$$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh))\"" FULLSEDCMD = "powershell -Command \"cat $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.definitions.nsh.in)) $$SEDREPLACE | Out-File $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh))\""
message($$MSG_PREFIX: Full sed command: $$FULLSEDCMD) message($$MSG_PREFIX: Full powershell command: $$FULLSEDCMD)
system(xcopy /Y $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/))) system(xcopy /Y $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/)))
system($$FULLSEDCMD) system($$FULLSEDCMD)