Remove obsolete svn-related logic

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/16/head
Michele Calgaro 6 months ago
parent ca2e3d8564
commit 29c582cab0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1,6 +1,5 @@
INCLUDES = -I$(top_srcdir)/src $(all_includes) INCLUDES = -I$(top_srcdir)/src $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
SUBDIRS = svn_revision
noinst_LTLIBRARIES = libglobal.la noinst_LTLIBRARIES = libglobal.la
libglobal_la_SOURCES = about.cpp generic_config.cpp log.cpp pfile.cpp \ libglobal_la_SOURCES = about.cpp generic_config.cpp log.cpp pfile.cpp \

@ -8,12 +8,6 @@
***************************************************************************/ ***************************************************************************/
#include "about.h" #include "about.h"
#if defined(TQ_WS_WIN)
# define SVN_REVISION "windows"
#else
# include "svn_revision/svn_revision.h"
#endif
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
const char * const Piklab::URLS[Nb_UrlTypes] = { const char * const Piklab::URLS[Nb_UrlTypes] = {
"http://piklab.sourceforge.net", "http://piklab.sourceforge.net",
@ -48,12 +42,12 @@ void Piklab::init(TDEAboutData *about, int argc, char **argv, bool gui, const TD
# if defined(Q_OS_WIN) # if defined(Q_OS_WIN)
printf("%s \"win32\": version %s\n", about->appName(), VERSION); printf("%s \"win32\": version %s\n", about->appName(), VERSION);
# else # else
printf("%s \"tqt-only\": version %s (rev. %s)\n", about->appName(), VERSION, SVN_REVISION); printf("%s \"tqt-only\": version %s\n", about->appName(), VERSION);
# endif # endif
Q_UNUSED(gui); Q_UNUSED(gui);
Q_ASSERT( !gui ); Q_ASSERT( !gui );
#else #else
printf("%s: version %s (rev. %s)\n", about->appName(), VERSION, SVN_REVISION); printf("%s: version %s\n", about->appName(), VERSION);
if ( !gui ) TDEApplication::disableAutoDcopRegistration(); if ( !gui ) TDEApplication::disableAutoDcopRegistration();
#endif #endif
TDECmdLineArgs::init(argc, argv, about); TDECmdLineArgs::init(argc, argv, about);

@ -4,5 +4,3 @@ include($${STOPDIR}/lib.pro)
TARGET = global TARGET = global
HEADERS += about.h generic_config.h log.h process.h purl.h pfile.h progress_monitor.h HEADERS += about.h generic_config.h log.h process.h purl.h pfile.h progress_monitor.h
SOURCES += about.cpp generic_config.cpp log.cpp process.cpp purl.cpp pfile.cpp progress_monitor.cpp SOURCES += about.cpp generic_config.cpp log.cpp process.cpp purl.cpp pfile.cpp progress_monitor.cpp
unix:system(cd svn_revision && sh svn_revision.sh)

@ -1,5 +0,0 @@
INCLUDES = -I$(top_srcdir)/src $(all_includes)
METASOURCES = AUTO
all-local:
sh $(srcdir)/svn_revision.sh

@ -1,20 +0,0 @@
if [ -d .svn ]; then
( echo '// generated file';
printf '#define SVN_REVISION "';
(svnversion -n .);
echo '"' ) > svn_revision.h.new;
if [ ! -f svn_revision.h ]; then
mv -f svn_revision.h.new svn_revision.h;
else
if cmp svn_revision.h svn_revision.h.new; then
rm -f svn_revision.h.new;
else
mv -f svn_revision.h.new svn_revision.h;
fi
fi
fi
if [ ! -f svn_revision.h ]; then
( echo '// generated file';
echo '#define SVN_REVISION "distribution"'; ) > svn_revision.h;
fi
Loading…
Cancel
Save