libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

library versioning now works how i want it

Browse Source
This commit is contained in:
Marc Wäckerlin
2004-09-09 20:09:06 +00:00
parent e03ad3c4ee
commit ce41fb71b4
9 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,3 +1,5 @@
* Tue Sep 9 2004 Marc Wäckerlin <marc@waeckerlin.org> - mrw-c++-0.94.0 (mrw)
- library version is now how I want it (equal to package)
* Tue Aug 31 2004 Marc Wäckerlin <marc@waeckerlin.org> - mrw-c++-0.93 (mrw) * Tue Aug 31 2004 Marc Wäckerlin <marc@waeckerlin.org> - mrw-c++-0.93 (mrw)
- test failed on Solaris (without stack trace) - test failed on Solaris (without stack trace)
-> no -lbfd for --disable-stacktrace! -> no -lbfd for --disable-stacktrace!

30
configure.in
View File

@@ -9,6 +9,9 @@
## @license LGPL, see file <a href="license.html">COPYING</a> ## @license LGPL, see file <a href="license.html">COPYING</a>
## ##
## $Log$ ## $Log$
## Revision 1.9 2004/09/09 20:09:06 marc
## library versioning now works how i want it
##
## Revision 1.8 2004/08/31 16:24:55 marc ## Revision 1.8 2004/08/31 16:24:55 marc
## no "if [];" but "if test;"! ## no "if [];" but "if test;"!
## ##
@@ -32,10 +35,26 @@
# init # init
AC_INIT([mrw/mrw.hpp.in]) AC_INIT([mrw/mrw.hpp.in])
PACKAGENAME=mrw-c++ PACKAGENAME=mrw-c++
MAJOR=0 m4_define(major, 1)
MINOR=93 m4_define(minor, 94)
SUPPORT= m4_define(least, 0)
AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@, [marc@waeckerlin.org]) AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])
# copy M4 to shell
MAJOR=major
MINOR=minor
LEAST=least
AC_SUBST(MAJOR)
AC_SUBST(MINOR)
AC_SUBST(LEAST)
# libtool versioning
LIB_MAJOR=m4_eval(major+minor)
AC_SUBST(LIB_MAJOR)
LIB_MINOR=least
AC_SUBST(LIB_MINOR)
LIB_LEAST=minor
AC_SUBST(LIB_LEAST)
# macros # macros
README=README README=README
@@ -96,9 +115,6 @@ fi
# export macros # export macros
AC_SUBST(HAVE_DOT) AC_SUBST(HAVE_DOT)
AC_SUBST(MAJOR)
AC_SUBST(MINOR)
AC_SUBST(SUPPORT)
AC_SUBST(PACKAGENAME) AC_SUBST(PACKAGENAME)
AC_SUBST(AM_CXXFLAGS) AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CPPFLAGS)

15
makefile.am
View File

@@ -9,6 +9,9 @@
## @license LGPL, see file <a href="license.html">COPYING</a> ## @license LGPL, see file <a href="license.html">COPYING</a>
## ##
## $Log$ ## $Log$
## Revision 1.8 2004/09/09 20:09:06 marc
## library versioning now works how i want it
##
## Revision 1.7 2004/08/31 16:22:29 marc ## Revision 1.7 2004/08/31 16:22:29 marc
## webserver now depends on tag and rpm ## webserver now depends on tag and rpm
## added .PHONY ## added .PHONY
@@ -38,8 +41,8 @@ infosdir = ${pkgdatadir}
infos_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog \ infos_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog \
@PACKAGENAME@.spec @PACKAGENAME@-devel.spec @PACKAGENAME@.spec @PACKAGENAME@-devel.spec
RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@-1.i586.rpm \ RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm \
/usr/src/packages/RPMS/i586/@PACKAGENAME@-devel-@MAJOR@.@MINOR@-1.i586.rpm /usr/src/packages/RPMS/i586/@PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm
.PHONY: release tag rpm webserver distclean-local .PHONY: release tag rpm webserver distclean-local
@@ -47,10 +50,10 @@ release: rpm tag webserver
tag: tag:
cvs ci -R . cvs ci -R .
cvs tag -FR REL_@PACKAGENAME@-@MAJOR@-@MINOR@ . cvs tag -FR REL_@PACKAGENAME@-@MAJOR@-@MINOR@-@LEAST@ .
rpm: dist rpm: dist
cp @PACKAGENAME@-@MAJOR@.@MINOR@.tar.gz /usr/src/packages/SOURCES/ cp @PACKAGENAME@-@MAJOR@.@MINOR@-@LEAST@.tar.gz /usr/src/packages/SOURCES/
rpmbuild -bb --clean @PACKAGENAME@.spec rpmbuild -bb --clean @PACKAGENAME@.spec
rpmbuild -bb --clean @PACKAGENAME@-devel.spec rpmbuild -bb --clean @PACKAGENAME@-devel.spec
@@ -58,8 +61,8 @@ webserver: check tag all check dist rpm
ssh root@waeckerlin.org bash -c \ ssh root@waeckerlin.org bash -c \
'"rm -r /home/marc/mrw-c++; mkdir -p /home/marc/mrw-c++"' '"rm -r /home/marc/mrw-c++; mkdir -p /home/marc/mrw-c++"'
scp mrw/doc/html/* \ scp mrw/doc/html/* \
mrw/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.pdf \ mrw/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf \
@PACKAGENAME@-@MAJOR@.@MINOR@.tar.gz \ @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz \
${RPMS} \ ${RPMS} \
root@waeckerlin.org:/home/marc/mrw-c++/ root@waeckerlin.org:/home/marc/mrw-c++/

11
mrw-c++-devel.spec.in
View File

@@ -9,6 +9,9 @@
## @license LGPL, see file <a href="license.html">COPYING</a> ## @license LGPL, see file <a href="license.html">COPYING</a>
## ##
## $Log$ ## $Log$
## Revision 1.3 2004/09/09 20:09:06 marc
## library versioning now works how i want it
##
## Revision 1.2 2004/08/28 16:21:07 marc ## Revision 1.2 2004/08/28 16:21:07 marc
## mrw-c++-0.92 (mrw) ## mrw-c++-0.92 (mrw)
## - new file: version.cpp ## - new file: version.cpp
@@ -26,19 +29,19 @@
# rpmbuild -bb --clean @PACKAGENAME@.spec # rpmbuild -bb --clean @PACKAGENAME@.spec
Summary: MRW's C++ Class Library, facilities for ease and quality Summary: MRW's C++ Class Library, facilities for ease and quality
Name: @PACKAGENAME@-devel Name: @PACKAGENAME@-devel
Version: @MAJOR@.@MINOR@ Version: @MAJOR@.@MINOR@.@LEAST@
Release: 1 Release: 1
License: LGPL License: LGPL
Group: Development/Libraries/C++ Group: Development/Libraries/C++
URL: http://marc.waeckerlin.org/mrw-c++/index.html URL: http://marc.waeckerlin.org/mrw-c++/index.html
Source0: @PACKAGENAME@-@MAJOR@.@MINOR@.tar.gz Source0: @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Prefix: /usr Prefix: /usr
Requires: gcc-c++ >= 3.0 Requires: gcc-c++ >= 3.0
Requires: binutils Requires: binutils
Requires: @PACKAGENAME@ = @MAJOR@.@MINOR@ Requires: @PACKAGENAME@ = @MAJOR@.@MINOR@.@LEAST@
%description %description
@README@ @README@
@@ -46,7 +49,7 @@ Requires: @PACKAGENAME@ = @MAJOR@.@MINOR@
This Package contains all files required for developement. This Package contains all files required for developement.
%prep %prep
%setup -q -n @PACKAGENAME@-@MAJOR@.@MINOR@ %setup -q -n @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@
./configure --prefix=$RPM_BUILD_ROOT/usr ./configure --prefix=$RPM_BUILD_ROOT/usr
%build %build

5
mrw-c++.spec.in
View File

@@ -9,6 +9,9 @@
## @license LGPL, see file <a href="license.html">COPYING</a> ## @license LGPL, see file <a href="license.html">COPYING</a>
## ##
## $Log$ ## $Log$
## Revision 1.3 2004/09/09 20:09:06 marc
## library versioning now works how i want it
##
## Revision 1.2 2004/08/28 16:21:07 marc ## Revision 1.2 2004/08/28 16:21:07 marc
## mrw-c++-0.92 (mrw) ## mrw-c++-0.92 (mrw)
## - new file: version.cpp ## - new file: version.cpp
@@ -26,7 +29,7 @@
# rpmbuild -bb --clean @PACKAGENAME@.spec # rpmbuild -bb --clean @PACKAGENAME@.spec
Summary: MRW's C++ Class Library, facilities for ease and quality Summary: MRW's C++ Class Library, facilities for ease and quality
Name: @PACKAGENAME@ Name: @PACKAGENAME@
Version: @MAJOR@.@MINOR@ Version: @MAJOR@.@MINOR@.@LEAST@
Release: 1 Release: 1
License: LGPL License: LGPL
Group: Development/Libraries/C++ Group: Development/Libraries/C++

5
mrw/doxyfile.in
View File

@@ -9,6 +9,9 @@
## @license LGPL, see file <a href="license.html">COPYING</a> ## @license LGPL, see file <a href="license.html">COPYING</a>
## ##
## $Log$ ## $Log$
## Revision 1.9 2004/09/09 20:09:06 marc
## library versioning now works how i want it
##
## Revision 1.8 2004/08/29 19:20:05 marc ## Revision 1.8 2004/08/29 19:20:05 marc
## "Version" text in PROJECT_NUMBER ## "Version" text in PROJECT_NUMBER
## ##
@@ -54,7 +57,7 @@ PROJECT_NAME = "MRW C++ Library"
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = "Version @MAJOR@.@MINOR@@SUPPORT@" PROJECT_NUMBER = "Version @MAJOR@.@MINOR@.@LEAST@"
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

20
mrw/makefile.am
View File

@@ -9,6 +9,9 @@
## @license LGPL, see file <a href="license.html">COPYING</a> ## @license LGPL, see file <a href="license.html">COPYING</a>
## ##
## $Log$ ## $Log$
## Revision 1.8 2004/09/09 20:09:06 marc
## library versioning now works how i want it
##
## Revision 1.7 2004/08/31 16:23:57 marc ## Revision 1.7 2004/08/31 16:23:57 marc
## added .PHONY ## added .PHONY
## ##
@@ -32,13 +35,13 @@ if HAVE_STACKTRACE
AM_CPPFLAGS += -DHAVE_STACKTRACE AM_CPPFLAGS += -DHAVE_STACKTRACE
endif endif
CLEANFILES = doxygen.error CLEANFILES = doxygen.errors
examplesdir = ${pkgdatadir}/examples examplesdir = ${pkgdatadir}/examples
examples_DATA = examples/* examples_DATA = examples/*
htmldir = ${pkgdatadir}/doc/html htmldir = ${pkgdatadir}/doc/html
html_DATA = doc/html/index.html doc/html/* html_DATA = doc/html/index.html doc/html/*
pdfdir = ${pkgdatadir}/doc/pdf pdfdir = ${pkgdatadir}/doc/pdf
pdf_DATA = doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.pdf pdf_DATA = doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
EXTRA_DIST = test.dat ${examples_DATA} ${html_DATA} ${pdf_DATA} EXTRA_DIST = test.dat ${examples_DATA} ${html_DATA} ${pdf_DATA}
lib_LTLIBRARIES = libmrw.la lib_LTLIBRARIES = libmrw.la
@@ -57,16 +60,15 @@ libmrw_la_SOURCES = mrw.hpp \
if HAVE_STACKTRACE if HAVE_STACKTRACE
libmrw_la_SOURCES += stacktrace.hpp stacktrace.cpp libmrw_la_SOURCES += stacktrace.hpp stacktrace.cpp
endif endif
libmrw_la_LDFLAGS = -version-info @MAJOR@:@MINOR@ libmrw_la_LDFLAGS = -version-info @LIB_MAJOR@:@LIB_MINOR@:@LIB_LEAST@
if HAVE_STACKTRACE if HAVE_STACKTRACE
libmrwexcstderr_la_SOURCES = autostacktracestderr.cpp version.cpp libmrwexcstderr_la_SOURCES = autostacktracestderr.cpp version.cpp
libmrwexcstderr_la_LDFLAGS = -version-info @MAJOR@:@MINOR@ libmrwexcstderr_la_LDFLAGS = -version-info @LIB_MAJOR@:@LIB_MINOR@:@LIB_LEAST@
libmrwexcstderr_la_LIBADD = -lmrw libmrwexcstderr_la_LIBADD = -lmrw
if HAVE_LOG4CXX if HAVE_LOG4CXX
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cpp version.cpp libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cpp version.cpp
libmrwexclog4cxx_la_LDFLAGS = -version-info @MAJOR@:@MINOR@ libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_MAJOR@:@LIB_MINOR@:@LIB_LEAST@
libmrwexclog4cxx_la_LIBADD = -lmrw libmrwexclog4cxx_la_LIBADD = -lmrw
endif endif
endif endif
@@ -105,12 +107,12 @@ TESTS = ${check_PROGRAMS}
.PHONY: doc clean-local distclean-local .PHONY: doc clean-local distclean-local
deps = ../COPYING ../README ../INSTALL ../NEWS ../ChangeLog deps = ../COPYING ../README ../INSTALL ../NEWS ../ChangeLog
doc: doc/html/index.html doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.pdf doc: doc/html/index.html doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
doc/html/index.html: doxyfile *.[ch]pp ${deps} doc/html/index.html: doxyfile *.[ch]pp ${deps}
doxygen doxyfile doxygen doxyfile
doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.pdf: doxyfile *.[ch]pp ${deps} doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf: doxyfile *.[ch]pp ${deps}
cd doc/latex && make && \ cd doc/latex && make && \
mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.pdf mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
clean-local: clean-local:
- rm doxygen.err libmrw.doxytag - rm doxygen.err libmrw.doxytag
distclean-local: distclean-local:

8
mrw/mrw.hpp.in
View File

@@ -12,13 +12,13 @@
Download this version from here: Download this version from here:
- Source TAR-Ball (<code>./configure && make all install</code>): - Source TAR-Ball (<code>./configure && make all install</code>):
- http://marc.waeckerlin.org/mrw-c++/mrw-c++-@MAJOR@.@MINOR@.tar.gz - http://marc.waeckerlin.org/mrw-c++/mrw-c++-@MAJOR@.@MINOR@.@LEAST@.tar.gz
- RPM Packages (built on i586/SuSE): - RPM Packages (built on i586/SuSE):
- http://marc.waeckerlin.org/mrw-c++/mrw-c++-@MAJOR@.@MINOR@-1.i586.rpm - http://marc.waeckerlin.org/mrw-c++/mrw-c++-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm
- http://marc.waeckerlin.org/mrw-c++/mrw-c++-devel-@MAJOR@.@MINOR@-1.i586.rpm - http://marc.waeckerlin.org/mrw-c++/mrw-c++-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm
Download this documentation in PDF: Download this documentation in PDF:
- http://marc.waeckerlin.org/mrw-c++/mrw-c++-@MAJOR@.@MINOR@.pdf - http://marc.waeckerlin.org/mrw-c++/mrw-c++-@MAJOR@.@MINOR@.@LEAST@.pdf
The homepage is on: The homepage is on:
- http://marc.waeckerlin.org/mrw-c++/index.html - http://marc.waeckerlin.org/mrw-c++/index.html

5
mrw/version.cpp.in
View File

@@ -9,6 +9,9 @@
@license LGPL, see file <a href="license.html">COPYING</a> @license LGPL, see file <a href="license.html">COPYING</a>
$Log$ $Log$
Revision 1.2 2004/09/09 20:09:06 marc
library versioning now works how i want it
Revision 1.1 2004/08/28 16:13:42 marc Revision 1.1 2004/08/28 16:13:42 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cpp
@@ -27,5 +30,5 @@
#include <string> #include <string>
namespace mrw { namespace mrw {
const std::string version("@(#)@PACKAGENAME@-@MAJOR@.@MINOR@@SUPPORT@"); const std::string version("@(#)@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@");
} }