OSSP CVS Repository

ossp - Check-in [3809]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 3809
Date: 2002-Dec-02 14:25:36 (local)
2002-Dec-02 13:25:36 (UTC)
User:ms
Branch:
Comment: Logic changes to correct the buildconf after CVS restructure.
Tickets:
Inspections:
Files:
ossp-pkg/as/as-gui/Makefile.in      1.20 -> 1.21     29 inserted, 29 deleted
ossp-pkg/as/as-gui/README      1.3 -> 1.4     1 inserted, 1 deleted
ossp-pkg/as/as-gui/as_amount.cpp      1.4 -> 1.5     2 inserted, 2 deleted
ossp-pkg/as/as-gui/as_assist.cpp      1.37 -> 1.38     13 inserted, 13 deleted
ossp-pkg/as/as-gui/as_const.h      1.8 -> 1.9     2 inserted, 2 deleted
ossp-pkg/as/as-gui/as_dataop.cpp      1.9 -> 1.10     4 inserted, 4 deleted
ossp-pkg/as/as-gui/as_except.cpp      1.2 -> 1.3     1 inserted, 1 deleted
ossp-pkg/as/as-gui/as_generic.cpp      1.2 -> 1.3     1 inserted, 1 deleted
ossp-pkg/as/as-gui/as_gui.cpp      1.23 -> 1.24     2 inserted, 2 deleted
ossp-pkg/as/as-gui/as_gui.h      1.35 -> 1.36     7 inserted, 7 deleted
ossp-pkg/as/as-gui/as_gui_test.sh      1.3 -> 1.4     1 inserted, 1 deleted
ossp-pkg/as/as-gui/as_main.cpp      1.7 -> 1.8     1 inserted, 1 deleted
ossp-pkg/as/as-gui/as_slot.cpp      1.28 -> 1.29     6 inserted, 6 deleted
ossp-pkg/as/as-gui/as_table.cpp      1.3 -> 1.4     1 inserted, 1 deleted
ossp-pkg/as/as-gui/as_version.cpp      1.1 -> 1.2     15 inserted, 15 deleted
ossp-pkg/as/as-gui/configure.in      1.5 -> 1.6     3 inserted, 3 deleted
ossp-pkg/as/as-gui/devtool.conf      1.4 -> 1.5     6 inserted, 6 deleted
ossp-pkg/as/as-gui/Makefile.in 1.20 -> 1.21 

--- Makefile.in  2002/11/29 11:03:58     1.20
+++ Makefile.in  2002/12/02 13:25:36     1.21
@@ -62,19 +62,19 @@
 POD2MAN         = pod2man
 TRUE            = true
 
-PROG_NAME       = titraq
-TARGET_PROGS    = titraq
-TARGET_MANS     = titraq.1 titraq.conf.5
+PROG_NAME       = as_gui
+TARGET_PROGS    = as_gui
+TARGET_MANS     = as_gui.1 as_gui.conf.5
 
-SRCS            = main.cpp titraq.cpp titassist.cpp titslot.cpp tidatops.cpp titrex.cpp generic.cpp titamount.cpp titable.cpp titprefs.cpp titraq_version.cpp
+SRCS            = as_main.cpp as_gui.cpp as_assist.cpp as_slot.cpp as_dataop.cpp as_except.cpp as_generic.cpp as_amount.cpp as_table.cpp as_pref.cpp as_version.cpp
 
-OBJS            = main.o titraq.o titassist.o titslot.o tidatops.o titrex.o generic.o titamount.o titable.o titprefs.o titraq_version.o
+OBJS            = as_main.o as_gui.o as_assist.o as_slot.o as_dataop.o as_except.o as_generic.o as_amount.o as_table.o as_pref.o as_version.o
 
 GRAFX           = gfx/ossplogo.xpm
 
 # Qt meta object compiler (MOC) generated
-MOC_OUT         = moc_titraq.cpp
-MOC_OBJ         = moc_titraq.o
+MOC_OUT         = moc_as_gui.cpp
+MOC_OBJ         = moc_as_gui.o
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .cpp .cxx .o
@@ -98,37 +98,37 @@
 moc_%.cpp: %.h
         $(MOC) $< -o $@
 
-titraq.1: titraq.pod
-        VS=`$(SHTOOL) version -lc -dshort titraq_version.cpp`; \
-        VL=`$(SHTOOL) version -lc -dlong titraq_version.cpp`; \
-        D=`$(SHTOOL) version -lc -dlong titraq_vers.c | sed -e 's;.*(;;' -e 's;).*;;'`; \
+as_gui.1: as_gui.pod
+        VS=`$(SHTOOL) version -lc -dshort as_version.cpp`; \
+        VL=`$(SHTOOL) version -lc -dlong as_version.cpp`; \
+        D=`$(SHTOOL) version -lc -dlong as_version.cpp | sed -e 's;.*(;;' -e 's;).*;;'`; \
         $(POD2MAN) --quotes=none \
                --section=1 --center="AS Graphical User Interface" \
-               --release="$$D" --date="OSSP asgui $$VS" titraq.pod | \
-               sed -e "s;TITRAQ_VERSION_STR;$$VL;" >titraq.1
+               --release="$$D" --date="OSSP asgui $$VS" as_gui.pod | \
+               sed -e "s;ASGUI_VERSION_STR;$$VL;" >as_gui.1
 
-titraq.conf.5: titraq.conf.pod
-        VS=`$(SHTOOL) version -lc -dshort titraq_version.cpp`; \
-        VL=`$(SHTOOL) version -lc -dlong titraq_version.cpp`; \
-        D=`$(SHTOOL) version -lc -dlong titraq_vers.c | sed -e 's;.*(;;' -e 's;).*;;'`; \
+as_gui.conf.5: as_gui.conf.pod
+        VS=`$(SHTOOL) version -lc -dshort as_version.cpp`; \
+        VL=`$(SHTOOL) version -lc -dlong as_version.cpp`; \
+        D=`$(SHTOOL) version -lc -dlong as_version.cpp | sed -e 's;.*(;;' -e 's;).*;;'`; \
         $(POD2MAN) --quotes=none \
                --section=5 --center="AS Preferences File" \
-               --release="$$D" --date="OSSP asgui $$VS" titraq.conf.pod | \
-               sed -e "s;TITRAQ_VERSION_STR;$$VL;" >titraq.conf.5
+               --release="$$D" --date="OSSP asgui $$VS" as_gui.conf.pod | \
+               sed -e "s;ASGUI_VERSION_STR;$$VL;" >as_gui.conf.5
 
 install: all
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man5
-        $(SHTOOL) install -c -s -m 755 titraq $(DESTDIR)$(bindir)/titraq
-        $(SHTOOL) install -c -m 644 titraq.1 $(DESTDIR)$(mandir)/man1/titraq.1
-        $(SHTOOL) install -c -m 644 titraq.conf.5 $(DESTDIR)$(mandir)/man5/titraq.conf.5
+        $(SHTOOL) install -c -s -m 755 as_gui $(DESTDIR)$(bindir)/as_gui
+        $(SHTOOL) install -c -m 644 as_gui.1 $(DESTDIR)$(mandir)/man1/as_gui.1
+        $(SHTOOL) install -c -m 644 as_gui.conf.5 $(DESTDIR)$(mandir)/man5/as_gui.conf.5
 
 uninstall:
-        $(RM) $(DESTDIR)$(mandir)/man5/titraq.conf.5
-        $(RM) $(DESTDIR)$(mandir)/man1/titraq.1
-        $(RM) $(DESTDIR)$(bindir)/titraq
+        $(RM) $(DESTDIR)$(mandir)/man5/as_gui.conf.5
+        $(RM) $(DESTDIR)$(mandir)/man1/as_gui.1
+        $(RM) $(DESTDIR)$(bindir)/as_gui
         $(RMDIR) $(DESTDIR)$(mandir)/man5 >/dev/null 2>&1 || $(TRUE)
         $(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
         $(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
@@ -137,8 +137,8 @@
 
 clean:
         $(RM) $(TARGET_PROGS) $(OBJS) $(MOC_OBJ)
-        $(RM) titraq.conf.5 titraq.1
-        $(RM) titraq_pcre.tab *.core
+        $(RM) as_gui.conf.5 as_gui.1
+        $(RM) as_gui_pcre.tab *.core
 
 distclean: clean
         $(RM) config.log config.status config.cache # Generated by ./configure
@@ -151,7 +151,7 @@
         $(RM) shtool                                # Generated by Devtool
 
 check: test
-test: titraq
-        ./titraq_test.sh
+test: as_gui
+        ./as_gui_test.sh
 
 .PHONY: install uninstall clean distclean realclean check test

ossp-pkg/as/as-gui/README 1.3 -> 1.4 

--- README       2002/11/28 20:44:36     1.3
+++ README       2002/12/02 13:25:36     1.4
@@ -6,7 +6,7 @@
              |___/
 
   OSSP asgui -- Accounting system graphical user interface
-  Version 0.5.0 (28-Nov-2002)
+  Version 0.5.0 (02-Dec-2002)
 
   ABSTRACT

ossp-pkg/as/as-gui/as_amount.cpp 1.4 -> 1.5 

--- as_amount.cpp        2002/11/28 20:44:36     1.4
+++ as_amount.cpp        2002/12/02 13:25:36     1.5
@@ -31,8 +31,8 @@
 
 #include <qregexp.h>
 
-#include "titamount.h"
-#include "titconst.h"
+#include "as_amount.h"
+#include "as_const.h"
 
 
 // Sets a text formatted representation

ossp-pkg/as/as-gui/as_assist.cpp 1.37 -> 1.38 

--- as_assist.cpp        2002/11/28 20:44:36     1.37
+++ as_assist.cpp        2002/12/02 13:25:36     1.38
@@ -46,21 +46,21 @@
 #include <qcursor.h>
 
 // User interface
-#include "titraq.h"             // Main classes
-#include "titrex.h"             // Exception classes
-#include "titamount.h"          // AmountBox class
+#include "as_gui.h"             // Main classes
+#include "as_except.h"          // Exception classes
+#include "as_amount.h"          // AmountBox class
 
 // Icon pixel maps
-#include "gfx/filenew.xpm"      // static const char *s_kpcFilenew_xpm[]
-#include "gfx/fileopen.xpm"     // static const char *s_kpcFileopen_xpm[]
-#include "gfx/filesave.xpm"     // static const char *s_kpcFilesave_xpm[]
-#include "gfx/cut.xpm"          // static const char *s_kpcCut_xpm[]
-#include "gfx/copy.xpm"         // static const char *s_kpcCopy_xpm[]
-#include "gfx/paste.xpm"        // static const char *s_kpcPaste_xpm[]
-#include "gfx/rowadd.xpm"       // static const char *s_kpcRowadd_xpm[]
-#include "gfx/rowdel.xpm"       // static const char *s_kpcRowdel_xpm[]
-#include "gfx/osspicon.xpm"     // static const char *s_kpcOsspicon_xpm[]
-#include "gfx/whatsthis.xpm"    // static const char *s_kpcWhatsthis_xpm[]
+#include "as_gfx/filenew.xpm"   // static const char *s_kpcFilenew_xpm[]
+#include "as_gfx/fileopen.xpm"  // static const char *s_kpcFileopen_xpm[]
+#include "as_gfx/filesave.xpm"  // static const char *s_kpcFilesave_xpm[]
+#include "as_gfx/cut.xpm"       // static const char *s_kpcCut_xpm[]
+#include "as_gfx/copy.xpm"      // static const char *s_kpcCopy_xpm[]
+#include "as_gfx/paste.xpm"     // static const char *s_kpcPaste_xpm[]
+#include "as_gfx/rowadd.xpm"    // static const char *s_kpcRowadd_xpm[]
+#include "as_gfx/rowdel.xpm"    // static const char *s_kpcRowdel_xpm[]
+#include "as_gfx/osspicon.xpm"  // static const char *s_kpcOsspicon_xpm[]
+#include "as_gfx/whatsthis.xpm" // static const char *s_kpcWhatsthis_xpm[]
 
 
 //

ossp-pkg/as/as-gui/as_const.h 1.8 -> 1.9 

--- as_const.h   2002/11/28 20:44:36     1.8
+++ as_const.h   2002/12/02 13:25:36     1.9
@@ -34,8 +34,8 @@
 
 
 // Preferences string constants
-#define TITRAQ_PREFNAME         "titraq.conf"
-#define TITRAQ_APPTITLE         "Titraq"
+#define TITRAQ_PREFNAME         "as_gui.conf"
+#define TITRAQ_APPTITLE         "AS Gui"
 #define TITRAQ_PREFVER          "0.5"
 #define TITRAQ_PREFASFILE       "asfile"
 #define TITRAQ_DEFASFILE        "/e/dev/as"

ossp-pkg/as/as-gui/as_dataop.cpp 1.9 -> 1.10 

--- as_dataop.cpp        2002/11/28 20:44:36     1.9
+++ as_dataop.cpp        2002/12/02 13:25:36     1.10
@@ -29,11 +29,11 @@
 //  tidatops.cpp: ISO C++ implementation
 //
 
-#include <qregexp.h>    // Portable regular expressions
+#include <qregexp.h>        // Portable regular expressions
 
-#include "titraq.h"     // Main classes
-#include "titrex.h"     // Exception classes
-#include "titabitem.h"  // For class RtTableItem
+#include "as_gui.h"         // Main classes
+#include "as_except.h"      // Exception classes
+#include "as_tableitem.h"   // For class RtTableItem
 
 
 //

ossp-pkg/as/as-gui/as_except.cpp 1.2 -> 1.3 

--- as_except.cpp        2002/11/28 20:44:36     1.2
+++ as_except.cpp        2002/12/02 13:25:36     1.3
@@ -29,7 +29,7 @@
 //  titrex.cpp: ISO C++ implementation
 //
 
-#include "titrex.h"
+#include "as_except.h"
 
 
 // Report general exception

ossp-pkg/as/as-gui/as_generic.cpp 1.2 -> 1.3 

--- as_generic.cpp       2002/11/28 20:44:36     1.2
+++ as_generic.cpp       2002/12/02 13:25:36     1.3
@@ -31,7 +31,7 @@
 
 #include <qobject.h>
 
-#include "generic.h"
+#include "as_generic.h"
 
 
 // Construct a Prototype object

ossp-pkg/as/as-gui/as_gui.cpp 1.23 -> 1.24 

--- as_gui.cpp   2002/11/28 20:44:36     1.23
+++ as_gui.cpp   2002/12/02 13:25:36     1.24
@@ -30,8 +30,8 @@
 //
 
 // User interface
-#include "titraq.h"             // Main classes
-#include "titrex.h"             // Exception classes
+#include "as_gui.h"     // Main classes
+#include "as_except.h"  // Exception classes
 
 
 //

ossp-pkg/as/as-gui/as_gui.h 1.35 -> 1.36 

--- as_gui.h     2002/11/28 20:44:36     1.35
+++ as_gui.h     2002/12/02 13:25:36     1.36
@@ -29,8 +29,8 @@
 //  titraq.h: ISO C++ interface
 //
 
-#ifndef TITRAQMWIN_H
-#define TITRAQMWIN_H
+#ifndef AS_GUI_MWIN_H
+#define AS_GUI_MWIN_H
 
 #include <qapplication.h>
 #include <qmainwindow.h>
@@ -47,10 +47,10 @@
 #include <qlayout.h>
 #include <qfile.h>
 
-#include "titconst.h"       // For general constants
-#include "titprefs.h"       // For class Preferences
-#include "titamount.h"      // For class AmountBox
-#include "titable.h"        // For class TiTable
+#include "as_const.h"   // For general constants
+#include "as_pref.h"    // For class Preferences
+#include "as_amount.h"  // For class AmountBox
+#include "as_table.h"   // For class TiTable
 
 // Intentional no operation
 #define TITRAQ_NOP ((void)0)
@@ -191,4 +191,4 @@
     void saveData(QTextStream &);       // Save accounting data to stream
 };
 
-#endif // TITRAQMWIN_H
+#endif // AS_GUI_MWIN_H

ossp-pkg/as/as-gui/as_gui_test.sh 1.3 -> 1.4 

--- as_gui_test.sh       2002/11/28 20:44:36     1.3
+++ as_gui_test.sh       2002/12/02 13:25:36     1.4
@@ -30,4 +30,4 @@
 ##
 
 #! /bin/sh
-./titraq
+./as_gui

ossp-pkg/as/as-gui/as_main.cpp 1.7 -> 1.8 

--- as_main.cpp  2002/11/28 20:44:36     1.7
+++ as_main.cpp  2002/12/02 13:25:36     1.8
@@ -29,7 +29,7 @@
 //  main.cpp: ISO C++ implementation
 //
 
-#include "titraq.h"
+#include "as_gui.h"
 
 
 int main(int argc, char **argv)

ossp-pkg/as/as-gui/as_slot.cpp 1.28 -> 1.29 

--- as_slot.cpp  2002/11/28 20:44:36     1.28
+++ as_slot.cpp  2002/12/02 13:25:36     1.29
@@ -35,14 +35,14 @@
 #include <qregexp.h>
 
 // User interface
-#include "titraq.h"             // Main classes
-#include "titrex.h"             // Exception classes
-#include "titabitem.h"          // For our custom table items
-#include "generic.h"            // Generic classes
+#include "as_gui.h"             // Main classes
+#include "as_except.h"          // Exception classes
+#include "as_tableitem.h"       // For our custom table items
+#include "as_generic.h"         // Generic classes
 
 // Icon pixel maps
-#include "gfx/cwlogo.xpm"       // static const char *s_kpcCwlogo_xpm[]
-#include "gfx/ossplogo.xpm"     // static const char *s_kpcOssplogo_xpm[]
+#include "as_gfx/cwlogo.xpm"    // static const char *s_kpcCwlogo_xpm[]
+#include "as_gfx/ossplogo.xpm"  // static const char *s_kpcOssplogo_xpm[]
 
 
 //

ossp-pkg/as/as-gui/as_table.cpp 1.3 -> 1.4 

--- as_table.cpp 2002/12/02 10:45:05     1.3
+++ as_table.cpp 2002/12/02 13:25:36     1.4
@@ -31,7 +31,7 @@
 
 #include <qheader.h>
 
-#include "titraq.h"
+#include "as_gui.h"
 
 
 // Implements an event filter for catching header double click events

ossp-pkg/as/as-gui/as_version.cpp 1.1 -> 1.2 

--- as_version.cpp       2002/11/28 20:44:36     1.1
+++ as_version.cpp       2002/12/02 13:25:36     1.2
@@ -1,12 +1,12 @@
 /*
-**  titraq_version.cpp -- Version Information for OSSP asgui (syntax: C/C++)
+**  as_version.cpp -- Version Information for OSSP asgui (syntax: C/C++)
 **  [automatically generated and maintained by GNU shtool]
 */
 
-#ifdef _TITRAQ_VERSION_CPP_AS_HEADER_
+#ifdef _AS_VERSION_CPP_AS_HEADER_
 
-#ifndef _TITRAQ_VERSION_CPP_
-#define _TITRAQ_VERSION_CPP_
+#ifndef _AS_VERSION_CPP_
+#define _AS_VERSION_CPP_
 
 #define ASGUI_VERSION 0x005200
 
@@ -23,24 +23,24 @@
 
 extern asgui_version_t asgui_version;
 
-#endif /* _TITRAQ_VERSION_CPP_ */
+#endif /* _AS_VERSION_CPP_ */
 
-#else /* _TITRAQ_VERSION_CPP_AS_HEADER_ */
+#else /* _AS_VERSION_CPP_AS_HEADER_ */
 
-#define _TITRAQ_VERSION_CPP_AS_HEADER_
-#include "titraq_version.cpp"
-#undef  _TITRAQ_VERSION_CPP_AS_HEADER_
+#define _AS_VERSION_CPP_AS_HEADER_
+#include "as_version.cpp"
+#undef  _AS_VERSION_CPP_AS_HEADER_
 
 asgui_version_t asgui_version = {
     0x005200,
     "0.5.0",
-    "0.5.0 (28-Nov-2002)",
-    "This is OSSP asgui, Version 0.5.0 (28-Nov-2002)",
-    "OSSP asgui 0.5.0 (28-Nov-2002)",
+    "0.5.0 (02-Dec-2002)",
+    "This is OSSP asgui, Version 0.5.0 (02-Dec-2002)",
+    "OSSP asgui 0.5.0 (02-Dec-2002)",
     "OSSP asgui/0.5.0",
-    "@(#)OSSP asgui 0.5.0 (28-Nov-2002)",
-    "$Id: as_version.cpp,v 1.1 2002/11/28 20:44:36 ms Exp $"
+    "@(#)OSSP asgui 0.5.0 (02-Dec-2002)",
+    "$Id: as_version.cpp,v 1.2 2002/12/02 13:25:36 ms Exp $"
 };
 
-#endif /* _TITRAQ_VERSION_CPP_AS_HEADER_ */
+#endif /* _AS_VERSION_CPP_AS_HEADER_ */

ossp-pkg/as/as-gui/configure.in 1.5 -> 1.6 

--- configure.in 2002/11/28 20:44:36     1.5
+++ configure.in 2002/12/02 13:25:36     1.6
@@ -34,9 +34,9 @@
 AC_REVISION(1.0)
 AC_INIT
 
-TITRAQ_VERSION_STR=`./shtool version -l c -d long titraq_version.cpp`
-./shtool echo -e "Configuring %BOSSP asgui%b, version %B${TITRAQ_VERSION_STR}%b"
-AC_SUBST(TITRAQ_VERSION_STR)
+ASGUI_VERSION_STR=`./shtool version -l c -d long as_version.cpp`
+./shtool echo -e "Configuring %BOSSP asgui%b, version %B${ASGUI_VERSION_STR}%b"
+AC_SUBST(ASGUI_VERSION_STR)
 
 dnl Process this file with autoconf
 AC_CONFIG_HEADERS(ac_config.h)

ossp-pkg/as/as-gui/devtool.conf 1.4 -> 1.5 

--- devtool.conf 2002/11/28 20:44:36     1.4
+++ devtool.conf 2002/12/02 13:25:36     1.5
@@ -12,7 +12,7 @@
 
 %configure
     ./configure \
-        --prefix=/tmp/titraq \
+        --prefix=/tmp/as_gui \
         "$@"
 
 %release
@@ -21,13 +21,13 @@
     ./devtool upload
 
 %version
-    ./shtool version -l c -n "OSSP asgui" -p asgui_ -e titraq_version.cpp
-    V=`./shtool version -l c -d long titraq_version.cpp`
+    ./shtool version -l c -n "OSSP asgui" -p asgui_ -e as_version.cpp
+    V=`./shtool version -l c -d long as_version.cpp`
     sed -e "s/Version .*(.*)/Version $V/g" <README >README.n
     mv README.n README
 
 %tag
-    V=`./shtool version -l c -d short titraq_version.cpp | sed -e 's;\.;_;g'`
+    V=`./shtool version -l c -d short as_version.cpp | sed -e 's;\.;_;g'`
     echo "+++ tagging CVS sources as ASGUI_${V}"
     cvs tag ASGUI_${V}
 
@@ -46,7 +46,7 @@
     echo "+++ fixing"
     ./shtool fixperm -v .
     echo "+++ rolling"
-    V=`./shtool version -l c -d short titraq_version.cpp`
+    V=`./shtool version -l c -d short as_version.cpp`
     ./shtool tarball -o asgui-${V}.tar.gz -d asgui-${V} \
                      -e 'CVS,\.cvsignore,\.[ao]$,^\.,devtool*,*.tar.gz,^#.*,.*~$' -c 'gzip --best' .
     ls -l asgui-${V}.tar.gz
@@ -57,5 +57,5 @@
 
 %upload
     echo "+++ copying to ftp://ftp.ossp.org/pkg/tool/asgui/"
-    V=`./shtool version -l c -d short titraq_version.cpp`
+    V=`./shtool version -l c -d short as_version.cpp`
     scp asgui-${V}.tar.gz ftp.ossp.org:/e/ossp/ftp/pkg/tool/asgui/

CVSTrac 2.0.1