[kdirstat][master,r14.0.x] 3ae78363,c58d7eea

.gitmodules

diff --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

INSTALL

diff --git a/INSTALL b/INSTALL

index 02a4a07..aa40cff 100644

--- a/INSTALL

+++ b/INSTALL

@@ -1,6 +1,26 @@

 Basic Installation

 ==================

+Kdirstat 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"

+##### the following instructions, kept as a reference, are basically obsolete - October 11 2019 #####

    These are generic installation instructions.

    The `configure' shell script attempts to guess correct values for

Makefile.am

diff --git a/Makefile.am b/Makefile.am

deleted file mode 100644

index 6c7afac..0000000

--- a/Makefile.am

+++ /dev/null

@@ -1,48 +0,0 @@

-# Toplevel Makefile.am for KDirStat

-#

-# Originally generated by KDevelop, modified by sh@...

-#

-SUBDIRS = kdirstat po doc

-EXTRA_DIST = 					\

-	AUTHORS 				\

-	COPYING 				\

-	COPYING.LIB 				\

-	CREDITS 				\

-	ChangeLog 				\

-	INSTALL 				\

-	README 					\

-	TODO 					\

-	admin 					\

-	build-howto.html			\

-	kdirstat.kdevprj 			\

-	kdirstat.lsm

-# This is not a GNU package. You can remove this line

-# if have all needed files a GNU package needs.

-AUTOMAKE_OPTIONS = foreign

-CLEANFILES = $(wildcard autom4te.cache/*)

-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs

-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;

-$(top_srcdir)/subdirs:

-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs

-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in

-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4

-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files

-package-messages:

-	$(MAKE) -f admin/Makefile.common package-messages

-	$(MAKE) -C po merge

-dist-hook:

-	cd $(top_distdir) && perl admin/am_edit -padmin

-	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs

Makefile.cvs

diff --git a/Makefile.cvs b/Makefile.cvs

deleted file mode 100644

index be59a86..0000000

--- a/Makefile.cvs

+++ /dev/null

@@ -1,14 +0,0 @@

-all:

-	@echo "This Makefile is only for the CVS repository"

-	@echo "This will be deleted before making the distribution"

-	@echo ""

-	@if test ! -d admin; then \

-	   echo "Please recheckout this module!" ;\

-	   echo "for cvs: use checkout once and after that update again" ;\

-	   echo "for cvsup: checkout kde-common from cvsup and" ;\

-	   echo "   link kde-common/admin to ./admin" ;\

-	   exit 1 ;\

-	fi

-	$(MAKE) -f admin/Makefile.common cvs

-.SILENT:

Makefile.dist

diff --git a/Makefile.dist b/Makefile.dist

deleted file mode 100644

index be59a86..0000000

--- a/Makefile.dist

+++ /dev/null

@@ -1,14 +0,0 @@

-all:

-	@echo "This Makefile is only for the CVS repository"

-	@echo "This will be deleted before making the distribution"

-	@echo ""

-	@if test ! -d admin; then \

-	   echo "Please recheckout this module!" ;\

-	   echo "for cvs: use checkout once and after that update again" ;\

-	   echo "for cvsup: checkout kde-common from cvsup and" ;\

-	   echo "   link kde-common/admin to ./admin" ;\

-	   exit 1 ;\

-	fi

-	$(MAKE) -f admin/Makefile.common cvs

-.SILENT:

README

diff --git a/README b/README

index 193f6cc..10b1a0a 100644

--- a/README

+++ b/README

@@ -1,20 +1,12 @@

-This is a graphical "du" (disk usage) display.

-What you see here is a 90% rewrite - GUI, engine, everything.  The one thing it

-can do a whole lot better than the old version is stay on one file system - the

-single most most requested feature. Plus, it's way faster for large directory

-trees - scanning an entire Linux file system no longer takes 30+

-minutes. Rather, it's about 2-3 minutes: The old version seemed to have

-problems with system buffer thrashing due to too many directories open for

-reading at one time - the new version uses an internal queue and keeps only one

-directory open.

-For more details, see the KDirStat home page at

-	http://kdirstat.sourceforge.net/

+Kdirstat - a graphical disk usage display for TDE.

+KDirStat (TDE Directory Statistics) is a small utility program that sums

+up disk usage for directory trees, very much like the Unix 'du' command.

-Stefan Hundhammer <sh@...>

-2002-05-10

+It displays the disk space used up by a directory tree, both numerically

+and graphically. It is network transparent (i.e you can use it to sum up

+FTP servers) It comes with predefined and user configurable cleanup

+actions. You can directly open a directory branch in Konqueror or the

+shell of your choice then compress it to a .tar.bz2 archive or define

+your own cleanup actions.

acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4

deleted file mode 100644

index 282b4d2..0000000

--- a/acinclude.m4

+++ /dev/null

@@ -1,11332 +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       \

** Diff limit reached (max: 250 lines) **

3ae78363	2019-10-11 11:59:59	gregory guy
Drop automake build support. Add basic cmake build instructions. Deleted obsolete files: build-howto.html and kdirstat.spec . Change description in README. Signed-off-by: gregory guy <gregory-tde@...>
M .gitmodules M INSTALL M README R Makefile.am R Makefile.cvs R Makefile.dist R acinclude.m4 R aclocal.m4 R admin R build-howto.html R config.h.in R configure.files R configure.in R configure.in.in R doc/Makefile.am R doc/en/Makefile.am R kdirstat.spec R kdirstat/Makefile.am R kdirstat/pics/Makefile.am R po/Makefile.am R stamp-h.in R subdirs
.gitmodules diff --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 INSTALL diff --git a/INSTALL b/INSTALL index 02a4a07..aa40cff 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,26 @@ Basic Installation ================== +Kdirstat 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" + + + + + +##### the following instructions, kept as a reference, are basically obsolete - October 11 2019 ##### + These are generic installation instructions. The `configure' shell script attempts to guess correct values for Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 6c7afac..0000000 --- a/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# Toplevel Makefile.am for KDirStat -# -# Originally generated by KDevelop, modified by sh@... -# - -SUBDIRS = kdirstat po doc - -EXTRA_DIST = \ - AUTHORS \ - COPYING \ - COPYING.LIB \ - CREDITS \ - ChangeLog \ - INSTALL \ - README \ - TODO \ - admin \ - build-howto.html \ - kdirstat.kdevprj \ - kdirstat.lsm - - -# This is not a GNU package. You can remove this line -# if have all needed files a GNU package needs. -AUTOMAKE_OPTIONS = foreign - -CLEANFILES = $(wildcard autom4te.cache/) - -$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ; - -$(top_srcdir)/subdirs: - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs - -$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in - @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4 - -MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files - -package-messages: - $(MAKE) -f admin/Makefile.common package-messages - $(MAKE) -C po merge - - -dist-hook: - cd $(top_distdir) && perl admin/am_edit -padmin - cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs - Makefile.cvs diff --git a/Makefile.cvs b/Makefile.cvs deleted file mode 100644 index be59a86..0000000 --- a/Makefile.cvs +++ /dev/null @@ -1,14 +0,0 @@ -all: - @echo "This Makefile is only for the CVS repository" - @echo "This will be deleted before making the distribution" - @echo "" - @if test ! -d admin; then \ - echo "Please recheckout this module!" ;\ - echo "for cvs: use checkout once and after that update again" ;\ - echo "for cvsup: checkout kde-common from cvsup and" ;\ - echo " link kde-common/admin to ./admin" ;\ - exit 1 ;\ - fi - $(MAKE) -f admin/Makefile.common cvs - -.SILENT: Makefile.dist diff --git a/Makefile.dist b/Makefile.dist deleted file mode 100644 index be59a86..0000000 --- a/Makefile.dist +++ /dev/null @@ -1,14 +0,0 @@ -all: - @echo "This Makefile is only for the CVS repository" - @echo "This will be deleted before making the distribution" - @echo "" - @if test ! -d admin; then \ - echo "Please recheckout this module!" ;\ - echo "for cvs: use checkout once and after that update again" ;\ - echo "for cvsup: checkout kde-common from cvsup and" ;\ - echo " link kde-common/admin to ./admin" ;\ - exit 1 ;\ - fi - $(MAKE) -f admin/Makefile.common cvs - -.SILENT: README diff --git a/README b/README index 193f6cc..10b1a0a 100644 --- a/README +++ b/README @@ -1,20 +1,12 @@ -This is a graphical "du" (disk usage) display. - -What you see here is a 90% rewrite - GUI, engine, everything. The one thing it -can do a whole lot better than the old version is stay on one file system - the -single most most requested feature. Plus, it's way faster for large directory -trees - scanning an entire Linux file system no longer takes 30+ -minutes. Rather, it's about 2-3 minutes: The old version seemed to have -problems with system buffer thrashing due to too many directories open for -reading at one time - the new version uses an internal queue and keeps only one -directory open. - -For more details, see the KDirStat home page at - - http://kdirstat.sourceforge.net/ +Kdirstat - a graphical disk usage display for TDE. +KDirStat (TDE Directory Statistics) is a small utility program that sums +up disk usage for directory trees, very much like the Unix 'du' command. -Stefan Hundhammer <sh@...> -2002-05-10 - +It displays the disk space used up by a directory tree, both numerically +and graphically. It is network transparent (i.e you can use it to sum up +FTP servers) It comes with predefined and user configurable cleanup +actions. You can directly open a directory branch in Konqueror or the +shell of your choice then compress it to a .tar.bz2 archive or define +your own cleanup actions. acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 282b4d2..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,11332 +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 \ * Diff limit reached (max: 250 lines) **

Branch: master

.gitmodules

INSTALL

Makefile.am

Makefile.cvs

Makefile.dist

README

acinclude.m4