From 29c582cab07611e35eff64598f5877911c96c2ea Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 11 Apr 2024 21:28:27 +0900 Subject: [PATCH] Remove obsolete svn-related logic Signed-off-by: Michele Calgaro --- src/common/global/Makefile.am | 1 - src/common/global/about.cpp | 10 ++-------- src/common/global/global.pro | 2 -- src/common/global/svn_revision/Makefile.am | 5 ----- .../global/svn_revision/svn_revision.sh | 20 ------------------- 5 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 src/common/global/svn_revision/Makefile.am delete mode 100755 src/common/global/svn_revision/svn_revision.sh diff --git a/src/common/global/Makefile.am b/src/common/global/Makefile.am index a94b45c..1ebddbc 100644 --- a/src/common/global/Makefile.am +++ b/src/common/global/Makefile.am @@ -1,6 +1,5 @@ INCLUDES = -I$(top_srcdir)/src $(all_includes) METASOURCES = AUTO -SUBDIRS = svn_revision noinst_LTLIBRARIES = libglobal.la libglobal_la_SOURCES = about.cpp generic_config.cpp log.cpp pfile.cpp \ diff --git a/src/common/global/about.cpp b/src/common/global/about.cpp index 5f1942f..6dc0b80 100644 --- a/src/common/global/about.cpp +++ b/src/common/global/about.cpp @@ -8,12 +8,6 @@ ***************************************************************************/ #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] = { "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) printf("%s \"win32\": version %s\n", about->appName(), VERSION); # 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 Q_UNUSED(gui); Q_ASSERT( !gui ); #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(); #endif TDECmdLineArgs::init(argc, argv, about); diff --git a/src/common/global/global.pro b/src/common/global/global.pro index 3756177..45bee04 100644 --- a/src/common/global/global.pro +++ b/src/common/global/global.pro @@ -4,5 +4,3 @@ include($${STOPDIR}/lib.pro) TARGET = global 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 - -unix:system(cd svn_revision && sh svn_revision.sh) diff --git a/src/common/global/svn_revision/Makefile.am b/src/common/global/svn_revision/Makefile.am deleted file mode 100644 index b6f7fb2..0000000 --- a/src/common/global/svn_revision/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -INCLUDES = -I$(top_srcdir)/src $(all_includes) -METASOURCES = AUTO - -all-local: - sh $(srcdir)/svn_revision.sh diff --git a/src/common/global/svn_revision/svn_revision.sh b/src/common/global/svn_revision/svn_revision.sh deleted file mode 100755 index 3590568..0000000 --- a/src/common/global/svn_revision/svn_revision.sh +++ /dev/null @@ -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 -