Commit 43f624d0 authored by sm's avatar sm

Set links to efanomars.com

parent 618d52da
......@@ -29,7 +29,7 @@ debian packages:
The command to build, from the directory of this file, is
$ ./scripts/debian_create_srcpkg.py --builddir=~/Tmp/builddir
$ ./scripts/debian_create.py --builddir=~/Tmp/builddir
where builddir must be an non existent or empty folder. This builds
a Debian source package and from it the binary packages using Debian
......@@ -53,7 +53,7 @@ Other distributions
Packages or libraries needed for building:
- libstmm-input-gtk (www.gitlab.com/efanomars/stmm-input/)
- libstmm-input-fake (www.gitlab.com/efanomars/stmm-input/)
- libstmm-input-ev (www.gitlab.com/efanomars/stmm-input/)
- librsvg2-dev (or -devel or similar)
- libxml++-2.6-dev (or -devel or similar)
- g++ and cmake
......
......@@ -3,6 +3,8 @@ stmm-games
Game library for C++ (C++14).
For more info visit http://www.efanomars.com/libraries/stmm-games
This source package contains:
- libstmm-games:
......
......@@ -8,6 +8,7 @@ includedir=${prefix}/include
Name: stmm-games-fake
Description: C++ games library - helper classes to test game components
Version: @STMM_GAMES_FAKE_VERSION@
URL: http://www.efanomars.com/libraries/stmm-games
Requires: stmm-games >= @STMM_GAMES_FAKE_REQ_STMM_GAMES_VERSION@
Conflicts:
Libs: -L${libdir} -lstmm-games-fake
......
......@@ -31,6 +31,7 @@
#include <gtkmm.h>
#include <string>
#include <vector>
namespace stmg
{
......@@ -48,7 +49,7 @@ struct MainWindowData
File m_oIconFile; /**< The icon file. Can be undefined. */
File m_oLogoFile; /**< The logo file. Can be undefined. */
std::string m_sCopyright; /**< The Copyright string. If empty "stmm-games © 2019 Stefano Marsili" will be shown. */
std::string m_sWebSite; /**< The web site. If empty "https://gitlab.com/efanomars/stmm-games" will be shown. */
std::string m_sWebSite; /**< The web site. If empty "http://www.efanomars.com/libraries/stmm-games" will be shown. */
std::vector<std::string> m_aAuthors; /**< The authors. One per line with format (example): "John Dow <johndoe@foobar.cam>". */
bool m_bPauseIfWindowDeactivated = true; /**< Whether to automatically pause the game when window deactivated. */
bool m_bFullscreen = false; /**< Whether to run in fullscreen mode. */
......
......@@ -860,7 +860,7 @@ void GameWindow::onButtonChooseTheme()
}
void GameWindow::onButtonAbout()
{
const Glib::ustring s_sStmmGamesWebSite = "https://gitlab.com/efanomars/stmm-games";
const Glib::ustring s_sStmmGamesWebSite = "http://www.efanomars.com/libraries/stmm-games";
std::vector<Glib::ustring> aAuthors;
std::copy(m_aAuthors.begin(), m_aAuthors.end(), std::back_inserter(aAuthors));
aAuthors.push_back("");
......
......@@ -8,6 +8,7 @@ includedir=${prefix}/include
Name: stmm-games-gtk
Description: C++ games library - gtk view
Version: @STMM_GAMES_GTK_VERSION@
URL: http://www.efanomars.com/libraries/stmm-games
# Beware! The space between the library name and the comparison (>=) is necessary!
Requires: stmm-games >= @STMM_GAMES_GTK_REQ_STMM_GAMES_VERSION@ stmm-input-gtk >= @STMM_GAMES_GTK_REQ_STMM_INPUT_GTK_VERSION@ gtkmm-3.0 >= @STMM_GAMES_GTK_REQ_GTKMM_VERSION@ librsvg-2.0 >= @STMM_GAMES_GTK_REQ_LIBRSVG_VERSION@
Conflicts:
......
......@@ -8,7 +8,7 @@ includedir=${prefix}/include
Name: stmm-games-xml
Description: C++ games library - xml game loaders
Version: @STMM_GAMES_XML_VERSION@
URL: https://gitlab.com/efanomars/stmm-games
URL: http://www.efanomars.com/libraries/stmm-games
# Beware! The space between the library name and the comparison (>=) is necessary!
Requires: stmm-games-gtk >= @STMM_GAMES_XML_REQ_STMM_GAMES_GTK_VERSION@ libxml++-2.6 >= @STMM_GAMES_XML_REQ_LIBXMLPP_VERSION@
Conflicts:
......
......@@ -109,7 +109,7 @@ public:
if (nCount == 1) {
m_oListeners.erase(it);
listenerPreCalledDirty(p0Listener);
} else if (nCount > 0) {
} else if (nCount > 0) { // Also needed because of warning about a null dereference
it->second = nCount - 1;
}
}
......
......@@ -8,7 +8,7 @@ includedir=${prefix}/include
Name: stmm-games
Description: C++ games library
Version: @STMM_GAMES_VERSION@
URL: https://gitlab.com/efanomars/stmm-games
URL: http://www.efanomars.com/libraries/stmm-games
# Beware! The space between the library name and the comparison (>=) is necessary!
Requires: stmm-input-ev >= @STMM_GAMES_REQ_STMM_INPUT_EV_VERSION@
Conflicts:
......
......@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 9)
, libxml++2.6-dev (>= @STMM_GAMES_XML_REQ_LIBXMLPP_VERSION@)
Standards-Version: 3.9.8
Section: libs
Homepage: http://www.gitlab.com/efanomars/stmm-games
Homepage: http://www.efanomars.com/libraries/stmm-games
Vcs-Git: https://www.gitlab.com/efanomars/stmm-games.git
#Vcs-Browser: https://www.gitlab.com/efanomars/stmm-games/stmm-games.git
#Vcs-Browser: https://www.gitlab.com/efanomars/stmm-games.git
Package: libstmm-games@STMM_GAMES_MAJOR_VERSION@
......
......@@ -92,13 +92,28 @@ g_oDatePatt = re.compile(g_sDateRegex)
g_sChangeDateRegex = "^ -- (.*) <(.*)> (" + g_sDateCommonRegex + ")[ ]*$"
g_oChangeDatePatt = re.compile(g_sChangeDateRegex)
g_sDefaultPackagerFullName = "Stefano Marsili"
g_sDefaultPackagerEMail = "efanomars@gmx.ch"
try:
g_sPackagerFullName = os.environ["DEBFULLNAME"]
except KeyError:
#raise RuntimeError("Couldn't get environment variable DEBFULLNAME")
g_sPackagerFullName = g_sDefaultPackagerFullName
try:
os.environ["DEBFULLNAME"] = g_sPackagerFullName
except KeyError:
raise RuntimeError("Couldn't set environment variable DEBFULLNAME to: " + g_sPackagerFullName)
try:
g_sPackagerEMail = os.environ["DEBEMAIL"]
except KeyError:
#raise RuntimeError("Couldn't get environment variable DEBFULLNAME, DEBEMAIL")
g_sPackagerFullName = "John Foo-Doe"
g_sPackagerEMail = "email@example.com"
#raise RuntimeError("Couldn't get environment variable DEBEMAIL")
g_sPackagerEMail = g_sDefaultPackagerEMail
try:
os.environ["DEBEMAIL"] = g_sPackagerEMail
except KeyError:
raise RuntimeError("Couldn't set environment variable DEBEMAIL to: " + g_sPackagerEMail)
#==============================================================================
def stringIsAllDigitsOrEmpty(sStr):
......@@ -198,7 +213,10 @@ def main():
bHasDevLibs = (len(g_oDevLibs) > 0)
import argparse
oParser = argparse.ArgumentParser(description="Create DEBIAN source package, binary packages and dist zip."
oParser = argparse.ArgumentParser(description="Create DEBIAN source package, binary packages and dist zip.\n"
" If not defined environment variable DEBFULLNAME is set to '"
+ g_sDefaultPackagerFullName + "',\n"
" and DEBEMAIL is set to '" + g_sDefaultPackagerEMail + "'"
, formatter_class=argparse.RawDescriptionHelpFormatter)
oParser.add_argument("--version", help="the debian source package version (overrides CHANGES)", metavar='VERSION'\
, default="", dest="sDebSrcVersion")
......@@ -338,7 +356,10 @@ def main():
os.chmod("debian/" + sEntry, oStat.st_mode | stat.S_IXUSR)
if not oArgs.bDontBinaries:
subprocess.check_call("dpkg-buildpackage -us -uc", shell=True)
g_sPackagerEMail = g_sDefaultPackagerEMail
sDebianBuildCmd = "DEBFULLNAME=\"" + g_sPackagerFullName + "\" DEBEMAIL=\"" + g_sPackagerEMail + "\" "\
+ "dpkg-buildpackage -us -uc"
subprocess.check_call(sDebianBuildCmd, shell=True)
if not oArgs.bDontDist:
os.chdir(sBuildPath)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment