From e4bd5d213662460ffd80a7fc25e57b6c5c03915c Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 5 Mar 1997 19:56:25 +0000 Subject: [PATCH] flower-1.1.6 --- flower/NEWS | 8 ++++ flower/Sources.make | 21 ---------- flower/Variables.make | 45 ---------------------- flower/{ => lib}/choleski.cc | 0 flower/{ => lib}/data-file.cc | 0 flower/{ => lib}/dstream.cc | 0 flower/{ => lib/include}/assoc-iter.hh | 0 flower/{ => lib/include}/assoc.hh | 0 flower/{ => lib/include}/choleski.hh | 0 flower/{ => lib/include}/compare.hh | 0 flower/{ => lib/include}/cursor.hh | 0 flower/{ => lib/include}/cursor.inl | 0 flower/{ => lib/include}/cursor.tcc | 6 ++- flower/{ => lib/include}/data-file.hh | 0 flower/{ => lib/include}/dstream.hh | 0 flower/{ => lib/include}/fproto.hh | 0 flower/{ => lib/include}/handle.hh | 0 flower/{ => lib/include}/interval.hh | 0 flower/{ => lib/include}/interval.tcc | 0 flower/{ => lib/include}/iterate.hh | 0 flower/{ => lib/include}/lgetopt.hh | 0 flower/{ => lib/include}/libc-extension.hh | 0 flower/{ => lib/include}/link.hh | 0 flower/{ => lib/include}/link.inl | 0 flower/{ => lib/include}/list.hh | 0 flower/{ => lib/include}/list.inl | 0 flower/{ => lib/include}/list.tcc | 0 flower/{ => lib/include}/matrix.hh | 0 flower/{ => lib/include}/path.hh | 0 flower/{ => lib/include}/pcursor.hh | 7 ++-- flower/{ => lib/include}/pcursor.tcc | 0 flower/{ => lib/include}/plist.hh | 0 flower/{ => lib/include}/plist.inl | 0 flower/{ => lib/include}/plist.tcc | 2 +- flower/{ => lib/include}/pqueue.hh | 0 flower/{ => lib/include}/rational.hh | 0 flower/{ => lib/include}/real.hh | 0 flower/{ => lib/include}/scalar.hh | 0 flower/{ => lib/include}/smat.hh | 0 flower/{ => lib/include}/string-convert.hh | 0 flower/{ => lib/include}/string-data.hh | 2 +- flower/{ => lib/include}/string-data.inl | 5 ++- flower/{ => lib/include}/string-handle.hh | 2 +- flower/{ => lib/include}/string-handle.inl | 4 +- flower/{ => lib/include}/string.hh | 0 flower/{ => lib/include}/text-db.hh | 0 flower/{ => lib/include}/text-stream.hh | 0 flower/{ => lib/include}/unionfind.hh | 0 flower/{ => lib/include}/varray.hh | 0 flower/{ => lib/include}/vector.hh | 0 flower/{ => lib/include}/vsmat.hh | 0 flower/{ => lib}/lgetopt.cc | 0 flower/{ => lib}/libc-extension.cc | 0 flower/{ => lib}/matdebug.cc | 0 flower/{ => lib}/matrix.cc | 0 flower/{ => lib}/path.cc | 0 flower/{ => lib}/scalar.cc | 0 flower/{ => lib}/smat.cc | 0 flower/{ => lib}/string-convert.cc | 3 +- flower/{ => lib}/string.cc | 2 +- flower/{ => lib}/stringtest.cc | 4 ++ flower/{ => lib}/stringutil.cc | 0 flower/{ => lib}/text-db.cc | 0 flower/{ => lib}/text-stream.cc | 0 flower/{ => lib}/unionfind.cc | 0 flower/{ => lib}/vector.cc | 0 flower/make_version | 11 ------ 67 files changed, 31 insertions(+), 91 deletions(-) delete mode 100644 flower/Sources.make delete mode 100644 flower/Variables.make rename flower/{ => lib}/choleski.cc (100%) rename flower/{ => lib}/data-file.cc (100%) rename flower/{ => lib}/dstream.cc (100%) rename flower/{ => lib/include}/assoc-iter.hh (100%) rename flower/{ => lib/include}/assoc.hh (100%) rename flower/{ => lib/include}/choleski.hh (100%) rename flower/{ => lib/include}/compare.hh (100%) rename flower/{ => lib/include}/cursor.hh (100%) rename flower/{ => lib/include}/cursor.inl (100%) rename flower/{ => lib/include}/cursor.tcc (96%) rename flower/{ => lib/include}/data-file.hh (100%) rename flower/{ => lib/include}/dstream.hh (100%) rename flower/{ => lib/include}/fproto.hh (100%) rename flower/{ => lib/include}/handle.hh (100%) rename flower/{ => lib/include}/interval.hh (100%) rename flower/{ => lib/include}/interval.tcc (100%) rename flower/{ => lib/include}/iterate.hh (100%) rename flower/{ => lib/include}/lgetopt.hh (100%) rename flower/{ => lib/include}/libc-extension.hh (100%) rename flower/{ => lib/include}/link.hh (100%) rename flower/{ => lib/include}/link.inl (100%) rename flower/{ => lib/include}/list.hh (100%) rename flower/{ => lib/include}/list.inl (100%) rename flower/{ => lib/include}/list.tcc (100%) rename flower/{ => lib/include}/matrix.hh (100%) rename flower/{ => lib/include}/path.hh (100%) rename flower/{ => lib/include}/pcursor.hh (95%) rename flower/{ => lib/include}/pcursor.tcc (100%) rename flower/{ => lib/include}/plist.hh (100%) rename flower/{ => lib/include}/plist.inl (100%) rename flower/{ => lib/include}/plist.tcc (93%) rename flower/{ => lib/include}/pqueue.hh (100%) rename flower/{ => lib/include}/rational.hh (100%) rename flower/{ => lib/include}/real.hh (100%) rename flower/{ => lib/include}/scalar.hh (100%) rename flower/{ => lib/include}/smat.hh (100%) rename flower/{ => lib/include}/string-convert.hh (100%) rename flower/{ => lib/include}/string-data.hh (98%) rename flower/{ => lib/include}/string-data.inl (95%) rename flower/{ => lib/include}/string-handle.hh (97%) rename flower/{ => lib/include}/string-handle.inl (96%) rename flower/{ => lib/include}/string.hh (100%) rename flower/{ => lib/include}/text-db.hh (100%) rename flower/{ => lib/include}/text-stream.hh (100%) rename flower/{ => lib/include}/unionfind.hh (100%) rename flower/{ => lib/include}/varray.hh (100%) rename flower/{ => lib/include}/vector.hh (100%) rename flower/{ => lib/include}/vsmat.hh (100%) rename flower/{ => lib}/lgetopt.cc (100%) rename flower/{ => lib}/libc-extension.cc (100%) rename flower/{ => lib}/matdebug.cc (100%) rename flower/{ => lib}/matrix.cc (100%) rename flower/{ => lib}/path.cc (100%) rename flower/{ => lib}/scalar.cc (100%) rename flower/{ => lib}/smat.cc (100%) rename flower/{ => lib}/string-convert.cc (98%) rename flower/{ => lib}/string.cc (99%) rename flower/{ => lib}/stringtest.cc (98%) rename flower/{ => lib}/stringutil.cc (100%) rename flower/{ => lib}/text-db.cc (100%) rename flower/{ => lib}/text-stream.cc (100%) rename flower/{ => lib}/unionfind.cc (100%) rename flower/{ => lib}/vector.cc (100%) delete mode 100755 flower/make_version diff --git a/flower/NEWS b/flower/NEWS index faa08528d7..836eccbee0 100644 --- a/flower/NEWS +++ b/flower/NEWS @@ -1,7 +1,15 @@ +pl 1.1.6 + - all of 1.1.4-1 and 1.1.5 +Bugfix + - null_terminated -> is_binary test + pl 1.1.5 - memmem interface, conditional compilation - snprintf +pl 1.1.4-1 + - included in new make structure + pl 1.1.4 - great file-renaming. - String cleanup (binary <-> null terminate), several bugfixes diff --git a/flower/Sources.make b/flower/Sources.make deleted file mode 100644 index 4e08bec735..0000000000 --- a/flower/Sources.make +++ /dev/null @@ -1,21 +0,0 @@ - -cc=choleski.cc data-file.cc dstream.cc lgetopt.cc libc-extension.cc matdebug.cc\ - matrix.cc\ - path.cc scalar.cc smat.cc string.cc string-convert.cc stringutil.cc\ - text-db.cc text-stream.cc unionfind.cc vector.cc - -templatecc=cursor.tcc list.tcc plist.tcc interval.tcc\ - pcursor.tcc - -inl=link.inl list.inl cursor.inl plist.inl string-data.inl string-handle.inl - -hh=assoc.hh assoc-iter.hh choleski.hh compare.hh cursor.hh data-file.hh \ - dstream.hh\ - fproto.hh handle.hh interval.hh iterate.hh lgetopt.hh \ - libc-extension.hh link.hh list.hh\ - matrix.hh path.hh pcursor.hh plist.hh rational.hh real.hh scalar.hh\ - smat.hh string.hh string-convert.hh string-handle.hh string-data.hh\ - text-db.hh text-stream.hh unionfind.hh pqueue.hh\ - varray.hh vector.hh vsmat.hh - -extra=stringtest.cc diff --git a/flower/Variables.make b/flower/Variables.make deleted file mode 100644 index 23a14e903a..0000000000 --- a/flower/Variables.make +++ /dev/null @@ -1,45 +0,0 @@ -MAJVER=1 -MINVER=1 -PATCHLEVEL=5 - -PACKAGENAME=flower - -#PROFILEFLAG=-pg -#DEBUGFLAG= -g -OPTIFLAG= -DNPRINT -O2 -DSTRING_UTILS_INLINED # -DNDEBUG - -######################################### - -ifdef PROFILEFLAG - DEFINES+=$(OPTIFLAG) $(PROFILEFLAG) - EXTRALIB+=-pg -endif - -ifndef DEBUGFLAG - DEFINES+=$(OPTIFLAG) -else - DEFINES+=$(DEBUGFLAG) -endif - - -CXXFLAGS+=$(DEFINES) -Wall -W -CXXVER=$(CXX) --version - -VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL) -DNAME=$(PACKAGENAME)-$(VERSION) - -include Sources.make -OBJECTDIR=objects -CCDIR=. -obs=$(addprefix $(OBJECTDIR)/,$(cc:.cc=.o)) - -staticlib=libflower.a -ALLSOURCES=$(hh) $(cc) $(inl) $(templatecc) $(extra) -DFILES=$(ALLSOURCES) Makefile Variables.make make_version\ - Sources.make TODO README NEWS -DDIR=$(DNAME) - -depfile=deps/$(subst .o,.dep,$(notdir $@)) -DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(OBJECTDIR)/$(notdir $@)" -OUTPUT_OPTION=$< -o $@ -SUBDIRS=deps objects diff --git a/flower/choleski.cc b/flower/lib/choleski.cc similarity index 100% rename from flower/choleski.cc rename to flower/lib/choleski.cc diff --git a/flower/data-file.cc b/flower/lib/data-file.cc similarity index 100% rename from flower/data-file.cc rename to flower/lib/data-file.cc diff --git a/flower/dstream.cc b/flower/lib/dstream.cc similarity index 100% rename from flower/dstream.cc rename to flower/lib/dstream.cc diff --git a/flower/assoc-iter.hh b/flower/lib/include/assoc-iter.hh similarity index 100% rename from flower/assoc-iter.hh rename to flower/lib/include/assoc-iter.hh diff --git a/flower/assoc.hh b/flower/lib/include/assoc.hh similarity index 100% rename from flower/assoc.hh rename to flower/lib/include/assoc.hh diff --git a/flower/choleski.hh b/flower/lib/include/choleski.hh similarity index 100% rename from flower/choleski.hh rename to flower/lib/include/choleski.hh diff --git a/flower/compare.hh b/flower/lib/include/compare.hh similarity index 100% rename from flower/compare.hh rename to flower/lib/include/compare.hh diff --git a/flower/cursor.hh b/flower/lib/include/cursor.hh similarity index 100% rename from flower/cursor.hh rename to flower/lib/include/cursor.hh diff --git a/flower/cursor.inl b/flower/lib/include/cursor.inl similarity index 100% rename from flower/cursor.inl rename to flower/lib/include/cursor.inl diff --git a/flower/cursor.tcc b/flower/lib/include/cursor.tcc similarity index 96% rename from flower/cursor.tcc rename to flower/lib/include/cursor.tcc index 3d2116c46f..3be73fe5d2 100644 --- a/flower/cursor.tcc +++ b/flower/lib/include/cursor.tcc @@ -9,7 +9,8 @@ template Cursor::backspace() { Cursor c(*this); - c--; + if ( c.ok() ) + c--; list_.remove( *this ); } @@ -18,7 +19,8 @@ template Cursor::del() { Cursor c(*this); - c++; + if ( c.ok() ) + c++; list_.remove( *this ); *this = c; } diff --git a/flower/data-file.hh b/flower/lib/include/data-file.hh similarity index 100% rename from flower/data-file.hh rename to flower/lib/include/data-file.hh diff --git a/flower/dstream.hh b/flower/lib/include/dstream.hh similarity index 100% rename from flower/dstream.hh rename to flower/lib/include/dstream.hh diff --git a/flower/fproto.hh b/flower/lib/include/fproto.hh similarity index 100% rename from flower/fproto.hh rename to flower/lib/include/fproto.hh diff --git a/flower/handle.hh b/flower/lib/include/handle.hh similarity index 100% rename from flower/handle.hh rename to flower/lib/include/handle.hh diff --git a/flower/interval.hh b/flower/lib/include/interval.hh similarity index 100% rename from flower/interval.hh rename to flower/lib/include/interval.hh diff --git a/flower/interval.tcc b/flower/lib/include/interval.tcc similarity index 100% rename from flower/interval.tcc rename to flower/lib/include/interval.tcc diff --git a/flower/iterate.hh b/flower/lib/include/iterate.hh similarity index 100% rename from flower/iterate.hh rename to flower/lib/include/iterate.hh diff --git a/flower/lgetopt.hh b/flower/lib/include/lgetopt.hh similarity index 100% rename from flower/lgetopt.hh rename to flower/lib/include/lgetopt.hh diff --git a/flower/libc-extension.hh b/flower/lib/include/libc-extension.hh similarity index 100% rename from flower/libc-extension.hh rename to flower/lib/include/libc-extension.hh diff --git a/flower/link.hh b/flower/lib/include/link.hh similarity index 100% rename from flower/link.hh rename to flower/lib/include/link.hh diff --git a/flower/link.inl b/flower/lib/include/link.inl similarity index 100% rename from flower/link.inl rename to flower/lib/include/link.inl diff --git a/flower/list.hh b/flower/lib/include/list.hh similarity index 100% rename from flower/list.hh rename to flower/lib/include/list.hh diff --git a/flower/list.inl b/flower/lib/include/list.inl similarity index 100% rename from flower/list.inl rename to flower/lib/include/list.inl diff --git a/flower/list.tcc b/flower/lib/include/list.tcc similarity index 100% rename from flower/list.tcc rename to flower/lib/include/list.tcc diff --git a/flower/matrix.hh b/flower/lib/include/matrix.hh similarity index 100% rename from flower/matrix.hh rename to flower/lib/include/matrix.hh diff --git a/flower/path.hh b/flower/lib/include/path.hh similarity index 100% rename from flower/path.hh rename to flower/lib/include/path.hh diff --git a/flower/pcursor.hh b/flower/lib/include/pcursor.hh similarity index 95% rename from flower/pcursor.hh rename to flower/lib/include/pcursor.hh index ea360078d1..f1a098f71b 100644 --- a/flower/pcursor.hh +++ b/flower/lib/include/pcursor.hh @@ -25,14 +25,15 @@ public: Cursor::ok; Cursor::del; Cursor::backspace; - T get_p() { + T remove_p() { T p = ptr(); Cursor::del(); return p; } - T get_prev() { + T remove_prev_p() { + assert( ok() ); (*this)--; - return get_p(); + return remove_p(); } PointerList &list() { return (PointerList&)Cursor::list(); } diff --git a/flower/pcursor.tcc b/flower/lib/include/pcursor.tcc similarity index 100% rename from flower/pcursor.tcc rename to flower/lib/include/pcursor.tcc diff --git a/flower/plist.hh b/flower/lib/include/plist.hh similarity index 100% rename from flower/plist.hh rename to flower/lib/include/plist.hh diff --git a/flower/plist.inl b/flower/lib/include/plist.inl similarity index 100% rename from flower/plist.inl rename to flower/lib/include/plist.inl diff --git a/flower/plist.tcc b/flower/lib/include/plist.tcc similarity index 93% rename from flower/plist.tcc rename to flower/lib/include/plist.tcc index 2ceed2e9c7..ac9daedf71 100644 --- a/flower/plist.tcc +++ b/flower/lib/include/plist.tcc @@ -5,7 +5,7 @@ IPointerList::~IPointerList() { PCursor c( *this ); while (c.ok()) { - delete c.get_p(); + delete c.remove_p(); } } diff --git a/flower/pqueue.hh b/flower/lib/include/pqueue.hh similarity index 100% rename from flower/pqueue.hh rename to flower/lib/include/pqueue.hh diff --git a/flower/rational.hh b/flower/lib/include/rational.hh similarity index 100% rename from flower/rational.hh rename to flower/lib/include/rational.hh diff --git a/flower/real.hh b/flower/lib/include/real.hh similarity index 100% rename from flower/real.hh rename to flower/lib/include/real.hh diff --git a/flower/scalar.hh b/flower/lib/include/scalar.hh similarity index 100% rename from flower/scalar.hh rename to flower/lib/include/scalar.hh diff --git a/flower/smat.hh b/flower/lib/include/smat.hh similarity index 100% rename from flower/smat.hh rename to flower/lib/include/smat.hh diff --git a/flower/string-convert.hh b/flower/lib/include/string-convert.hh similarity index 100% rename from flower/string-convert.hh rename to flower/lib/include/string-convert.hh diff --git a/flower/string-data.hh b/flower/lib/include/string-data.hh similarity index 98% rename from flower/string-data.hh rename to flower/lib/include/string-data.hh index d4f4b6b5b9..ecd7159074 100644 --- a/flower/string-data.hh +++ b/flower/lib/include/string-data.hh @@ -78,7 +78,7 @@ friend class String_handle; #String_data# knowing it. */ Byte &operator [](int j); Byte operator [](int j) const; - bool null_terminated_b()const; + bool is_binary_bo()const; }; diff --git a/flower/string-data.inl b/flower/lib/include/string-data.inl similarity index 95% rename from flower/string-data.inl rename to flower/lib/include/string-data.inl index f5bdc86c38..d2b925d0ce 100644 --- a/flower/string-data.inl +++ b/flower/lib/include/string-data.inl @@ -184,9 +184,10 @@ String_data::trunc(int j) } INLINE bool -String_data::null_terminated_b()const +String_data::is_binary_bo()const { - return !memchr(data_byte_p_, length_i_, 0); +// return !memchr(data_byte_p_, length_i_, 0); + return ( (int)strlen( (char const*)data_byte_p_ ) != length_i_ ); } INLINE Byte& diff --git a/flower/string-handle.hh b/flower/lib/include/string-handle.hh similarity index 97% rename from flower/string-handle.hh rename to flower/lib/include/string-handle.hh index fe109d8842..5b7a12f648 100644 --- a/flower/string-handle.hh +++ b/flower/lib/include/string-handle.hh @@ -42,7 +42,7 @@ public: char const* ch_c_l() const; Byte* byte_l(); char* ch_l(); - bool null_terminated_b()const; + bool is_binary_bo()const; void operator =(String_handle const &src); void operator += (char const *s); Byte operator[](int j) const; diff --git a/flower/string-handle.inl b/flower/lib/include/string-handle.inl similarity index 96% rename from flower/string-handle.inl rename to flower/lib/include/string-handle.inl index 7286fd6d20..1f1d44ab13 100644 --- a/flower/string-handle.inl +++ b/flower/lib/include/string-handle.inl @@ -149,8 +149,8 @@ String_handle::length_i() const } INLINE bool -String_handle::null_terminated_b() const { - return data->null_terminated_b(); +String_handle::is_binary_bo() const { + return data->is_binary_bo(); } #endif diff --git a/flower/string.hh b/flower/lib/include/string.hh similarity index 100% rename from flower/string.hh rename to flower/lib/include/string.hh diff --git a/flower/text-db.hh b/flower/lib/include/text-db.hh similarity index 100% rename from flower/text-db.hh rename to flower/lib/include/text-db.hh diff --git a/flower/text-stream.hh b/flower/lib/include/text-stream.hh similarity index 100% rename from flower/text-stream.hh rename to flower/lib/include/text-stream.hh diff --git a/flower/unionfind.hh b/flower/lib/include/unionfind.hh similarity index 100% rename from flower/unionfind.hh rename to flower/lib/include/unionfind.hh diff --git a/flower/varray.hh b/flower/lib/include/varray.hh similarity index 100% rename from flower/varray.hh rename to flower/lib/include/varray.hh diff --git a/flower/vector.hh b/flower/lib/include/vector.hh similarity index 100% rename from flower/vector.hh rename to flower/lib/include/vector.hh diff --git a/flower/vsmat.hh b/flower/lib/include/vsmat.hh similarity index 100% rename from flower/vsmat.hh rename to flower/lib/include/vsmat.hh diff --git a/flower/lgetopt.cc b/flower/lib/lgetopt.cc similarity index 100% rename from flower/lgetopt.cc rename to flower/lib/lgetopt.cc diff --git a/flower/libc-extension.cc b/flower/lib/libc-extension.cc similarity index 100% rename from flower/libc-extension.cc rename to flower/lib/libc-extension.cc diff --git a/flower/matdebug.cc b/flower/lib/matdebug.cc similarity index 100% rename from flower/matdebug.cc rename to flower/lib/matdebug.cc diff --git a/flower/matrix.cc b/flower/lib/matrix.cc similarity index 100% rename from flower/matrix.cc rename to flower/lib/matrix.cc diff --git a/flower/path.cc b/flower/lib/path.cc similarity index 100% rename from flower/path.cc rename to flower/lib/path.cc diff --git a/flower/scalar.cc b/flower/lib/scalar.cc similarity index 100% rename from flower/scalar.cc rename to flower/lib/scalar.cc diff --git a/flower/smat.cc b/flower/lib/smat.cc similarity index 100% rename from flower/smat.cc rename to flower/lib/smat.cc diff --git a/flower/string-convert.cc b/flower/lib/string-convert.cc similarity index 98% rename from flower/string-convert.cc rename to flower/lib/string-convert.cc index 36c98dd490..47649dcc88 100644 --- a/flower/string-convert.cc +++ b/flower/lib/string-convert.cc @@ -6,6 +6,7 @@ #include +#include "libc-extension.hh" #include "string.hh" #include "string-convert.hh" @@ -148,7 +149,7 @@ String_convert::i2hex_str( int i, int length_i, char ch ) if ( !i ) str = "0"; while ( i ) { - str = ( i % 16 )["0123456789abcdef"] + str; + str = String( ( i % 16 )["0123456789abcdef"] ) + str; i /= 16; } if ( str.length_i() < length_i ) diff --git a/flower/string.cc b/flower/lib/string.cc similarity index 99% rename from flower/string.cc rename to flower/lib/string.cc index 60038f6a55..9aa8bc9a92 100644 --- a/flower/string.cc +++ b/flower/lib/string.cc @@ -33,7 +33,7 @@ String::copy_byte_p() const void String::print_on(ostream& os) const { - if (strh_.null_terminated_b()) + if (!strh_.is_binary_bo()) os << ch_c_l(); else for ( int i = 0; i < length_i(); i++ ) diff --git a/flower/stringtest.cc b/flower/lib/stringtest.cc similarity index 98% rename from flower/stringtest.cc rename to flower/lib/stringtest.cc index 2f085a26d7..0bbde77c99 100644 --- a/flower/stringtest.cc +++ b/flower/lib/stringtest.cc @@ -1,3 +1,4 @@ +#ifdef STRING_TEST /* stupid test program to verify stringlib stringtest.cc @@ -112,3 +113,6 @@ main() cout << String_convert::bin2hex_str( String( (char)0xff ) ) << endl; } + +#endif STRING_TEST + diff --git a/flower/stringutil.cc b/flower/lib/stringutil.cc similarity index 100% rename from flower/stringutil.cc rename to flower/lib/stringutil.cc diff --git a/flower/text-db.cc b/flower/lib/text-db.cc similarity index 100% rename from flower/text-db.cc rename to flower/lib/text-db.cc diff --git a/flower/text-stream.cc b/flower/lib/text-stream.cc similarity index 100% rename from flower/text-stream.cc rename to flower/lib/text-stream.cc diff --git a/flower/unionfind.cc b/flower/lib/unionfind.cc similarity index 100% rename from flower/unionfind.cc rename to flower/lib/unionfind.cc diff --git a/flower/vector.cc b/flower/lib/vector.cc similarity index 100% rename from flower/vector.cc rename to flower/lib/vector.cc diff --git a/flower/make_version b/flower/make_version deleted file mode 100755 index f584d272a9..0000000000 --- a/flower/make_version +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -echo '#ifndef FVERSION_HH' -echo '#define FVERSION_HH' - -echo '#define FMAJORVERSION ' $1 -echo '#define FMINORVERSION ' $2 -echo '#define FPATCHLEVEL ' $3 -echo '#define FVERSIONSTR "'$1.$2.$3'"' -echo '#define FCOMPILER "'$4'"' -echo '#endif' -- 2.39.5