Skip to content

Commit e132f39

Browse files
fabrejcfabrejc
committed
Internal URL management
* Added URLs in configuration files * Updated display of heading informations in comand line application * Cleaned code (closes #876)
1 parent 600edd3 commit e132f39

16 files changed

+146
-65
lines changed

‎CMake.in.cmake

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SET(OFBUILD_CUSTOM_CMAKE_VERSION "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.
2323
SET(OPENFLUID_VERSION_MAJOR 2)
2424
SET(OPENFLUID_VERSION_MINOR 1)
2525
SET(OPENFLUID_VERSION_PATCH 9)
26-
SET(OPENFLUID_VERSION_STATUS "alpha4") # example: SET(OPENFLUID_VERSION_STATUS "rc1")
26+
SET(OPENFLUID_VERSION_STATUS "alpha5") # example: SET(OPENFLUID_VERSION_STATUS "rc1")
2727

2828
SET(OPENFLUID_VERSION_FULL "${OPENFLUID_VERSION_MAJOR}.${OPENFLUID_VERSION_MINOR}.${OPENFLUID_VERSION_PATCH}")
2929

@@ -49,6 +49,8 @@ SET(OPENFLUID_OBSERVERS_PATH "observers")
4949
SET(OPENFLUID_BUILDEREXTS_PATH "builderexts")
5050
SET(OPENFLUID_EXAMPLES_PATH "examples")
5151
SET(OPENFLUID_PROJECTS_PATH "projects")
52+
SET(OPENFLUID_NETWORK_PATH "network")
53+
SET(OPENFLUID_HUBS_CACHE_PATH "${OPENFLUID_NETWORK_PATH}/hubs")
5254

5355
SET(OPENFLUID_PROJECT_INPUT_PATH "IN")
5456
SET(OPENFLUID_PROJECT_OUTPUT_PATHPREFIX "OUT")
@@ -133,6 +135,25 @@ SET(OPENFLUID_TESTS_TEMP_PATH ${OFBUILD_TESTS_TEMP_DIR}) # for usage in OPENFLUI
133135
SET(OPENFLUID_TESTS_USERDATA_PATH ${OFBUILD_TESTS_USERDATA_DIR}) # for usage in OPENFLUID_ADD_TEST macro
134136

135137

138+
################### URLs and mail ###################
139+
140+
SET(OPENFLUID_NETWORK_DOMAIN "openfluid-project.org")
141+
SET(OPENFLUID_NETWORK_DOMAIN_WWW "www.${OPENFLUID_NETWORK_DOMAIN}")
142+
SET(OPENFLUID_NETWORK_DOMAIN_COMMUNITY "community.${OPENFLUID_NETWORK_DOMAIN}")
143+
SET(OPENFLUID_NETWORK_DOMAIN_DEV "dev.${OPENFLUID_NETWORK_DOMAIN}")
144+
145+
SET(OPENFLUID_EMAIL_CONTACT "contact@${OPENFLUID_NETWORK_DOMAIN}")
146+
147+
SET(OPENFLUID_URL_OFFICIAL "https://${OPENFLUID_NETWORK_DOMAIN_WWW}")
148+
SET(OPENFLUID_URL_COMMUNITY "https://${OPENFLUID_NETWORK_DOMAIN_COMMUNITY}")
149+
SET(OPENFLUID_URL_NEWS_API "${OPENFLUID_URL_OFFICIAL}/api")
150+
SET(OPENFLUID_URL_GITHUB "https://github.com/OpenFLUID")
151+
SET(OPENFLUID_URL_ISSUES "${OPENFLUID_URL_GITHUB}/openfluid/issues")
152+
SET(OPENFLUID_URL_EMAIL_CONTACT "mailto:${OPENFLUID_EMAIL_CONTACT}")
153+
SET(OPENFLUID_URL_DOC "${OPENFLUID_URL_OFFICIAL}/resources/docs/manuals/en/openfluid/${OPENFLUID_VERSION_FULL}/main/html/")
154+
SET(OPENFLUID_URL_OFFICIAL_API "${OPENFLUID_URL_OFFICIAL}/api")
155+
156+
136157
################### applications ###################
137158

138159
SET(OPENFLUID_CMD_APP "openfluid")

‎CPack.in.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SET(CPACK_PACKAGE_VERSION "${OPENFLUID_VERSION_FULL}")
2121
SET(CPACK_PACKAGE_VERSION_MAJOR "${OPENFLUID_VERSION_MAJOR}")
2222
SET(CPACK_PACKAGE_VERSION_MINOR "${OPENFLUID_VERSION_MINOR}")
2323
SET(CPACK_PACKAGE_VERSION_PATCH "${OPENFLUID_VERSION_PATCH}")
24-
SET(CPACK_PACKAGE_CONTACT "OpenFLUID contact <contact@openfluid-project.org>")
24+
SET(CPACK_PACKAGE_CONTACT "OpenFLUID contact <${OPENFLUID_EMAIL_CONTACT}>")
2525
SET(CPACK_PACKAGE_VENDOR "LISAH (INRA-IRD-SupAgro)")
2626
SET(CPACK_PACKAGE_DESCRIPTION "${OPENFLUID_PACKAGE_TITLE}.\n ${OPENFLUID_PACKAGE_DESCRIPTION}")
2727
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${OPENFLUID_PACKAGE_SUMMARY}")

‎CPack.win32.in.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "OpenFLUID-${OPENFLUID_VERSION_MAJOR}.${OPEN
77
SET(CPACK_PACKAGE_NAME "OpenFLUID")
88

99
SET(CPACK_NSIS_DISPLAY_NAME "OpenFLUID")
10-
SET(CPACK_NSIS_HELP_LINK "http://www.openfluid-project.org/")
11-
SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.openfluid-project.org/")
12-
SET(CPACK_NSIS_CONTACT "OpenFLUID contact <contact@openfluid-project.org>")
10+
SET(CPACK_NSIS_HELP_LINK "${OPENFLUID_URL_OFFICIAL}")
11+
SET(CPACK_NSIS_URL_INFO_ABOUT "${OPENFLUID_URL_OFFICIAL}")
12+
SET(CPACK_NSIS_CONTACT "OpenFLUID contact <${OPENFLUID_EMAIL_CONTACT}>")
1313
SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/resources/packaging/windows\\\\openfluid_logo_NSIS.bmp")
1414
SET(CPACK_NSIS_MENU_LINKS
15-
"http://www.openfluid-project.org/" "OpenFLUID web site"
16-
"http://www.openfluid-project.org/community/" "OpenFLUID community site")
15+
"${OPENFLUID_URL_OFFICIAL}" "OpenFLUID web site"
16+
"${OPENFLUID_URL_COMMUNITY}" "OpenFLUID community site")
1717
SET(CPACK_PACKAGE_EXECUTABLES openfluid-builder;OpenFLUID-Builder
1818
openfluid-devstudio;OpenFLUID-DevStudio)
1919

‎resources/packaging/macosx/README.FIRST.html.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</head>
3737

3838
<body>
39-
<center><a href="http://www.openfluid-project.org" target="_blank">www.openfluid-project.org</a></center>
39+
<center><a href="@OPENFLUID_URL_OFFICIAL@" target="_blank">@OPENFLUID_NETWORK_DOMAIN_WWW@</a></center>
4040
<h1>OpenFLUID installation instructions for OSX</h1>
4141
<center>version @README_VERSION_FULL@</center>
4242
<br/>

‎resources/packaging/macosx/openfluid.rb.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cask 'openfluid@TOKEN_VERSION@' do
55

66
url '@CASKFILE_URL@'
77
name 'OpenFLUID'
8-
homepage 'https://wwww.openfluid-project.org'
8+
homepage '@OPENFLUID_URL_OFFICIAL@'
99

1010

1111
# external dependencies

‎resources/tools/ofpack-osx-brewcask.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ MESSAGE(STATUS "Found file : ${PACKFILE_NAME}")
3636
#### Generation of the Cask file(s)
3737

3838
IF(DOWNLOAD_STATUS)
39-
SET(CASKFILE_URL "https://www.openfluid-project.org/dloadsproxy/${DOWNLOAD_STATUS}/${PACKFILE_NAME}")
39+
SET(CASKFILE_URL "@OPENFLUID_URL_OFFICIAL@/dloadsproxy/${DOWNLOAD_STATUS}/${PACKFILE_NAME}")
4040
ELSE()
4141
SET(URL_VERSION "v@OPENFLUID_VERSION_MAJOR@.@OPENFLUID_VERSION_MINOR@.@OPENFLUID_VERSION_PATCH@")
42-
SET(CASKFILE_URL "https://www.openfluid-project.org/dloadsproxy/final/${URL_VERSION}/${PACKFILE_NAME}")
42+
SET(CASKFILE_URL "@OPENFLUID_URL_OFFICIAL@/dloadsproxy/final/${URL_VERSION}/${PACKFILE_NAME}")
4343
ENDIF()
4444

4545
SET(CASKFILE_VERSION "@OPENFLUID_VERSION_FULL@")

‎src/apps/openfluid-builder/base/AppCoordinator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ void AppCoordinator::whenMarketAsked()
813813

814814
void AppCoordinator::whenOnlineWebAsked()
815815
{
816-
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::WEBSITE_URL), QUrl::TolerantMode));
816+
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::URL_OFFICIAL), QUrl::TolerantMode));
817817
}
818818

819819

@@ -823,7 +823,7 @@ void AppCoordinator::whenOnlineWebAsked()
823823

824824
void AppCoordinator::whenOnlineCommunityAsked()
825825
{
826-
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::COMMUNITY_URL), QUrl::TolerantMode));
826+
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::URL_COMMUNITY), QUrl::TolerantMode));
827827
}
828828

829829

@@ -833,7 +833,7 @@ void AppCoordinator::whenOnlineCommunityAsked()
833833

834834
void AppCoordinator::whenEmailAsked()
835835
{
836-
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::CONTACTEMAIL_URL), QUrl::TolerantMode));
836+
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::URL_EMAIL_CONTACT), QUrl::TolerantMode));
837837
}
838838

839839

‎src/apps/openfluid-builder/base/HomeModuleWidget.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
license, and requires a written agreement between You and INRA.
2727
Licensees for Other Usage of OpenFLUID may use this file in accordance
2828
with the terms contained in the written agreement between You and INRA.
29-
29+
3030
*/
3131

3232

@@ -63,7 +63,8 @@ HomeModuleWidget::HomeModuleWidget(const AppActions* Actions, QWidget* Parent):
6363

6464
ui->VersionLabel->setText(std::string("OpenFLUID v"+openfluid::config::VERSION_FULL).c_str());
6565

66-
ui->URLLabel->setText("<a href=\"http://www.openfluid-project.org\">http://www.openfluid-project.org</a>");
66+
QString wwwURL = QString::fromStdString(openfluid::config::URL_OFFICIAL);
67+
ui->URLLabel->setText(QString("<a href=\"%1\">%1</a>").arg(wwwURL));
6768
connect(ui->URLLabel,SIGNAL(clicked()),Actions->action("HelpOnlineWeb"),SLOT(trigger()));
6869

6970
// left buttons

‎src/apps/openfluid-builder/base/NewslineDownloadWorker.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
#include <openfluid/utils/FluidHubAPIClient.hpp>
4646
#include <openfluid/base/Environment.hpp>
47+
#include <openfluid/config.hpp>
4748

4849
#include "NewslineDownloadWorker.hpp"
4950
#include "builderconfig.hpp"
@@ -76,7 +77,7 @@ bool NewslineDownloadWorker::donwloadRSSToFile(const QString& RSSFilename, const
7677
SSLConfig.setCertificateVerifyMode(QSslSocket::VerifyNone);
7778
openfluid::utils::FluidHubAPIClient FHClient;
7879

79-
if (FHClient.connect(BUILDER_NEWSLINE_SOURCEURL,SSLConfig))
80+
if (FHClient.connect(QString::fromStdString(openfluid::config::URL_OFFICIAL_API),SSLConfig))
8081
{
8182
QString Content = FHClient.getNews(ShortLocale);
8283

‎src/apps/openfluid-builder/builderconfig.hpp.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ const QString BUILDER_WARE_BORDERCOLOR = "#A6A6A6";
6060
const QString BUILDER_NEWSLINE_BGCOLOR = "#F9F9F4";
6161
const QString BUILDER_NEWSLINE_TEXTCOLOR = "#444444";
6262
const QString BUILDER_NEWSLINE_LINKSCOLOR = "#0000FF";
63-
const QString BUILDER_NEWSLINE_SOURCEURL = "https://www.openfluid-project.org/api/";
64-
const QString BUILDER_NEWSLINE_CACHERELDIR = "network/hubs/openfluid-project.org";
63+
const QString BUILDER_NEWSLINE_CACHERELDIR = "@OPENFLUID_HUBS_CACHE_PATH@/@OPENFLUID_NETWORK_DOMAIN@";
6564

6665
#define BUILDER_MODELVIEW_ACTIVECOLOR "#617487"
6766
#define BUILDER_MODELVIEW_INACTIVECOLOR "#B7B7B7"

‎src/apps/openfluid-devstudio/MainWindow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ void MainWindow::onDevDashboardAsked()
572572

573573
void MainWindow::onOnlineWebAsked()
574574
{
575-
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::WEBSITE_URL), QUrl::TolerantMode));
575+
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::URL_OFFICIAL), QUrl::TolerantMode));
576576
}
577577

578578

@@ -582,7 +582,7 @@ void MainWindow::onOnlineWebAsked()
582582

583583
void MainWindow::onOnlineCommunityAsked()
584584
{
585-
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::COMMUNITY_URL), QUrl::TolerantMode));
585+
QDesktopServices::openUrl(QUrl(QString::fromStdString(openfluid::config::URL_COMMUNITY), QUrl::TolerantMode));
586586
}
587587

588588

‎src/apps/openfluid/OpenFLUID.cpp

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,27 +127,37 @@ void OpenFLUIDApp::printlnExecMessagesStats()
127127

128128
void OpenFLUIDApp::printOpenFLUIDInfos()
129129
{
130+
const unsigned int HeaderWidth = 60;
130131

131-
int Width = 60;
132-
std::string VersionInfo = "OpenFLUID v";
133-
std::string Whites = "";
134132

135-
VersionInfo = VersionInfo + openfluid::config::VERSION_FULL;
133+
auto displayHeaderSeparator = [&HeaderWidth]()
134+
{
135+
std::cout << std::string(HeaderWidth,'=') << std::endl;
136+
};
137+
138+
auto displayRightAlign = [&HeaderWidth](const std::string& Msg)
139+
{
140+
std::cout << std::right << std::setw(HeaderWidth-(HeaderWidth/8)) << Msg << std::endl;
141+
};
142+
143+
auto displayCenterAlign = [&HeaderWidth](const std::string& Msg)
144+
{
145+
std::cout << std::right << std::setw((HeaderWidth/2)+(Msg.length()/2)) << Msg << std::endl;
146+
};
147+
136148

137-
// centering the version number, using white spaces
138-
for (unsigned int i=0;i<((Width-VersionInfo.length())/2);i++) Whites = Whites + " ";
149+
std::string VersionInfo = "OpenFLUID v" + openfluid::config::VERSION_FULL;
139150

140-
VersionInfo = Whites + VersionInfo;
141151

142152
std::cout << std::endl;
143-
std::cout << "===========================================================" << std::endl;
144-
std::cout << VersionInfo << std::endl;
153+
displayHeaderSeparator();
154+
displayCenterAlign(VersionInfo);
145155
std::cout << std::endl;
146-
std::cout << " software environment" << std::endl;
147-
std::cout << " for Spatial Modelling in Landscapes" << std::endl;
156+
displayRightAlign("software environment");
157+
displayRightAlign("for Spatial Modelling in Landscapes");
148158
std::cout << std::endl;
149-
std::cout << " www.openfluid-project.org" << std::endl;
150-
std::cout << "===========================================================" << std::endl;
159+
displayCenterAlign(openfluid::config::NETWORK_DOMAIN_WWW);
160+
displayHeaderSeparator();
151161
std::cout << std::endl;
152162
std::cout.flush();
153163
}

‎src/openfluid/config.hpp.in

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
license, and requires a written agreement between You and INRA.
2727
Licensees for Other Usage of OpenFLUID may use this file in accordance
2828
with the terms contained in the written agreement between You and INRA.
29-
29+
3030
*/
3131

3232

3333
/**
3434
@file config.hpp
35-
35+
3636
@author Jean-Christophe FABRE <jean-christophe.fabre@inra.fr>
3737
*/
3838

@@ -53,11 +53,12 @@
5353

5454
namespace openfluid { namespace config {
5555

56+
5657
// Main Name
5758
const std::string MAINNAME = "@OPENFLUID_MAIN_NAME@";
5859

5960

60-
// default config file
61+
// Default config file
6162
const std::string DEFAULT_CONFIGFILE = "@OPENFLUID_DEFAULT_CONFIGFILE@";
6263

6364

@@ -106,21 +107,21 @@ const std::string GHOSTS_EXT = "@OPENFLUID_PLUGINS_GHOST_EXTENSION@";
106107
// Simulators plugins dirs
107108
const std::string SIMULATORS_PATH = "@OPENFLUID_SIMULATORS_PATH@";
108109
const std::string SIMULATORS_WARESBIN_USR_PATH = "@OPENFLUID_WARESBIN_PATH@/@OPENFLUID_SIMULATORS_PATH@";
109-
const std::string SIMULATORS_WARESBIN_STD_PATH =
110+
const std::string SIMULATORS_WARESBIN_STD_PATH =
110111
"@OFBUILD_LIB_INSTALL_PATH@/@OPENFLUID_MAIN_NAME@/@OPENFLUID_SIMULATORS_PATH@";
111112

112113

113114
// Observers plugins dirs
114115
const std::string OBSERVERS_PATH = "@OPENFLUID_OBSERVERS_PATH@";
115116
const std::string OBSERVERS_WARESBIN_USR_PATH = "@OPENFLUID_WARESBIN_PATH@/@OPENFLUID_OBSERVERS_PATH@";
116-
const std::string OBSERVERS_WARESBIN_STD_PATH =
117+
const std::string OBSERVERS_WARESBIN_STD_PATH =
117118
"@OFBUILD_LIB_INSTALL_PATH@/@OPENFLUID_MAIN_NAME@/@OPENFLUID_OBSERVERS_PATH@";
118119

119120

120121
// Builder-extensions plugins dirs
121122
const std::string BUILDEREXTS_PATH = "@OPENFLUID_BUILDEREXTS_PATH@";
122123
const std::string BUILDEREXTS_WARESBIN_USR_PATH = "@OPENFLUID_WARESBIN_PATH@/@OPENFLUID_BUILDEREXTS_PATH@";
123-
const std::string BUILDEREXTS_WARESBIN_STD_PATH =
124+
const std::string BUILDEREXTS_WARESBIN_STD_PATH =
124125
"@OFBUILD_LIB_INSTALL_PATH@/@OPENFLUID_MAIN_NAME@/@OPENFLUID_BUILDEREXTS_PATH@";
125126

126127

@@ -129,16 +130,20 @@ const std::string EXAMPLES_PATH = "@OPENFLUID_EXAMPLES_PATH@";
129130
const std::string EXAMPLES_STD_PATH = "@OPENFLUID_EXAMPLES_INSTALL_PATH@";
130131

131132

133+
// Hubs dirs
134+
const std::string HUBS_CACHE_PATH = "@OPENFLUID_HUBS_CACHE_PATH@";
135+
136+
132137
// Translations dirs
133138
const std::string SHARE_TRANSLATIONS_INSTALL_PATH = "@OPENFLUID_SHARE_TRANSLATIONS_INSTALL_PATH@";
134139
const std::string TRANSLATIONS_FILEROOT = "@OPENFLUID_TRANSLATIONS_FILEROOT@";
135140

136141

137-
// log files
142+
// Log files
138143
const std::string MESSAGES_LOG_FILE = "@OPENFLUID_MESSAGES_LOG_FILE@";
139144

140145

141-
// profiling files
146+
// Profiling files
142147
const std::string CUMULATIVE_PROFILE_FILE = "@OPENFLUID_CUMULATIVE_PROFILE_FILE@";
143148
const std::string SCHEDULE_PROFILE_FILE = "@OPENFLUID_SCHEDULE_PROFILE_FILE@";
144149
const std::string TIMEINDEX_PROFILE_FILE = "@OPENFLUID_TIMEINDEX_PROFILE_FILE@";
@@ -172,7 +177,7 @@ const std::string SHARE_APPS_INSTALL_PATH = "@OPENFLUID_SHARE_APPS_INSTALL_PATH@
172177
const std::string SHARE_WARESDEV_INSTALL_PATH = "@OPENFLUID_SHARE_WARESDEV_INSTALL_PATH@";
173178

174179

175-
// sim2doc default template file path
180+
// sim2doc default template file path
176181
const std::string SIM2DOC_TPLFILE_NAME = "sim2doc_tpl.tex";
177182

178183

@@ -185,21 +190,29 @@ const std::string VERSION_FULL = "@OPENFLUID_VERSION_FULL@";
185190
const std::string VERSION = "@OPENFLUID_VERSION_MAJOR@.@OPENFLUID_VERSION_MINOR@.@OPENFLUID_VERSION_PATCH@";
186191

187192

188-
// debug information
189-
const std::string DEBUG_PREFIX = "@OPENFLUID_DEBUG_PREFIX@";
193+
// Network domain
194+
const std::string NETWORK_DOMAIN = "@OPENFLUID_NETWORK_DOMAIN@";
195+
const std::string NETWORK_DOMAIN_WWW = "@OPENFLUID_NETWORK_DOMAIN_WWW@";
196+
const std::string NETWORK_DOMAIN_COMMUNITY = "@OPENFLUID_NETWORK_DOMAIN_COMMUNITY@";
197+
198+
199+
// Emails
200+
const std::string EMAIL_CONTACT = "@OPENFLUID_EMAIL_CONTACT@";
190201

191202

192203
// URLs
193-
const std::string WEBSITE_DOMAIN = "www.openfluid-project.org";
194-
const std::string WEBSITE_URL = "http://"+WEBSITE_DOMAIN;
195-
const std::string COMMUNITY_URL = "http://www.openfluid-project.org/community";
196-
const std::string DEVSITE_URL = "https://github.com/OpenFLUID/";
197-
const std::string BUG_URL = "https://github.com/OpenFLUID/openfluid/issues";
198-
const std::string CONTACTEMAIL_ADDRESS = "contact@openfluid-project.org";
199-
const std::string CONTACTEMAIL_URL = "mailto:"+CONTACTEMAIL_ADDRESS;
200-
const std::string APIDOC_URL =
201-
"http://www.openfluid-project.org/resources/docs/manuals/en/openfluid/"
202-
"@OPENFLUID_VERSION_MAJOR@.@OPENFLUID_VERSION_MINOR@.@OPENFLUID_VERSION_PATCH@/main/html/";
204+
const std::string URL_OFFICIAL = "@OPENFLUID_URL_OFFICIAL@";
205+
const std::string URL_OFFICIAL_API = "@OPENFLUID_URL_OFFICIAL_API@";
206+
const std::string URL_COMMUNITY = "@OPENFLUID_URL_COMMUNITY@";
207+
const std::string URL_DOC = "@OPENFLUID_URL_DOC@";
208+
const std::string URL_EMAIL_CONTACT = "@OPENFLUID_URL_EMAIL_CONTACT@";
209+
const std::string URL_GITHUB = "@OPENFLUID_URL_GITHUB@";
210+
const std::string URL_ISSUES = "@OPENFLUID_URL_ISSUES@";
211+
212+
213+
// Debug information
214+
const std::string DEBUG_PREFIX = "@OPENFLUID_DEBUG_PREFIX@";
215+
203216

204217
} } //namespaces
205218

0 commit comments

Comments
 (0)