summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2024-04-11 21:28:27 +0900
committerMichele Calgaro <[email protected]>2024-05-07 11:02:45 +0900
commitce951906931f1be93caf66d7486990a21c68b34c (patch)
treeeb2a29b1ba059f0de0d4144057fdac2a35fdb0a6
parent8bdcbe0178113223e2f40a0eb9eb01b0a866b3bd (diff)
downloadpiklab-ce951906931f1be93caf66d7486990a21c68b34c.tar.gz
piklab-ce951906931f1be93caf66d7486990a21c68b34c.zip
Remove obsolete svn-related logic
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 29c582cab07611e35eff64598f5877911c96c2ea)
-rw-r--r--src/common/global/Makefile.am1
-rw-r--r--src/common/global/about.cpp10
-rw-r--r--src/common/global/global.pro2
-rw-r--r--src/common/global/svn_revision/Makefile.am5
-rwxr-xr-xsrc/common/global/svn_revision/svn_revision.sh20
5 files changed, 2 insertions, 36 deletions
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
-