e7dbd05d | 2019-10-21 10:47:12 | gregory guy |
Drop automake build support. Add basic cmake instructions in an INSTALL file. Rework of the README file as well as the help page. The knetstats.desktop file has been moved to the "src" folder. Signed-off-by: gregory guy <gregory-tde@...> |
||
A INSTALL A src/knetstats.desktop M .gitmodules M CMakeLists.txt M README M doc/en/index.docbook M src/CMakeLists.txt R Makefile.am R Makefile.am.in R acinclude.m4 R aclocal.m4 R admin R config.h.in R configure.files R configure.in R configure.in.bot R configure.in.in R doc/Makefile.am R doc/en/Makefile.am R doc/man/Makefile.am R icons/Makefile.am R knetstats.desktop R src/Makefile.am R src/pics/Makefile.am R stamp-h.in R subdirs R translations/Makefile.am R translations/bg/Makefile.am R translations/bg/messages/Makefile.am R translations/br/Makefile.am R translations/br/messages/Makefile.am R translations/cs/Makefile.am R translations/cs/messages/Makefile.am R translations/da/Makefile.am R translations/da/messages/Makefile.am R translations/de/Makefile.am R translations/de/messages/Makefile.am R translations/el/Makefile.am R translations/el/messages/Makefile.am R translations/es/Makefile.am R translations/es/messages/Makefile.am R translations/et/Makefile.am R translations/et/messages/Makefile.am R translations/fr/Makefile.am R translations/fr/messages/Makefile.am R translations/ga/Makefile.am R translations/ga/messages/Makefile.am R translations/gl/Makefile.am R translations/gl/messages/Makefile.am R translations/it/Makefile.am R translations/it/messages/Makefile.am R translations/ja/Makefile.am R translations/ja/messages/Makefile.am R translations/ka/Makefile.am R translations/ka/messages/Makefile.am R translations/nl/Makefile.am R translations/nl/messages/Makefile.am R translations/pl/Makefile.am R translations/pl/messages/Makefile.am R translations/pt/Makefile.am R translations/pt/messages/Makefile.am R translations/pt_BR/Makefile.am R translations/pt_BR/messages/Makefile.am R translations/ru/Makefile.am R translations/ru/messages/Makefile.am R translations/sk/Makefile.am R translations/sk/messages/Makefile.am R translations/sv/Makefile.am R translations/sv/messages/Makefile.am R translations/tr/Makefile.am R translations/tr/messages/Makefile.am |
||
.gitmodulesdiff --git a/.gitmodules b/.gitmodules index 4fce771..5b98c56 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "admin"] - path = admin - url = http://system@.../scm/git/tde-common-admin [submodule "cmake"] path = cmake url = http://system@.../scm/git/tde-common-cmake CMakeLists.txtdiff --git a/CMakeLists.txt b/CMakeLists.txt index 67ac9c6..2a8014f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,11 +77,3 @@ ##### write configure files configure_file( config.h.cmake config.h @ONLY ) - - -##### other data - -install( - FILES ${PROJECT_NAME}.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} -) INSTALLdiff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..e8f0158 --- /dev/null +++ b/INSTALL @@ -0,0 +1,16 @@ +Basic Installation +================== + +Knetstats relies on cmake to build. + +Here are suggested default options: + + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" Makefile.amdiff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 0aa05e2..0000000 --- a/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.6.1 - -include admin/deps.am -include admin/Doxyfile.am - -xdg_apps_DATA = knetstats.desktop - -SUBDIRS=$(TOPSUBDIRS) Makefile.am.indiff --git a/Makefile.am.in b/Makefile.am.in deleted file mode 100644 index 628b551..0000000 --- a/Makefile.am.in +++ /dev/null @@ -1,7 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.6.1 - -include admin/deps.am -include admin/Doxyfile.am - -xdg_apps_DATA = knetstats.desktop - READMEdiff --git a/README b/README index 3095c5e..52055ee 100644 --- a/README +++ b/README @@ -1,24 +1,19 @@ -INSTALLATION -============ -type as root: -./scons install -Note.: We use SCons/BKSys as building tool, so you need Python installed on your system. +Knetstats - a system tray icon which indicates network activity -RUNNING -======= -To run knetstats, type: -knetstats -CONTACT -======= -Any doubts or suggestions, hugo_pl@... -For more info. visit: http://knetstats.sf.net +Knetstats is a simple TDE network monitor that show rx/tx LEDs of any +network interface on a system tray icon. -UNINSTALL -========= -Type: -./scons -c install --- -Hugo Parente Lima + + CONTRIBUTING +============== + +If you wish to contribute to Knetstats (TDE), you might do so: + +- TDE Gitea Workspace (TGW) collaboration tool. + https://mirror.git.trinitydesktop.org/gitea + +- TDE Weblate Translation Workspace (TWTW) collaboration tool. + https://mirror.git.trinitydesktop.org/weblate acinclude.m4diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 054d4cb..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,11891 +0,0 @@ -## -*- autoconf -*- - -dnl This file is part of the KDE libraries/packages -dnl Copyright (C) 1997 Janos Farkas (chexum@...) -dnl (C) 1997,98,99 Stephan Kulow (coolo@...) - -dnl This file is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Library General Public -dnl License as published by the Free Software Foundation; either -dnl version 2 of the License, or (at your option) any later version. - -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Library General Public License for more details. - -dnl You should have received a copy of the GNU Library General Public License -dnl along with this library; see the file COPYING.LIB. If not, write to -dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -dnl Boston, MA 02110-1301, USA. - -dnl IMPORTANT NOTE: -dnl Please do not modify this file unless you expect your modifications to be -dnl carried into every other module in the repository. -dnl -dnl Single-module modifications are best placed in configure.in for tdelibs -dnl and tdebase or configure.in.in if present. - -# KDE_PATH_X_DIRECT -dnl Internal subroutine of AC_PATH_X. -dnl Set ac_x_includes and/or ac_x_libraries. -AC_DEFUN([KDE_PATH_X_DIRECT], -[ -AC_REQUIRE([KDE_CHECK_LIB64]) - -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - - # First, try using that file with no special directory specified. -AC_TRY_CPP([#include <$x_direct_test_include>], -[# We can compile using X headers with no special include directory. -ac_x_includes=], -[# Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done]) -fi # $ac_x_includes = NO - -if test "$ac_x_libraries" = NO; then - # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)], -[LIBS="$ac_save_LIBS" -# We can link X programs with no special library path. -ac_x_libraries=], -[LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ - /usr/X11/lib${tdelibsuff} \ - /usr/X11R6/lib${tdelibsuff} \ - /usr/X11R5/lib${tdelibsuff} \ - /usr/X11R4/lib${tdelibsuff} \ - \ - /usr/lib${tdelibsuff}/X11 \ - /usr/lib${tdelibsuff}/X11R6 \ - /usr/lib${tdelibsuff}/X11R5 \ - /usr/lib${tdelibsuff}/X11R4 \ - \ - /usr/local/X11/lib${tdelibsuff} \ - /usr/local/X11R6/lib${tdelibsuff} \ - /usr/local/X11R5/lib${tdelibsuff} \ - /usr/local/X11R4/lib${tdelibsuff} \ - \ - /usr/local/lib${tdelibsuff}/X11 \ - /usr/local/lib${tdelibsuff}/X11R6 \ - /usr/local/lib${tdelibsuff}/X11R5 \ - /usr/local/lib${tdelibsuff}/X11R4 \** Diff limit reached (max: 250 lines) ** |