Menu
▾
▴
libfunutil-cvs — CVS commit messages for libfunUtil
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(58) |
Sep
(79) |
Oct
(41) |
Nov
(80) |
Dec
(23) |
|---|
|
From: <sg...@us...> - 2003-09-05 09:33:10
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv24577/toc/make Modified Files: c_bins.make Log Message: added to the example code. Index: c_bins.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/c_bins.make,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- c_bins.make 1 Sep 2003 05:09:50 -0000 1.1 +++ c_bins.make 5 Sep 2003 09:32:37 -0000 1.2 @@ -6,6 +6,7 @@ # bar_bin_SOURCES = bar.c bar2.c foobar.c # optional: foo_bin_OBJECTS = somethingdifferent.o # optional: foo_bin_CFLAGS = -DCOMPILING_FOO=1 -I/somewhere/different +# optional: foo_bin_LFLAGS = -lfl -lfoo # # all: bins # |
|
From: <sg...@us...> - 2003-09-05 09:32:53
|
Update of /cvsroot/libfunutil/libfunutil/toc/sbin
In directory sc8-pr-cvs1:/tmp/cvs-serv24599/toc/sbin
Modified Files:
toconfigure
Log Message:
Added support for PACKAGE_CONFIGURE_SCRIPT
Index: toconfigure
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/sbin/toconfigure,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- toconfigure 31 Aug 2003 20:29:30 -0000 1.10
+++ toconfigure 5 Sep 2003 09:32:50 -0000 1.11
@@ -59,7 +59,7 @@
toc_add_make PACKAGE_VERSION=${PACKAGE_VERSION}
# include package-specific configure script. This eases upgrading a project's toc:
-pkgconfig=configure.${PACKAGE_NAME}
+pkgconfig=${PACKAGE_CONFIGURE_SCRIPT-configure.${PACKAGE_NAME}}
test -f $pkgconfig && {
. $pkgconfig
err=$?
@@ -73,7 +73,7 @@
# toc_run_fail toc_configure_finalcheck
# toc_configre_finalcheck is arguable :/
-toc_endconfigure | perl -ane '
+toc_endconfigure | perl -ane '$| = 1;
if( ! -f $F[0] ) { print; next; }
$fn = $F[0];
$st = $_;
|
|
From: <sg...@us...> - 2003-09-05 09:32:48
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv24529/toc/make Modified Files: cleaner.make Log Message: Fixes to remove duplicate cleanings. Index: cleaner.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cleaner.make,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- cleaner.make 1 Sep 2003 04:59:22 -0000 1.6 +++ cleaner.make 5 Sep 2003 09:32:14 -0000 1.7 @@ -40,9 +40,9 @@ @$(call toc_make_subdirs,$*,distclean) -clean-.: +clean-.: clean-subdirs @$(call toc_clean_files,$(wildcard $(CLEAN_FILES))) -distclean-.: +distclean-.: distclean-subdirs @$(call toc_clean_files,$(wildcard $(CLEAN_FILES) $(DISTCLEAN_FILES))) subdirs-clean: # implemented elsewhere @@ -52,14 +52,14 @@ # toc-XXX stubs: don't use these directly -toc-clean: subdirs-clean clean-. -toc-distclean: subdirs-distclean distclean-. +#toc-clean: subdirs-clean clean-. +#toc-distclean: subdirs-distclean distclean-. # we clean depth-first to keep some top-level generated files from being nuked :/ ifeq (1,$(TOC_OVERRIDE_CLEAN)) clean: distclean: else -clean: toc-clean -distclean: toc-distclean +clean: clean-. +distclean: distclean-. endif |
|
From: <sg...@us...> - 2003-09-05 09:31:47
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv24445/toc/make
Modified Files:
toc_functions.make
Log Message:
Fixed a horrible bug, where $@ was used as the target filename (which is correct is most cases so far, but is not correct in all cases).
Index: toc_functions.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/toc_functions.make,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- toc_functions.make 1 Sep 2003 05:09:30 -0000 1.1
+++ toc_functions.make 5 Sep 2003 09:31:44 -0000 1.2
@@ -16,9 +16,9 @@
$(error Could not find TOC_ATPARSER_BIN at $(TOC_ATPARSER_BIN)!)
endif
toc_atparse_file = \
- $(TOC_ATPARSER_BIN) $(3) < $(1) > $(2).tmp; \
+ echo -n 'toc_atparse_file: '; $(TOC_ATPARSER_BIN) $(3) < $(1) > $(2).tmp; \
if cmp -s $(2).tmp $(2); then rm -f $(2).tmp; echo "$(2) is up to date."; \
- else mv -f $(2).tmp $@; echo "Updated $(2)."; fi
+ else mv -f $(2).tmp $(2); echo "Updated $(2)."; fi
######################################################################
@@ -42,7 +42,7 @@
# toc_compile_c_binary call()able function:
# compiles/links list of source files [$($(1)_bin_SOURCES) $($(1)_bin_OBJECTS)and $(2)]
# to create $(1). It uses the optional $($(1)_bin_CFLAGS).
-toc_compile_c_binary = $(CC) $(CFLAGS) $($(1)_bin_CFLAGS) -o $(1) $($(1)_bin_SOURCES) $($(1)_bin_OBJECTS) $(2)
+toc_compile_c_binary = $(CC) $(C_BINS_FROM_SOURCES_CFLAGS) $(CFLAGS) $($(1)_bin_CFLAGS) -o $(1) $($(1)_bin_SOURCES) $($(1)_bin_OBJECTS) $(2) $(C_BINS_FROM_SOURCES_LFLAGS) $($(1)_bin_LFLAGS)
######################################################################
|
|
From: <sg...@us...> - 2003-09-05 09:31:04
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv24325/toc/make
Modified Files:
subdirs_traverser.make
Log Message:
Removed the --no-print-directory, as it end up causing confusing output when you think something is deleted in a subdir but is really deleted higher up.
Index: subdirs_traverser.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/subdirs_traverser.make,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- subdirs_traverser.make 1 Sep 2003 04:59:22 -0000 1.11
+++ subdirs_traverser.make 5 Sep 2003 09:31:00 -0000 1.12
@@ -18,6 +18,7 @@
# toc_make_subdirs call()able function:
# $1 = list of dirs
# $2 = target
+# MAKE_NOP_ARG = --no-print-directory
toc_make_subdirs = \
test "x$(1)" = "x" && exit 0; \
tgt="$(2)"; test x = "x$$tgt" && tgt="all"; \
@@ -25,7 +26,7 @@
pwd=$$(pwd); \
cd $$pwd/$$b || exit; \
echo "Making $$tgt in $$pwd/$${b}"; \
- ${MAKE} --no-print-directory $$tgt || exit; \
+ ${MAKE} $(MAKE_NOP_ARG) $$tgt || exit; \
cd $$pwd || exit; \
done
|
|
From: <sg...@us...> - 2003-09-05 09:30:22
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv24241/toc/make Modified Files: qmake2make.make Log Message: error text change Index: qmake2make.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/qmake2make.make,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- qmake2make.make 1 Sep 2003 04:59:49 -0000 1.18 +++ qmake2make.make 5 Sep 2003 09:30:19 -0000 1.19 @@ -15,8 +15,8 @@ QMAKE_QMAKE2MAKE_MAKE = $(toc_makesdir)/qmake2make.make -ifeq (,$(wildcard $(QMAKE))) -$(error this file requires the QMAKE var to point to the qmake binary. Maybe you need to run the qt test or add @QMAKE@ to your shared makefile?) +ifeq (,$(wildcard $(QTDIR))) +$(error $(QMAKE_QMAKE2MAKE_MAKE) requires the QTDIR var. Maybe you need to run the qt test?) endif ifeq (,$(DEPSGEN_BIN)) include $(toc_makesdir)/deps.make |
|
From: <sg...@us...> - 2003-09-05 09:29:59
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv24102/toc/make Modified Files: install.make Log Message: INSTALL_BINS are no longer stripped by default per recommendation from the GNU Make manual(!!!). Index: install.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/install.make,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- install.make 1 Sep 2003 04:58:22 -0000 1.24 +++ install.make 5 Sep 2003 09:29:55 -0000 1.25 @@ -128,7 +128,7 @@ # } -INSTALLER_BIN_FLAGS_BINS = -s -m 0755 +INSTALLER_BIN_FLAGS_BINS = -m 0755 INSTALLER_BIN_FLAGS_NONBINS = -m 0644 INSTALLER_BIN_FLAGS_LIBS = -m 0644 INSTALLER_BIN_FLAGS_LIBEXECS = -m 0755 |
|
From: <sg...@us...> - 2003-09-05 09:28:59
|
Update of /cvsroot/libfunutil/libfunutil/toc/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv23887/toc/bin
Modified Files:
atsign_parse
Log Message:
Added recursive @symbol@ parsing, so symbols can refer to each other.
Index: atsign_parse
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/bin/atsign_parse,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- atsign_parse 31 Aug 2003 20:27:39 -0000 1.3
+++ atsign_parse 5 Sep 2003 09:28:56 -0000 1.4
@@ -62,7 +62,7 @@
#print STDERR ": [$key]=[$val]\n";
if( $key =~ m|^include:(.+)| ) {
$key = $1;
- open INFILE, "<$val" or die "Cannot open file '$val', as requested by @include:$key@!";
+ open INFILE, "<$val" or die "Cannot open file '$val', as requested by \@include:$key@!";
@foo = <INFILE>;
close INFILE;
$val = join( "", @foo );
@@ -72,11 +72,16 @@
} # /BEGIN
while( <STDIN> ) {
- foreach $k (keys(%args)) {
- if( $_ !~ m|\@$k\@| ) { next; }
- $v = $args{$k};
- $_ =~ s|\@$k\@|$v|g;
- # print STDERR "replacing $k --> $v\n";
+
+ $loop = true;
+ while( $loop ) {
+ $cp = $_;
+ foreach $k (keys(%args)) {
+ $v = $args{$k};
+ next unless $_ =~ s|\@$k\@|$v|g;
+# print STDERR "replacing $k --> $v\n";
+ }
+ $loop = 0 if $cp eq $_;
}
if( $op_cleanup ) {
while( $_ =~ s|\@\S+\@||g ) {}
|
|
From: <sg...@us...> - 2003-09-05 09:28:19
|
Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv23790
Modified Files:
configure
Log Message:
added PACKAGE_CONFIGURE_SCRIPT to accomodate package name change.
Index: configure
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure 5 Sep 2003 05:41:36 -0000 1.9
+++ configure 5 Sep 2003 09:28:14 -0000 1.10
@@ -10,6 +10,7 @@
PACKAGE_NAME=libfunUtil
PACKAGE_VERSION=0.7.999
+PACKAGE_CONFIGURE_SCRIPT=configure.libfunutil
# toconfigure kicks off the configure process, which will eventually
# call configure.${PACKAGE_NAME}, writes out any output and returns 0
|
|
From: <sg...@us...> - 2003-09-05 09:27:53
|
Update of /cvsroot/libfunutil/libfunutil In directory sc8-pr-cvs1:/tmp/cvs-serv23701 Modified Files: Makefile Log Message: Removed the TOC_OVERRIDE_CLEAN bullshit. Index: Makefile =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile 5 Sep 2003 05:50:22 -0000 1.12 +++ Makefile 5 Sep 2003 09:27:50 -0000 1.13 @@ -1,16 +1,9 @@ # top-level makefile for the libfunutil project default: all -TOC_OVERRIDE_CLEAN = 1# tells cleaner to let us initialize clean/distclean deps SUBDIRS = build lib util tests include doc SUBDIRS += toc - -# note: we re-order the clean deps to make sure the shared makefile and config.h -# don't get deleted until near the end. -cleanorder = toc doc tests util lib include . -clean: $(addprefix clean-,$(cleanorder)) -distclean: $(addprefix distclean-,$(cleanorder)) include toc.make |
|
From: stephan b. <st...@ei...> - 2003-09-05 08:40:34
|
On Friday 05 September 2003 07:41, bo...@us... wrote: > # No spaces in the PACKAGE_NAME and _VERSION, please - this should > be # as filesystem-friendly as possible. export > > -PACKAGE_NAME=libfunutil > +PACKAGE_NAME=libfunUtil i know this is horrible, and i'm open to suggestions on good ways around it, but the above change means that configure.libfunutil won't be loaded. Before i do anything like change that var back or move configure.libfunutil to ...Util, what would be a better way of handling the inclusion of configure.X? Maybe Define a var like: PACKAGE_CONFIGURE_SCRIPT=... ? which defaults to configure.PACKAGE_NAME? -- ----- stephan st...@ei... - http://www.einsurance.de "...control is a degree of inhibition, and a system which is perfectly inhibited is completely frozen." -- Alan W. Watts |
|
From: stephan b. <st...@ei...> - 2003-09-05 08:28:13
|
On Friday 05 September 2003 07:36, bo...@us... wrote: > Log Message: > hmm, buildtool doesn't like it when some parts of the glob aren't > present?? > +GLOB = html/*.html html/*.gif html/*.css Or try: GLOB = $(wildcard ...) but this can have has side-effects which the list of files to be globbed is not created until after GLOB is processed. -- ----- stephan st...@ei... - http://www.einsurance.de "...control is a degree of inhibition, and a system which is perfectly inhibited is completely frozen." -- Alan W. Watts |
|
From: <bo...@us...> - 2003-09-05 07:42:03
|
Update of /cvsroot/libfunutil/libfunutil/lib/funUtil
In directory sc8-pr-cvs1:/tmp/cvs-serv7192
Modified Files:
ClassLoader.cpp ClassLoader.h
Log Message:
restore return values of APIs which were changed to support
simultaneous QString/std::string methods.
Index: ClassLoader.cpp
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/funUtil/ClassLoader.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ClassLoader.cpp 28 Aug 2003 11:54:36 -0000 1.32
+++ ClassLoader.cpp 5 Sep 2003 07:41:58 -0000 1.33
@@ -367,23 +367,24 @@
}
#if FUN_API_QSTRING
-void
+QStringList
ClassLoader::getTranslations(QStringList &list)
{
- if (classTrans_q.isEmpty()) return;
+ if (classTrans_q.isEmpty()) return list;
QAsciiDictIterator<void> it(classTrans_q);
for ( ; it.current(); ++it)
{
list.append(it.currentKey());
}
+ return list;
}
#endif
#if FUN_API_STD_STRING
-void
+string_list_type
ClassLoader::getTranslations(string_list_type &list)
{
#if FUN_UTIL_WITH_QT
- if (classTrans_q.isEmpty()) return;
+ if (classTrans_q.isEmpty()) return list;
QAsciiDictIterator<void> it(classTrans_q);
for ( ; it.current(); ++it)
{
@@ -397,6 +398,7 @@
list.push_back( (*it).first );
}
#endif
+ return list;
}
#endif
@@ -593,7 +595,7 @@
#if FUN_API_QSTRING
// This is cosmetic, and has no effect on ClassLoader's operation.
-void
+QStringList
ClassLoader::getClassNames(QStringList &list, bool openFiles)
{
if (openFiles) NOT_DONE("getClassNames(true) ignores openFiles!");
@@ -604,7 +606,7 @@
if (stat(path_q, &sb) == -1)
{
NOT_DONE("getClassNames() doesn't handle stat failure! (\"" << strerror(errno) << "\")");
- return;
+ return list;
}
// If we don't have a buffered list, or we do but the directory
// has been modified since we buffered it, we need to re-scan the
@@ -619,7 +621,7 @@
if (dp == NULL)
{
NOT_DONE("boo hoo hoo, need to handle opendir(\"" << path_q << "\") failure");
- return;
+ return list;
}
QRegExp re("\\.so$");
QString filename;
@@ -678,17 +680,16 @@
// got our list, and can proceed to the cash register.
if (getClassNamesBuf_q) list += *getClassNamesBuf_q;
+ return list;
}
#endif
#if FUN_API_STD_STRING
// This is cosmetic, and has no effect on ClassLoader's operation.
-void
+string_list_type
ClassLoader::getClassNames(string_list_type &list, bool openFiles)
{
#if FUN_UTIL_WITH_QT
- QStringList qlist;
- getClassNames(qlist, openFiles);
- listToList(qlist, list);
+ listToList(getClassNames(QStringList(), openFiles), list);
#else
if (openFiles) NOT_DONE("getClassNames(true) ignores openFiles!");
if (next != NULL) next->getClassNames(list, openFiles);
@@ -698,7 +699,7 @@
if (stat(path_s.c_str(), &sb) == -1)
{
NOT_DONE("getClassNames() doesn't handle stat failure! (\"" << strerror(errno) << "\")");
- return;
+ return list;
}
// If we don't have a buffered list, or we do but the directory
// has been modified since we buffered it, we need to re-scan the
@@ -713,7 +714,7 @@
if (dp == NULL)
{
NOT_DONE("boo hoo hoo, need to handle opendir(\"" << path << "\") failure");
- return;
+ return list;
}
// QRegExp re("\\.so$");
std::string filename;
@@ -781,6 +782,7 @@
if (getClassNamesBuf_q) list += *getClassNamesBuf_q;
#endif
+ return list;
}
#endif
@@ -922,13 +924,13 @@
#endif
#if FUN_API_QSTRING
-void
+QString
ClassLoader::decodeTypeIDName(const char *name, QString &rv)
{
// XXX I'm sure this is compiler-specific, and should be wrapped in
// XXX an #ifdef determined by a configure test.
rv = QString::null;
- if (!name) return;
+ if (!name) return rv;
QString buf(name);
const char *np = name;
int nlen;
@@ -944,7 +946,7 @@
if (nlen < 1)
{
rv = name;
- return;
+ return rv;
}
if (nlen < 10) ++np;
else if (nlen < 100) np += 2;
@@ -957,21 +959,20 @@
np += nlen;
}
} while (wantE);
+ return rv;
}
#endif
#if FUN_API_STD_STRING
-void
+std::string
ClassLoader::decodeTypeIDName(const char *name, std::string &rv)
{
#if FUN_UTIL_WITH_QT
- QString qs;
- decodeTypeIDName(name, qs);
- rv = (const char *)qs;
+ rv = (const char *)decodeTypeIDName(name, QString());
#else
// XXX I'm sure this is compiler-specific, and should be wrapped in
// XXX an #ifdef determined by a configure test.
rv.clear();
- if (!name) return;
+ if (!name) return rv;
std::string buf(name);
const char *np = name;
int nlen;
@@ -987,7 +988,7 @@
if (nlen < 1)
{
rv = name;
- return;
+ return rv;
}
if (nlen < 10) ++np;
else if (nlen < 100) np += 2;
@@ -1001,6 +1002,7 @@
}
} while (wantE);
#endif
+ return rv;
}
#endif
Index: ClassLoader.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/funUtil/ClassLoader.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ClassLoader.h 28 Aug 2003 12:01:00 -0000 1.24
+++ ClassLoader.h 5 Sep 2003 07:41:59 -0000 1.25
@@ -224,25 +224,25 @@
#if FUN_API_QSTRING
/**
- * Appends all of the translated class names to the given list. You'll
- * have to call getTranslation() for each element in the list to find
- * out what it's mapped to.
+ * Appends all of the translated class names to the given list, and
+ * returns it. You'll have to call getTranslation() for each element
+ * in the list to find out what it's mapped to.
*
- * This appends to the list instead of returning a new list for
- * simultaneous support of QString and std::string APIs.
+ * (The only reason this takes the list as an argument is for
+ * simultaneous support of QString and std::string APIs.)
*/
- virtual void getTranslations(QStringList &list);
+ virtual QStringList getTranslations(QStringList &);
#endif
#if FUN_API_STD_STRING
/**
- * Appends all of the translated class names to the given list. You'll
- * have to call getTranslation() for each element in the list to find
- * out what it's mapped to.
+ * Appends all of the translated class names to the given list, and
+ * returns it. You'll have to call getTranslation() for each element
+ * in the list to find out what it's mapped to.
*
- * This appends to the list instead of returning a new list for
- * simultaneous support of QString and std::string APIs.
+ * (The only reason this takes the list as an argument is for
+ * simultaneous support of QString and std::string APIs.)
*/
- virtual void getTranslations(string_list_type &list);
+ virtual string_list_type getTranslations(string_list_type &);
#endif
/**
@@ -307,7 +307,7 @@
#if FUN_API_QSTRING
/**
* Gets the list of class names which this ClassLoader believes it
- * can instantiate.
+ * can instantiate, appends them to the given list, and returns it.
*
* ClassLoaders for whom setDSODir() has been called look at the
* list of files in their DSO directory.
@@ -341,15 +341,15 @@
* QStringList/QValueList member for getting a sorted unique list,
* so see ClassLoader::sortUniq(QStringList &).)
*
- * This appends to the list instead of returning a new list for
- * simultaneous support of QString and std::string APIs.
+ * (The only reason this takes the list as an argument is for
+ * simultaneous support of QString and std::string APIs.)
*/
- void getClassNames(QStringList &list, bool openFiles = false);
+ QStringList getClassNames(QStringList &, bool openFiles = false);
#endif
#if FUN_API_STD_QSTRING
/**
* Gets the list of class names which this ClassLoader believes it
- * can instantiate.
+ * can instantiate, appends them to the given list, and returns it.
*
* ClassLoaders for whom setDSODir() has been called look at the
* list of files in their DSO directory.
@@ -381,10 +381,10 @@
* will append its list to the list returned by the "next" ClassLoader,
* and will not attempt to remove duplicates.
*
- * This appends to the list instead of returning a new list for
- * simultaneous support of QString and std::string APIs.
+ * (The only reason this takes the list as an argument is for
+ * simultaneous support of QString and std::string APIs.)
*/
- void getClassNames(string_list_type &list, bool openFiles = false);
+ string_list_type getClassNames(string_list_type &, bool openFiles = false);
#endif
/**
@@ -419,12 +419,12 @@
* doesn't know what to do with it.)
*
* If this isn't able to figure out how to decode the given name, it
- * just sets @c decodedName to @c name.
+ * just returns @c name.
*
- * This takes a reference to a string instead of returning a string for
- * simultaneous support of QString and std::string APIs.
+ * The only reason this takes a reference to a string (which is returned)
+ * is for simultaneous support of QString and std::string APIs.
*/
- static void decodeTypeIDName(const char *name, QString &decodedName);
+ static QString decodeTypeIDName(const char *name, QString &);
#endif
#if FUN_API_STD_QSTRING
/**
@@ -435,12 +435,12 @@
* doesn't know what to do with it.)
*
* If this isn't able to figure out how to decode the given name, it
- * just sets @c decodedName to @c name.
+ * just returns @c name.
*
- * This takes a reference to a string instead of returning a string for
- * simultaneous support of QString and std::string APIs.
+ * The only reason this takes a reference to a string (which is returned)
+ * is for simultaneous support of QString and std::string APIs.
*/
- static void decodeTypeIDName(const char *name, std::string &decodedName);
+ static std::string decodeTypeIDName(const char *name, std::string &);
#endif
private:
|
|
From: <bo...@us...> - 2003-09-05 06:18:56
|
Update of /cvsroot/libfunutil/libfunutil/lib/funUtil
In directory sc8-pr-cvs1:/tmp/cvs-serv25700
Modified Files:
LoadableClass.h
Log Message:
s/LoadableClass/fun::LoadableClass/ in macros
Index: LoadableClass.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/funUtil/LoadableClass.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LoadableClass.h 28 Aug 2003 11:29:10 -0000 1.6
+++ LoadableClass.h 5 Sep 2003 06:18:49 -0000 1.7
@@ -50,11 +50,11 @@
* sigh... your class must inherit from LoadableClass.)
*
* All "INSTANTIATOR(Foo)" does is create the following code:
- * extern "C" { LoadableClass * newFoo() { return new Foo(); } }
+ * extern "C" { fun::LoadableClass * newFoo() { return new Foo(); } }
* So if you want to do that yourself, or something more sophisticated,
* knock yourself out.
*/
-#define INSTANTIATOR(clsnm) extern "C" { LoadableClass * new ## clsnm() { return new clsnm; } }
+#define INSTANTIATOR(clsnm) extern "C" { fun::LoadableClass * new ## clsnm() { return new clsnm; } }
/**
* If you want a class to be loadable by ClassLoader, and you multiply
@@ -66,11 +66,11 @@
* LoadableClass.)
*
* All "INSTANTIATOR_UNAMBIGUOUS(Foo, SuperFoo)" does is create the following code:
- * extern "C" { LoadableClass * newFoo() { return (SuperFoo *)(new Foo()); } }
+ * extern "C" { fun::LoadableClass * newFoo() { return (SuperFoo *)(new Foo()); } }
* So if you want to do that yourself, or something more sophisticated,
* knock yourself out.
*/
-#define INSTANTIATOR_UNAMBIGUOUS(clsnm, supercls) extern "C" { LoadableClass * new ## clsnm() { return (supercls *)(new clsnm); } }
+#define INSTANTIATOR_UNAMBIGUOUS(clsnm, supercls) extern "C" { fun::LoadableClass * new ## clsnm() { return (supercls *)(new clsnm); } }
/**
* If you want a class defined in a namespace to be loadable by ClassLoader,
@@ -80,11 +80,11 @@
* LoadableClass.)
*
* All "NAMESPACE_INSTANTIATOR(NameSpace, Foo)" does is create the following code:
- * extern "C" { LoadableClass * newNameSpace_Foo() { return new NameSpace::Foo(); } }
+ * extern "C" { fun::LoadableClass * newNameSpace_Foo() { return new NameSpace::Foo(); } }
* So if you want to do that yourself, or something more sophisticated,
* knock yourself out.
*/
-#define NAMESPACE_INSTANTIATOR(ns, clsnm) extern "C" { LoadableClass * new ## ns ## _ ## clsnm() { return new ns::clsnm; } }
+#define NAMESPACE_INSTANTIATOR(ns, clsnm) extern "C" { fun::LoadableClass * new ## ns ## _ ## clsnm() { return new ns::clsnm; } }
/**
* If you want a class defined in a namespace to be loadable by ClassLoader,
@@ -96,11 +96,11 @@
* class must inherit from LoadableClass.)
*
* All "NAMESPACE_INSTANTIATOR(NameSpace, Foo, SuperFoo)" does is create the following code:
- * extern "C" { LoadableClass * newNameSpace_Foo() { return (SuperFoo *)(new NameSpace::Foo); } }
+ * extern "C" { fun::LoadableClass * newNameSpace_Foo() { return (SuperFoo *)(new NameSpace::Foo); } }
* So if you want to do that yourself, or something more sophisticated,
* knock yourself out.
*/
-#define NAMESPACE_INSTANTIATOR_UNAMBIGUOUS(ns, clsnm, supercls) extern "C" { LoadableClass * new ## ns ## _ ## clsnm() { return (supercls *)(new ns::clsnm); } }
+#define NAMESPACE_INSTANTIATOR_UNAMBIGUOUS(ns, clsnm, supercls) extern "C" { fun::LoadableClass * new ## ns ## _ ## clsnm() { return (supercls *)(new ns::clsnm); } }
}; // namespace fun
|
|
From: <bo...@us...> - 2003-09-05 06:18:20
|
Update of /cvsroot/libfunutil/libfunutil/lib/funUtil In directory sc8-pr-cvs1:/tmp/cvs-serv25643 Modified Files: Makefile.bt Log Message: get library version numbers from package version, remove fun-config.h symlink if it already exists (a suspicious change) Index: Makefile.bt =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/lib/funUtil/Makefile.bt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.bt 28 Aug 2003 11:55:15 -0000 1.4 +++ Makefile.bt 5 Sep 2003 06:18:17 -0000 1.5 @@ -10,8 +10,9 @@ # Library name and version BT_LIB= funUtil -BT_LIB_MAJOR= 0 -BT_LIB_MINOR= 1 +BT_LIB_MAJOR= $(BT_PKG_VERSION:C/^([0-9]+).*/\1/) +BT_LIB_MINOR= $(BT_PKG_VERSION:C/^[0-9]+\.([0-9]+).*/\1/) +BT_LIB_MICRO= $(BT_PKG_VERSION:C/^[0-9]+\.[0-9]+\.([0-9]+.*)/\1/) # Source files BT_SRCS= \ @@ -80,6 +81,7 @@ # This creates symlinks for the installed headers in BT_TOPDIR/include/fun. headers: $(BT_INCS:C/.+/$(top_srcdir)\/include\/fun\/&/) $(BT_INCS:C/.+/$(top_srcdir)\/include\/fun\/&/): $(@:C/.*[^\/]*\///) + if test -l $@; then rm $@; fi $(BT_INSTALL_SYMLINK) ../../lib/funUtil/$? $@ headers-clean: -rm $(BT_INCS:C/.+/$(top_srcdir)\/include\/fun\/&/) |
|
From: <bo...@us...> - 2003-09-05 06:16:32
|
Update of /cvsroot/libfunutil/libfunutil/build In directory sc8-pr-cvs1:/tmp/cvs-serv25292 Added Files: libfunUtil.spec.in Log Message: shpec file --- NEW FILE: libfunUtil.spec.in --- # # This RPM spec file uses toc for building the RPM package. If the toc # build doesn't work on your system & you need to use buildtool instead, # you'll need to modify the commands below. # # Also, make sure you're using the libfunUtil.spec file, not # libfunUtil.spec.in! Using toc, "make libfunUtil.spec"; using buildtool, # "buildtool make libfunUtil.spec" to get the spec file. # Summary: A C++ library for making fun stuff easier Name: @BT_PKG_NAME@ Version: @BT_PKG_VERSION@ Release: 1 Copyright: GPL Group: Development/Tools Source: http://libfunutil.sourceforge.net/.../libfunUtil-%{version}.tar.gz URL: http://libfunutil.sourceforge.net Buildroot: %{_tmppath}/%{name}-root Requires: /sbin/ldconfig %description libfunUtil is a small C++ library of utility classes for making "fun stuff" easier to do. It was originally written as part of the Q Universal Boardgame (http://qub.sourceforge.net/). It features: - An easy-to-use serialization API which saves to and loads from XML, text, and binary. This allows easily adding serialization support to your objects, and provides a framework for cross-application data sharing. - A command-line utility for converting between the supported serialization formats. You can, for example, convert binary to text, edit it with a text editor, then convert it back to binary. - A classloader for dynamically loading C++ classes from shared libraries. - A DieRoll class, fer cryin' out loud! How much more fun can you stand? It supports pluggable parsers for weird games, too! - API documentation. %package devel Summary: libfunUtil development headers & API documentation Group: Development/Tools %description devel Headers & API documentation for libfunUtil. %prep if ! test -d %{name}-%{version}; then # rpmbuild doesn't understand if the %setup line is indented %setup -q fi %build if test -d %{name}-%{version}; then cd %{name}-%{version} fi %configure make %install if test -d %{name}-%{version}; then cd %{name}-%{version} fi rm -rf %{buildroot} %makeinstall %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files # %defattr(0644,root,root,0755) %defattr(-,root,root) %{_bindir}/* %{_libdir}/*.so.* # %{_mandir}/man8/* %files devel %defattr(-,root,root) %doc CHANGES COPYING README README.bt README.toc %{_includedir}/fun/*.h %{_libdir}/*.a %{_libdir}/*.so # %{_mandir}/man3/* %{_docdir}/ |
|
From: <bo...@us...> - 2003-09-05 05:52:54
|
Update of /cvsroot/libfunutil/libfunutil/build In directory sc8-pr-cvs1:/tmp/cvs-serv22029 Added Files: Makefile Log Message: makefile for building rpm's --- NEW FILE: Makefile --- include toc.make TARBALL = $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz RPM_SPECFILE = libfunUtil.spec RPM_SPECFILE_IN = libfunUtil.spec.in all: $(RPM_SPECFILE) DIST_FILES += Makefile.bt $(RPM_SPECFILE_IN) rpmmacros atparser = $(top_srcdir)/toc/bin/atsign_parse $(RPM_SPECFILE): $(RPM_SPECFILE_IN) $(top_srcdir)/toc_shared.make $(call toc_atparse_file,$@.in,$@, \ BT_PKG_NAME=$(PACKAGE_NAME) BT_PKG_VERSION=$(PACKAGE_VERSION) \ BT_PROG_PERL=$(PERL_BIN)) # I want to be able to build RPMs using an arbitrary location (not require # that the user be root in order to build packages! or that they've already # set up their ~/.rpmmacros). --macros didn't seem to have any effect, so # this sets HOME to $PWD so that rpmbuild finds ./.rpmmacros. Man, I wish # gendist & inst were available on Linux! rpm: $(RPM_SPECFILE) .rpmmacros rpmbuild/BUILD rpmbuild/RPMS rpmbuild/SRPMS rpmbuild/$(TARBALL) HOME=$$PWD rpmbuild -ba $(RPM_SPECFILE) .rpmmacros: rpmmacros cp rpmmacros .rpmmacros rpmbuild/BUILD rpmbuild/RPMS rpmbuild/SRPMS: -mkdir -p $@ rpmbuild/$(TARBALL): rpmbuild/BUILD @if ! test -f $(top_srcdir)/$(TARBALL); then \ echo "looking for $(top_srcdir)/$(TARBALL) ... make dist first!"; \ exit 1; \ fi cp $(top_srcdir)/$(TARBALL) $@ CLEAN_FILES += .rpmmacros $(RPM_SPECFILE) clean: clean-rpm clean-rpm: -rm -rf rpmbuild |
|
From: <bo...@us...> - 2003-09-05 05:51:41
|
Update of /cvsroot/libfunutil/libfunutil/build In directory sc8-pr-cvs1:/tmp/cvs-serv21616 Added Files: Makefile.bt Log Message: incomplete buildtool makefile for building rpm's --- NEW FILE: Makefile.bt --- top_srcdir = .. .include "$(top_srcdir)/bt_config.mk" RPM_SPECFILE = libfunUtil.spec RPM_SPECFILE_IN = libfunUtil.spec.in all: $(RPM_SPECFILE) $(RPM_SPECFILE): $(RPM_SPECFILE_IN) $(top_srcdir)/bt_config.mk $(BT_OUTPUT) $@ # XXX this is not complete, see the toc Makefile .include <bt.init.mk> |
|
From: <bo...@us...> - 2003-09-05 05:51:15
|
Update of /cvsroot/libfunutil/libfunutil/build In directory sc8-pr-cvs1:/tmp/cvs-serv21554 Added Files: rpmmacros Log Message: bogo-rpmmacros file for getting rpmbuild to build in $PWD. Man I hate rpm. --- NEW FILE: rpmmacros --- # see complaints in Makefile. # # Portions of this originally came from http://freshrpms.net/docs/fight/ %packager %(echo $USER) #%_signature gpg #%_gpg_name ... %_topdir %(echo $PWD)/rpmbuild #%_tmppath %{_topdir}/tmp #%_builddir %{_tmppath} %_builddir %{_topdir}/BUILD #%_rpmtopdir %{_topdir}/%{name} %_rpmtopdir %{_topdir} %_sourcedir %{_rpmtopdir} %_specdir %{_rpmtopdir} %_rpmdir %{_topdir}/RPMS %_srcrpmdir %{_topdir}/SRPMS #%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm |
|
From: <bo...@us...> - 2003-09-05 05:50:26
|
Update of /cvsroot/libfunutil/libfunutil In directory sc8-pr-cvs1:/tmp/cvs-serv21459 Modified Files: Makefile Log Message: added build subdir & rpm target Index: Makefile =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile 1 Sep 2003 05:01:04 -0000 1.11 +++ Makefile 5 Sep 2003 05:50:22 -0000 1.12 @@ -3,7 +3,7 @@ default: all TOC_OVERRIDE_CLEAN = 1# tells cleaner to let us initialize clean/distclean deps -SUBDIRS = lib util tests include doc +SUBDIRS = build lib util tests include doc SUBDIRS += toc # note: we re-order the clean deps to make sure the shared makefile and config.h @@ -27,7 +27,7 @@ DIST_FILES += configure toc_shared.make.at toc_shared.qmake.at DIST_FILES += configure.$(PACKAGE_NAME) -DIST_FILES += README README.bt README.toc COPYING +DIST_FILES += README README.bt README.toc COPYING CHANGES ifeq (1,$(configure_with_buildtool)) DIST_FILES += Makefile.bt buildtool.d/config buildtool.d/defs buildtool.d/docs DIST_FILES += data/libfunUtil.bpf.in data/Makefile.bt @@ -35,4 +35,5 @@ all: subdirs - +rpm: + cd build && make rpm |
|
From: <bo...@us...> - 2003-09-05 05:41:39
|
Update of /cvsroot/libfunutil/libfunutil In directory sc8-pr-cvs1:/tmp/cvs-serv20368 Modified Files: configure Log Message: s/libfunutil/libfunUtil/ Index: configure =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- configure 31 Aug 2003 20:18:38 -0000 1.8 +++ configure 5 Sep 2003 05:41:36 -0000 1.9 @@ -7,7 +7,7 @@ # No spaces in the PACKAGE_NAME and _VERSION, please - this should be # as filesystem-friendly as possible. export -PACKAGE_NAME=libfunutil +PACKAGE_NAME=libfunUtil PACKAGE_VERSION=0.7.999 |
|
From: <bo...@us...> - 2003-09-05 05:41:18
|
Update of /cvsroot/libfunutil/libfunutil In directory sc8-pr-cvs1:/tmp/cvs-serv20324 Modified Files: CHANGES Log Message: added note about note to add Index: CHANGES =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/CHANGES,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CHANGES 24 Aug 2003 10:45:54 -0000 1.1 +++ CHANGES 5 Sep 2003 05:41:14 -0000 1.2 @@ -22,3 +22,5 @@ - Some of the API documentation has been substantially improved. (Also, it no longer builds using kdoc; you have to use doxygen.) + +XXX the api changes to support side-by-side string apis |
|
From: <bo...@us...> - 2003-09-05 05:39:36
|
Update of /cvsroot/libfunutil/libfunutil/doc/api/html In directory sc8-pr-cvs1:/tmp/cvs-serv20066 Modified Files: Makefile Log Message: add *.gif, fiddle with dest dir, but that part doesn't make a difference? (at least in the RPM packages I'm building...) Index: Makefile =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/doc/api/html/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 26 Aug 2003 00:57:49 -0000 1.1 +++ Makefile 5 Sep 2003 05:39:32 -0000 1.2 @@ -2,6 +2,7 @@ include toc.make -DOCS_GLOB = *.html *.png *.css +DOCS_GLOB = *.html *.gif *.png *.css CLEAN_FILES = $(wildcard $(DOCS_GLOB)) INSTALL_DOCS = $(CLEAN_FILES) +INSTALL_DOCS_DEST = $(prefix)/share/doc/$(PACKAGE_NAME)/api/html |
|
From: <bo...@us...> - 2003-09-05 05:36:59
|
Update of /cvsroot/libfunutil/libfunutil/doc/api In directory sc8-pr-cvs1:/tmp/cvs-serv19637 Modified Files: Makefile.bt Log Message: hmm, buildtool doesn't like it when some parts of the glob aren't present?? Index: Makefile.bt =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/doc/api/Makefile.bt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.bt 28 Aug 2003 11:38:49 -0000 1.3 +++ Makefile.bt 5 Sep 2003 05:36:55 -0000 1.4 @@ -7,7 +7,7 @@ install: install-doxygen .endif -GLOB = html/*.html html/*.png html/*.gif html/*.css +GLOB = html/*.html html/*.gif html/*.css build-doxygen: clean-doxygen Doxyfile $(BT_PROG_DOXYGEN) |
|
From: <bo...@us...> - 2003-09-05 05:20:32
|
Update of /cvsroot/libfunutil/libfunutil/build In directory sc8-pr-cvs1:/tmp/cvs-serv17472/build Log Message: Directory /cvsroot/libfunutil/libfunutil/build added to the repository |
