From e5b5f3d8e1caad2ca8aff18fde4804134e72193c Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 4 Aug 2016 08:02:52 +0200 Subject: [PATCH] Added submodule, tweaked PRO. --- .gitmodules | 6 +++--- resources/scripts/findreplace | 1 - resources/scripts/sed | 1 + rssguard.pro | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 160000 resources/scripts/findreplace create mode 160000 resources/scripts/sed diff --git a/.gitmodules b/.gitmodules index f22fa3235..30fff3e33 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,6 @@ [submodule "resources/scripts/nsis"] path = resources/scripts/nsis url = https://github.com/martinrotter/nsis.git -[submodule "resources/scripts/findreplace"] - path = resources/scripts/findreplace - url = https://github.com/martinrotter/findreplace.git +[submodule "resources/scripts/sed"] + path = resources/scripts/sed + url = https://github.com/martinrotter/sed.git diff --git a/resources/scripts/findreplace b/resources/scripts/findreplace deleted file mode 160000 index b72408bec..000000000 --- a/resources/scripts/findreplace +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b72408bece60b888a9257da2039441b221803a19 diff --git a/resources/scripts/sed b/resources/scripts/sed new file mode 160000 index 000000000..786fe1fd4 --- /dev/null +++ b/resources/scripts/sed @@ -0,0 +1 @@ +Subproject commit 786fe1fd494dfc076722fb07c49801de66a6428c diff --git a/rssguard.pro b/rssguard.pro index f224a01bb..23295a029 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -489,7 +489,7 @@ win32 { nsis.target = nsis nsis.depends = install nsis.commands = \ - $$shell_path($$shell_quote($$PWD/resources/scripts/findreplace/findreplace/bin/Release/findreplace.exe)) @APP_VERSION@ $$shell_quote($$APP_VERSION) @APP_NAME@ $$shell_quote($$APP_NAME) @APP_LOW_NAME@ $$shell_quote($$APP_LOW_NAME) @EXE_NAME@ $$shell_quote($${APP_LOW_NAME}.exe) @PWD@ $$shell_path($$shell_quote($$PWD)) @OUT_PWD@ $$shell_path($$shell_quote($$OUT_PWD)) $$shell_path($$shell_quote($$PWD/resources/nsis/NSIS.definitions.nsh.in)) > $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh)) && \ + $$shell_path($$shell_quote($$PWD/resources/scripts/sed/sed.exe)) -e \"s|@APP_VERSION@|$$APP_VERSION|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\" $$shell_path($$shell_quote($$PWD/resources/nsis/NSIS.definitions.nsh.in)) > $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh)) && \ xcopy /Y $$shell_path($$shell_quote($$PWD/resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/)) && \ $$shell_path($$shell_quote($$PWD/resources/scripts/nsis/makensis.exe)) $$shell_path($$shell_quote($$OUT_PWD/NSIS.template.in))