kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-24 04:32:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #483 from kiwix/repro_build

Browse Source 
Repro build
This commit is contained in:
Kelson 2020-07-08 09:43:59 +02:00 committed by GitHub
commit 004bd9de4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kiwix-desktop.pro
View File

@ -17,16 +17,7 @@ TEMPLATE = app
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
QMAKE_LFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11
unix { DEFINES += VERSION="2.0.3"
DEFINES += GIT_VERSION='"$(shell cd $$PWD && git describe --dirty=* --tags --always)"'
DEFINES += BUILD_DATE='"$(shell date)"'
}
win32 {
DEFINES += GIT_VERSION='"$$system(cd $$PWD && git describe --dirty=* --tags --always)"'
DEFINES += BUILD_DATE='"$$system(echo %DATE%)"'
}
# The following define makes your compiler emit warnings if you use # The following define makes your compiler emit warnings if you use
# any feature of Qt which has been marked as deprecated (the exact warnings # any feature of Qt which has been marked as deprecated (the exact warnings

3
resources/i18n/en.json
View File

@ -70,11 +70,10 @@
"release":"Release", "release":"Release",
"source-code":"This software is released under the terms of the GNU General Public License version 3. View the source code on", "source-code":"This software is released under the terms of the GNU General Public License version 3. View the source code on",
"version":"Version", "version":"Version",
"build-date":"Build date",
"reporting-problem":"Reporting problem", "reporting-problem":"Reporting problem",
"report-issue-1/3":"To open an issue, visit", "report-issue-1/3":"To open an issue, visit",
"report-issue-2/3":"and open an issue describing your problem.", "report-issue-2/3":"and open an issue describing your problem.",
"report-issue-3/3":"Please mention the version and the build date in the issue.", "report-issue-3/3":"Please mention the version in the issue.",
"libraries":"Libraries", "libraries":"Libraries",
"kiwix-server-running-message":"The Kiwix Server is running and can be accessed in the local network at :", "kiwix-server-running-message":"The Kiwix Server is running and can be accessed in the local network at :",
"kiwix-server-description":"Starting a server allows other computers in the local network to access your Kiwix library with a standard web browser.", "kiwix-server-description":"Starting a server allows other computers in the local network to access your Kiwix library with a standard web browser.",

3
resources/kiwix.qrc
View File

@ -72,7 +72,4 @@
<file>icons/open-file.svg</file> <file>icons/open-file.svg</file>
<file>js/tools.js</file> <file>js/tools.js</file>
</qresource> </qresource>
<qresource lang="fr" prefix="/">
<file alias="texts/about.html">texts/fr/about.html</file>
</qresource>
</RCC> </RCC>

1
resources/texts/about.html
View File

@ -10,7 +10,6 @@
%%SOURCE_CODE%% <a href="https://github.com/kiwix/kiwix-desktop">Github</a>. %%SOURCE_CODE%% <a href="https://github.com/kiwix/kiwix-desktop">Github</a>.
</p> </p>
<p>%%VERSION_LABEL%% : %%VERSION%%</p> <p>%%VERSION_LABEL%% : %%VERSION%%</p>
<p>%%BUILD_DATE_LABEL%% : %%BUILD_DATE%%</p>
<h2>%%REPORTING_PROBLEM%%</h2> <h2>%%REPORTING_PROBLEM%%</h2>
<p>%%REPORT_ISSUE_1%% <a href="https://github.com/kiwix/kiwix-desktop/issues">Kiwix-desktop issue</a> %%REPORT_ISSUE_2%%</p> <p>%%REPORT_ISSUE_1%% <a href="https://github.com/kiwix/kiwix-desktop/issues">Kiwix-desktop issue</a> %%REPORT_ISSUE_2%%</p>
<p>%%REPORT_ISSUE_3%%</p> <p>%%REPORT_ISSUE_3%%</p>

29
resources/texts/fr/about.html
View File

@ -1,29 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html>
<body>
<img src="qrc:/icons/kiwix/app_icon.svg" height="240" width="240" style="float:right"/>
<h1>Kiwix Desktop</h1>
<p>Kiwix vous permet d'avoir tout Wikipedia &agrave; port&eacute;e de main o&ugrave; que vous alliez! Dans un bateau, au milieu de nul-part ou en prison, Kiwix vous donne acc&egrave;s &agrave; l'ensemble du savoir humain. Vous n'avez pas besoin d'internet, tout est conserv&eacute; dans votre ordinateur.</p>
<p><a href="http://kiwix.org">En apprendre plus sur Kiwix</a></p>
<h2>Release</h2>
<p>
Ce logiciel est publi&eacute; selon les conditions de la licence GNU General Public License version 3. Lisez le code source sur <a href="https://github.com/kiwix/kiwix-desktop">Github</a>.
</p>
<p>Version : %%VERSION%%</p>
<p>Date de compilation : %%BUILD_DATE%%</p>
<h2>Reporter un probl&egrave;me</h2>
<p>Pour ouvrir un rapport de bogue, visitez <a href="https://github.com/kiwix/kiwix-desktop/issues">Kiwix-desktop issue</a> et ouvrez une "issue" d&eacute;crivant votre probl&egrave;me.</p>
<p>S'il vous pla&icirc;t, mentionnez la version et la date de compilation dans le rapport.</p>
<h2>Biblioth&egrave;ques</h2>
<ul>
<li>Libzim - GPLv3 (<a href="http://www.openzim.org">openzim.org</a>)</li>
<li>Libkiwix - GPLv3 (<a href="https://github.com/kiwix/kiwix-lib">https://github.com/kiwix/kiwix-lib</a>)</li>
<li>Qt - LGVLv3 (<a href="https://qt.io">qt.io</a>)</li>
<li>Xapian - GPL (<a href="https://xapian.org">xapian.org</a>)</li>
<li>Mustache - Boost (<a href="https://github.com/kainjow/Mustache">https://github.com/kainjow/Mustache</a>)</li>
<li>Pugixml - MIT (<a href="https://pugixml.org">pugixml.org</a>)</li>
<li>ICU - ICU License (<a href="http://icu-project.org">icu-project.org</a>)</li>
<li>Libmicrohttpd - GPL (<a href="https://www.gnu.org/software/libmicrohttpd/">www.gnu.org/software/libmicrohttpd/</a>)</li>
<li>Aria2 - GPL (<a href="https://aria2.github.io">aria2.github.io</a>)</li>
</ul>
</body></html>

4
src/about.cpp
View File

@ -16,9 +16,7 @@ About::About(QWidget *parent) :
htmlText = htmlText.replace("%%RELEASE%%", gt("release")); htmlText = htmlText.replace("%%RELEASE%%", gt("release"));
htmlText = htmlText.replace("%%SOURCE_CODE%%", gt("source-code")); htmlText = htmlText.replace("%%SOURCE_CODE%%", gt("source-code"));
htmlText = htmlText.replace("%%VERSION_LABEL%%", gt("version")); htmlText = htmlText.replace("%%VERSION_LABEL%%", gt("version"));
htmlText = htmlText.replace("%%VERSION%%", STR(GIT_VERSION)); htmlText = htmlText.replace("%%VERSION%%", STR(VERSION));
htmlText = htmlText.replace("%%BUILD_DATE_LABEL%%", gt("build-date"));
htmlText = htmlText.replace("%%BUILD_DATE%%", STR(BUILD_DATE));
htmlText = htmlText.replace("%%REPORTING_PROBLEM%%", gt("reporting-problem")); htmlText = htmlText.replace("%%REPORTING_PROBLEM%%", gt("reporting-problem"));
htmlText = htmlText.replace("%%REPORT_ISSUE_1%%", gt("report-issue-1/3")); htmlText = htmlText.replace("%%REPORT_ISSUE_1%%", gt("report-issue-1/3"));
htmlText = htmlText.replace("%%REPORT_ISSUE_2%%", gt("report-issue-2/3")); htmlText = htmlText.replace("%%REPORT_ISSUE_2%%", gt("report-issue-2/3"));