Makefile
by Adam Stokes
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9cc9c20c903345024b2890790fe3f976d9ec51ff
Author: adam stokes <astokes(a)fedoraproject.org>
Date: Fri Apr 16 10:58:31 2010 -0400
rpmbuild update
diff --git a/Makefile b/Makefile
index 0d494bc..47871d2 100644
--- a/Makefile
+++ b/Makefile
@@ -45,13 +45,13 @@ $(NAME)-$(VERSION).tar.gz: clean
tar Ccvzf $(RPM_BUILD_DIR) $(RPM_BUILD_DIR)/$(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)
srpm-rhel5: clean $(NAME)-$(VERSION).tar.gz
- $(RPM_WITH_DIRS) $(MD5_DEFINES) -bs $(NAME).spec
+ $(RPM_WITH_DIRS) $(MD5_DEFINES) -ts $(RPM_BUILD_DIR)/$(NAME)-$(VERSION).tar.gz
srpm-fedora: clean $(NAME)-$(VERSION).tar.gz
- $(RPM_WITH_DIRS) -bs $(NAME).spec
+ $(RPM_WITH_DIRS) -ts $(RPM_BUILD_DIR)/$(NAME)-$(VERSION).tar.gz
-rpm:
- rpmbuild -ba $(NAME).spec
+rpm: clean $(NAME)-$(VERSION).tar.gz
+ $(RPM_WITH_DIRS) -tb $(RPM_BUILD_DIR)/$(NAME)-$(VERSION).tar.gz
clean:
rm -rfv {dist,build}
14 years, 1 month
contrib/Makefile Makefile snippets/Makefile
by Adam Stokes
Makefile | 2 +-
contrib/Makefile | 3 +++
snippets/Makefile | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit b738c37d48f99c394f298030ab5049ff42432804
Author: adam stokes <astokes(a)fedoraproject.org>
Date: Fri Apr 16 10:54:41 2010 -0400
clean
diff --git a/Makefile b/Makefile
index 74d8c61..0d494bc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME = cas
VERSION = $(shell echo `awk '/^Version:/ {print $$2}' cas.spec`)
RELEASE = $(shell echo `awk '/^Release:/ {gsub(/\%.*/,""); print $2}' cas.spec`)
-SUBDIRS = caslib tests contrib doc snippets
+SUBDIRS = caslib contrib snippets
PYFILES = $(wildcard *.py)
RPM_BUILD_DIR = rpm-build
diff --git a/contrib/Makefile b/contrib/Makefile
index e9eee8f..77db085 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,5 +1,8 @@
NAME=cas
+clean:
+ echo "boomshaka"
+
install:
mkdir -p $(DESTDIR)/usr/share/$(NAME)/contrib
install -m755 * $(DESTDIR)/usr/share/$(NAME)/contrib/.
diff --git a/snippets/Makefile b/snippets/Makefile
index 526e16e..ca37f1d 100644
--- a/snippets/Makefile
+++ b/snippets/Makefile
@@ -3,6 +3,9 @@ NAME=cas
all:
echo "moo"
+clean:
+ echo "clean"
+
install:
mkdir -p $(DESTDIR)/var/lib/$(NAME)/snippets
install -m755 * $(DESTDIR)/var/lib/$(NAME)/snippets/.
14 years, 1 month
caslib/Makefile cas.spec contrib/Makefile doc/Makefile Makefile setup.cfg setup.py snippets/Makefile
by Adam Stokes
Makefile | 48 +++++++++++++++++-------------------------------
cas.spec | 12 ++++++------
caslib/Makefile | 20 ++++++++++++++++++++
contrib/Makefile | 5 +++++
doc/Makefile | 15 +++++++++++++++
setup.cfg | 3 ---
setup.py | 48 ------------------------------------------------
snippets/Makefile | 8 ++++++++
8 files changed, 71 insertions(+), 88 deletions(-)
New commits:
commit 2f796b3f513b83031137896dece2e27f5b8d0f7a
Author: adam stokes <astokes(a)fedoraproject.org>
Date: Fri Apr 16 10:52:29 2010 -0400
installer updates
diff --git a/Makefile b/Makefile
index 029b9ab..74d8c61 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,6 @@
NAME = cas
VERSION = $(shell echo `awk '/^Version:/ {print $$2}' cas.spec`)
RELEASE = $(shell echo `awk '/^Release:/ {gsub(/\%.*/,""); print $2}' cas.spec`)
-MANPAGE1 = $(PWD)/cas.1
-MANPAGE2 = $(PWD)/cas-admin.1
-SOURCE2 = $(PWD)/cas.conf
-SOURCE3 = $(PWD)/cas.1.gz
-SOURCE4 = $(PWD)/cas-admin.1.gz
SUBDIRS = caslib tests contrib doc snippets
PYFILES = $(wildcard *.py)
@@ -23,8 +18,7 @@ RPM = rpmbuild
RPM_WITH_DIRS = $(RPM) $(RPM_DEFINES)
# mainly for rhel5 and below
-MD5_DEFINES=--define "_srcrpmdir $(SRCRPMDIR_MD5)" \
- --define "_source_filedigest_algorithm md5" \
+MD5_DEFINES=--define "_source_filedigest_algorithm md5" \
--define "_binary_filedigest_algorithm md5"
build: for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done
@@ -35,8 +29,8 @@ install:
mkdir -p $(DESTDIR)/var/lib/cas/snippets
mkdir -p $(DESTDIR)/usr/share/$(NAME)/tests
mkdir -p $(DESTDIR)/etc
- @gzip -c man/en/cas.1 > cas.1.gz
- @gzip -c man/en/cas-admin.1 > cas-admin.1.gz
+ gzip -c man/en/cas.1 > cas.1.gz
+ gzip -c man/en/cas-admin.1 > cas-admin.1.gz
install -m755 cas $(DESTDIR)/usr/bin/cas
install -m755 cas-admin $(DESTDIR)/usr/bin/cas-admin
install -m644 cas.1.gz $(DESTDIR)/usr/share/man/man1/.
@@ -45,34 +39,26 @@ install:
install -m644 $(NAME).conf $(DESTDIR)/etc/$(NAME).conf
for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1 ; done
-tarball: clean
- @echo "Creating archive"
- @test -f $(SOURCE3) || gzip -c $(MANPAGE1) > $(SOURCE3)
- @test -f $(SOURCE4) || gzip -c $(MANPAGE2) > $(SOURCE4)
- @mkdir /tmp/$(NAME)
- @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION)
- @python setup.py sdist -d /tmp/$(NAME)-$(VERSION)
- @mkdir $(PWD)/dist
- @mv /tmp/$(NAME)-$(VERSION)/* $(PWD)/dist
- @echo " "
- @echo "The final files are in ./dist/"
+$(NAME)-$(VERSION).tar.gz: clean
+ mkdir -p $(RPM_BUILD_DIR)/$(NAME)-$(VERSION)
+ git clone $(PWD) $(RPM_BUILD_DIR)/$(NAME)-$(VERSION)
+ tar Ccvzf $(RPM_BUILD_DIR) $(RPM_BUILD_DIR)/$(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)
-srpm-rhel5: clean
+srpm-rhel5: clean $(NAME)-$(VERSION).tar.gz
$(RPM_WITH_DIRS) $(MD5_DEFINES) -bs $(NAME).spec
-srpm-fedora:
+srpm-fedora: clean $(NAME)-$(VERSION).tar.gz
$(RPM_WITH_DIRS) -bs $(NAME).spec
rpm:
rpmbuild -ba $(NAME).spec
clean:
- @rm -rfv {dist,build}
- @rm -rf *.\~*
- @rm -rfv /tmp/$(NAME)-$(VERSION)
- @rm -rf MANIFEST
- @rm -rf {$(SOURCE3),$(SOURCE4)}
-
-install:
- @python setup.py install
- @rm -rf build/lib
+ rm -rfv {dist,build}
+ rm -rf *.\~* cas.1.gz cas-admin.1.gz
+ rm -rf $(RPM_BUILD_DIR)
+ rm -rf MANIFEST
+ for i in `find . -iname *.pyc`; do \
+ rm $$i; \
+ done; \
+ for d in $(SUBDIRS); do make -C $$d clean ; done
diff --git a/cas.spec b/cas.spec
index f4a11ef..a32fb21 100644
--- a/cas.spec
+++ b/cas.spec
@@ -26,11 +26,11 @@ types to core dumps are automatically detected and processed.
%setup -q
%build
-%{__python} setup.py build
+make
%install
rm -rf ${RPM_BUILD_ROOT}
-%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}
+make DESTDIR=${RPM_BUILD_DIR} install
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -41,17 +41,17 @@ rm -rf ${RPM_BUILD_ROOT}
%{_bindir}/cas
%{_bindir}/cas-admin
%{python_sitelib}/*
-%{_mandir}/man1/cas.1.gz
-%{_mandir}/man1/cas-admin.1.gz
+%{_mandir}/man1/*
+%{_datadir}/%{name}
%dir %{_var}/lib/cas/snippets/
-%defattr(755,root,root)
%config(noreplace) %{_var}/lib/cas/snippets/*
-%doc AUTHORS LICENSE README PKG-INFO doc/* contrib/*
+%doc AUTHORS LICENSE README PKG-INFO doc/*
%changelog
* Fri Apr 16 2020 Adam Stokes <ajs at redhat dot com> - 0.16
- Release bump
- Fix inconsistencies with compression/core analysis
+- Installer updates
* Wed Feb 17 2010 Adam Stokes <ajs at redhat dot com> - 0.15-5
- file structure rework
diff --git a/caslib/Makefile b/caslib/Makefile
new file mode 100644
index 0000000..6f71b79
--- /dev/null
+++ b/caslib/Makefile
@@ -0,0 +1,20 @@
+PYTHON=python
+PACKAGE = $(shell basename `pwd`)
+PYFILES = $(wildcard *.py)
+PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
+PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
+PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
+PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
+
+all:
+ echo "nada"
+
+clean:
+ rm -f *.pyc *.pyo *~
+
+install:
+ mkdir -p $(DESTDIR)/$(PKGDIR)
+ for p in $(PYFILES) ; do \
+ install -m 755 $$p $(DESTDIR)/$(PKGDIR)/$$p; \
+ done
+ $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PYDIR)', 1)"
diff --git a/contrib/Makefile b/contrib/Makefile
new file mode 100644
index 0000000..e9eee8f
--- /dev/null
+++ b/contrib/Makefile
@@ -0,0 +1,5 @@
+NAME=cas
+
+install:
+ mkdir -p $(DESTDIR)/usr/share/$(NAME)/contrib
+ install -m755 * $(DESTDIR)/usr/share/$(NAME)/contrib/.
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 0000000..56c1b58
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,15 @@
+NAME = cas
+VERSION = $(shell echo `awk '/^Version:/ {print $$2}' cas.spec`)
+
+all:
+ echo "newp"
+
+install:
+ mkdir -p $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)
+ mkdir -p $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_images
+ mkdir -p $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_static
+ mkdir -p $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_sources
+ install -m655 * $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/.
+ install -m655 * $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_images/.
+ install -m655 * $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_static/.
+ install -m655 * $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_sources/.
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 2474f5b..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[build_sphinx]
-source-dir = docs
-build-dir = docs/_build
diff --git a/setup.py b/setup.py
deleted file mode 100644
index b5cb0e4..0000000
--- a/setup.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""
- setup.py - distutils packaging
-"""
-import os
-
-try:
- from setuptools import setup, find_packages
-except ImportError:
- from ez_setup import use_setuptools
- from setuptools import setup, find_packages
-
-libpath = "/var/lib/cas"
-snippetpath = os.path.join(libpath,"snippets")
-
-# Build data_files easily
-data_files = []
-
-# add static files
-data_files.append(['/etc',['cas.conf']])
-data_files.append(['/usr/share/man/man1', ['cas.1.gz','cas-admin.1.gz']])
-
-# Automate addition of snippets, simply add new snippets to default install
-# and they will be included.
-for dirpath, dirnames, filenames in os.walk('snippets'):
- data_files.append([snippetpath, [os.path.join(dirpath, f) for f in filenames]])
-
-for dirpath, dirnames, filenames in os.walk('tests'):
- data_files.append([snippetpath, [os.path.join(dirpath, f) for f in filenames]])
-
-test_requirements = ['nose >= 0.10']
-
-setup(
- name = 'cas',
- version = '0.16',
- author = 'Adam Stokes',
- author_email = 'ajs(a)redhat.com',
- url = "http://fedorahosted.org/cas",
- description = "CAS - automated core setup",
- scripts = ['cas','cas-admin'],
- packages = find_packages(exclude=['test*']),
- include_package_data = True,
- data_files = data_files,
- test_suite = "tests",
- tests_require = test_requirements,
- extras_require = {
- 'docs' : ['sphinx >= 0.5'],
- },
-)
diff --git a/snippets/Makefile b/snippets/Makefile
new file mode 100644
index 0000000..526e16e
--- /dev/null
+++ b/snippets/Makefile
@@ -0,0 +1,8 @@
+NAME=cas
+
+all:
+ echo "moo"
+
+install:
+ mkdir -p $(DESTDIR)/var/lib/$(NAME)/snippets
+ install -m755 * $(DESTDIR)/var/lib/$(NAME)/snippets/.
14 years, 1 month
cas.1 cas-admin.1 Makefile man/en
by Adam Stokes
Makefile | 42 +++++++++++++++++++++++++++++++++++++-----
cas-admin.1 | 36 ------------------------------------
cas.1 | 37 -------------------------------------
man/en/cas-admin.1 | 36 ++++++++++++++++++++++++++++++++++++
man/en/cas.1 | 37 +++++++++++++++++++++++++++++++++++++
5 files changed, 110 insertions(+), 78 deletions(-)
New commits:
commit 25518e4aef90526543687286e990930739bc490d
Author: adam stokes <astokes(a)fedoraproject.org>
Date: Fri Apr 16 10:31:51 2010 -0400
relocate man pages
diff --git a/Makefile b/Makefile
index 337dd48..029b9ab 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,41 @@ SOURCE2 = $(PWD)/cas.conf
SOURCE3 = $(PWD)/cas.1.gz
SOURCE4 = $(PWD)/cas-admin.1.gz
+SUBDIRS = caslib tests contrib doc snippets
+PYFILES = $(wildcard *.py)
+
+RPM_BUILD_DIR = rpm-build
+RPM_DEFINES = --define "_topdir %(pwd)/$(RPM_BUILD_DIR)" \
+ --define "_builddir %{_topdir}" \
+ --define "_rpmdir %{_topdir}" \
+ --define "_srcrpmdir %{_topdir}" \
+ --define "_specdir %{_topdir}" \
+ --define "_sourcedir %{_topdir}"
+RPM = rpmbuild
+RPM_WITH_DIRS = $(RPM) $(RPM_DEFINES)
+
# mainly for rhel5 and below
-MD5_DEFINES=--define "_srcrpmdir $(SRCRPMDIR_MD5)" --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5"
+MD5_DEFINES=--define "_srcrpmdir $(SRCRPMDIR_MD5)" \
+ --define "_source_filedigest_algorithm md5" \
+ --define "_binary_filedigest_algorithm md5"
-all:
+build: for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done
-.PHONY: tarball install clean rpm
+install:
+ mkdir -p $(DESTDIR)/usr/bin
+ mkdir -p $(DESTDIR)/usr/share/man/man1
+ mkdir -p $(DESTDIR)/var/lib/cas/snippets
+ mkdir -p $(DESTDIR)/usr/share/$(NAME)/tests
+ mkdir -p $(DESTDIR)/etc
+ @gzip -c man/en/cas.1 > cas.1.gz
+ @gzip -c man/en/cas-admin.1 > cas-admin.1.gz
+ install -m755 cas $(DESTDIR)/usr/bin/cas
+ install -m755 cas-admin $(DESTDIR)/usr/bin/cas-admin
+ install -m644 cas.1.gz $(DESTDIR)/usr/share/man/man1/.
+ install -m644 cas-admin.1.gz $(DESTDIR)/usr/share/man/man1/.
+ install -m644 AUTHORS LICENSE README $(DESTDIR)/usr/share/$(NAME)/.
+ install -m644 $(NAME).conf $(DESTDIR)/etc/$(NAME).conf
+ for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1 ; done
tarball: clean
@echo "Creating archive"
@@ -28,8 +57,11 @@ tarball: clean
@echo " "
@echo "The final files are in ./dist/"
-srpm:
- rpmbuild $(MD5_DEFINES) -bs $(NAME).spec
+srpm-rhel5: clean
+ $(RPM_WITH_DIRS) $(MD5_DEFINES) -bs $(NAME).spec
+
+srpm-fedora:
+ $(RPM_WITH_DIRS) -bs $(NAME).spec
rpm:
rpmbuild -ba $(NAME).spec
diff --git a/cas-admin.1 b/cas-admin.1
deleted file mode 100644
index 61c4045..0000000
--- a/cas-admin.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH CAS-ADMIN "1"
-
-.SH NAME
-cas-admin \- Administrator tools for building rpm/server database.
-
-.SH DESCRIPTION
-.TP
-\fIcas-admin\fP is a tool used to build necessary data for use with cas.
-.SH OPTIONS
-.TP
-.BI \-s
-Populate server database for automatic processing of core files.
-.TP
-.B \-b
-Populate a database with debug kernel information.
-.TP
-.B \-p
-Purge data based on set days (see purge options)
-.SH PURGE OPTIONS
-.TP
-.B \-d
-Define how many days back you wish to purge data, default is 90 days.
-.SH RESOURCES
-A configuration file is maintained in /etc/cas.conf.
-.SH AUTHOR
-Written by Adam Stokes
-.SH "REPORTING BUGS"
-Report bugs to <astokes(a)redhat.com>.
-.SH COPYRIGHT
-Copyright \(co 2007-2009 Adam Stokes
-.br
-This is free software. You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
-.SH "SEE ALSO"
-Full documentation should be found in /usr/share/doc/cas-<version>.
diff --git a/cas.1 b/cas.1
deleted file mode 100644
index 8c41ed7..0000000
--- a/cas.1
+++ /dev/null
@@ -1,37 +0,0 @@
-.TH CAS "1"
-
-.SH NAME
-cas \- Tool to configure core analysis environment.
-
-.SH DESCRIPTION
-.TP
-\fIcas\fP is a tool used to automatically configure an environment for
-viewing coredumps.
-.SH OPTIONS
-.TP
-.BI \-i " identifier"
-Specify an id to associate with current cas job, normally a support ticket of
-some sort.
-.TP
-.BI \-f " file"
-Define a core file to be processed.
-.TP
-.BI \-e " email"
-Provide an email address for result notification
-.TP
-.B \-m
-Extract current loaded modules from debug kernels.
-.SH RESOURCES
-A configuration file is maintained in /etc/cas.conf.
-.SH AUTHOR
-Written by Adam Stokes
-.SH "REPORTING BUGS"
-Report bugs to <astokes(a)redhat.com>.
-.SH COPYRIGHT
-Copyright \(co 2007-2009 Adam Stokes
-.br
-This is free software. You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
-.SH "SEE ALSO"
-Full documentation should be found in /usr/share/doc/cas-<version>.
diff --git a/man/en/cas-admin.1 b/man/en/cas-admin.1
new file mode 100644
index 0000000..61c4045
--- /dev/null
+++ b/man/en/cas-admin.1
@@ -0,0 +1,36 @@
+.TH CAS-ADMIN "1"
+
+.SH NAME
+cas-admin \- Administrator tools for building rpm/server database.
+
+.SH DESCRIPTION
+.TP
+\fIcas-admin\fP is a tool used to build necessary data for use with cas.
+.SH OPTIONS
+.TP
+.BI \-s
+Populate server database for automatic processing of core files.
+.TP
+.B \-b
+Populate a database with debug kernel information.
+.TP
+.B \-p
+Purge data based on set days (see purge options)
+.SH PURGE OPTIONS
+.TP
+.B \-d
+Define how many days back you wish to purge data, default is 90 days.
+.SH RESOURCES
+A configuration file is maintained in /etc/cas.conf.
+.SH AUTHOR
+Written by Adam Stokes
+.SH "REPORTING BUGS"
+Report bugs to <astokes(a)redhat.com>.
+.SH COPYRIGHT
+Copyright \(co 2007-2009 Adam Stokes
+.br
+This is free software. You may redistribute copies of it under the terms of
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
+.SH "SEE ALSO"
+Full documentation should be found in /usr/share/doc/cas-<version>.
diff --git a/man/en/cas.1 b/man/en/cas.1
new file mode 100644
index 0000000..8c41ed7
--- /dev/null
+++ b/man/en/cas.1
@@ -0,0 +1,37 @@
+.TH CAS "1"
+
+.SH NAME
+cas \- Tool to configure core analysis environment.
+
+.SH DESCRIPTION
+.TP
+\fIcas\fP is a tool used to automatically configure an environment for
+viewing coredumps.
+.SH OPTIONS
+.TP
+.BI \-i " identifier"
+Specify an id to associate with current cas job, normally a support ticket of
+some sort.
+.TP
+.BI \-f " file"
+Define a core file to be processed.
+.TP
+.BI \-e " email"
+Provide an email address for result notification
+.TP
+.B \-m
+Extract current loaded modules from debug kernels.
+.SH RESOURCES
+A configuration file is maintained in /etc/cas.conf.
+.SH AUTHOR
+Written by Adam Stokes
+.SH "REPORTING BUGS"
+Report bugs to <astokes(a)redhat.com>.
+.SH COPYRIGHT
+Copyright \(co 2007-2009 Adam Stokes
+.br
+This is free software. You may redistribute copies of it under the terms of
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
+.SH "SEE ALSO"
+Full documentation should be found in /usr/share/doc/cas-<version>.
14 years, 1 month
Makefile
by Adam Stokes
Makefile | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 33ccbe5a03dc4ea71c11d07f8cbcc60c63300562
Author: adam stokes <astokes(a)fedoraproject.org>
Date: Fri Apr 16 09:48:30 2010 -0400
update cmd checks for compression/analysis
diff --git a/Makefile b/Makefile
index b1bfe91..337dd48 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,9 @@ SOURCE2 = $(PWD)/cas.conf
SOURCE3 = $(PWD)/cas.1.gz
SOURCE4 = $(PWD)/cas-admin.1.gz
+# mainly for rhel5 and below
+MD5_DEFINES=--define "_srcrpmdir $(SRCRPMDIR_MD5)" --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5"
+
all:
.PHONY: tarball install clean rpm
@@ -25,6 +28,9 @@ tarball: clean
@echo " "
@echo "The final files are in ./dist/"
+srpm:
+ rpmbuild $(MD5_DEFINES) -bs $(NAME).spec
+
rpm:
rpmbuild -ba $(NAME).spec
14 years, 1 month
setup.py
by Adam Stokes
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 51cecd36307e781aa9721321b3d5550543363510
Author: adam stokes <astokes(a)fedoraproject.org>
Date: Fri Apr 16 09:39:47 2010 -0400
bump release in setup.py
diff --git a/setup.py b/setup.py
index cdcb542..b5cb0e4 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@ test_requirements = ['nose >= 0.10']
setup(
name = 'cas',
- version = '0.15',
+ version = '0.16',
author = 'Adam Stokes',
author_email = 'ajs(a)redhat.com',
url = "http://fedorahosted.org/cas",
14 years, 1 month
caslib/cas.py caslib/core.py cas.spec
by Adam Stokes
cas.spec | 8 ++++++--
caslib/cas.py | 10 +++++-----
caslib/core.py | 5 ++---
3 files changed, 13 insertions(+), 10 deletions(-)
New commits:
commit 557904cd78140fbd1aefaff251e5985b2b9f298f
Author: adam stokes <astokes(a)fedoraproject.org>
Date: Fri Apr 16 09:33:20 2010 -0400
update cmd checks for compression/analysis
diff --git a/cas.spec b/cas.spec
index 2178328..f4a11ef 100644
--- a/cas.spec
+++ b/cas.spec
@@ -2,8 +2,8 @@
Name: cas
Summary: Tool to analyze and configure core file environment
-Version: 0.15
-Release: 5%{?dist}.3
+Version: 0.16
+Release: 0%{?dist}
Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
License: GPLv3+
Group: Development/Libraries
@@ -49,6 +49,10 @@ rm -rf ${RPM_BUILD_ROOT}
%doc AUTHORS LICENSE README PKG-INFO doc/* contrib/*
%changelog
+* Fri Apr 16 2020 Adam Stokes <ajs at redhat dot com> - 0.16
+- Release bump
+- Fix inconsistencies with compression/core analysis
+
* Wed Feb 17 2010 Adam Stokes <ajs at redhat dot com> - 0.15-5
- file structure rework
diff --git a/caslib/cas.py b/caslib/cas.py
index 1fb6c5a..38fd2d5 100755
--- a/caslib/cas.py
+++ b/caslib/cas.py
@@ -168,16 +168,16 @@ class CasApplication(object):
"to another destination.", action="store_true")
self.opts, args = parser.parse_args()
+ if not self.opts.filename:
+ parser.error("A file object is missing.")
+
# check helper function first
- if self.opts.compress_core and self.opts.filename:
+ if self.opts.compress_core:
self._helper_compress(self.opts.filename)
- else:
- parser.error("A file object is missing")
+ # Not compressing lets continue with validating a identifier
if not self.opts.identifier:
parser.error("A unique identifier number is missing.")
- elif not self.opts.filename:
- parser.error("A file object is missing.")
self.filename = self.opts.filename
self.identifier = self.opts.identifier
diff --git a/caslib/core.py b/caslib/core.py
index 81fd72d..a489b0b 100644
--- a/caslib/core.py
+++ b/caslib/core.py
@@ -122,13 +122,12 @@ class CoreBase(object):
raise CoreException("Unable to retrieve timestamp from: %s" % (path,))
def compressCore(self, corefile):
- """ use pbzip2 to do compression
- utilizing multiple cpu cores
+ """ use xz to do compression
"""
if os.path.isfile("/usr/bin/xz"):
cmd = "/bin/tar -c %s | /usr/bin/xz -1 > %s.xz" % (corefile, corefile)
else:
cmd = "bzip2 -z %s" % (corefile,)
- p = Popen(app, stdout=PIPE, stderr=PIPE, shell=True)
+ p = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True)
out, err = p.communicate()
return
14 years, 1 month