diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ac73aeb3bb..dcb5082f06 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2003-08-19 23:00 UTC+0300 Alexander Kresin + + harbour.spec + spec file to build rpm is added. + * source/debug/debugger.prg + ! Fix, provided by Lorenzo Fiorini + 2003-08-07 22:50 UTC+0300 Alexander Kresin * source/rdd/dbcmd.c ! Fix in LOCATE REST WHILE ... FOR ..., provided by Alexander Prostoserdov diff --git a/harbour/harbour.spec b/harbour/harbour.spec new file mode 100644 index 0000000000..11650f3fa0 --- /dev/null +++ b/harbour/harbour.spec @@ -0,0 +1,326 @@ +###################################################################### +## Definitions. +###################################################################### + +%define name harbour +%define version 0.42 +%define release 0 +%define platform rh73 +%define prefix /usr +%define hb_cc export HB_COMPILER=gcc +%define hb_arch export HB_ARCHITECTURE=linux +%define hb_gt export HB_GT_LIB=gtcrs +%define hb_bdir export HB_BIN_INSTALL=%{prefix}/bin/ +%define hb_idir export HB_INC_INSTALL=%{prefix}/include/%{name}/ +%define hb_ldir export HB_LIB_INSTALL=%{prefix}/lib/%{name}/ +%define hb_env %{hb_cc} ; %{hb_arch} ; %{hb_gt} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} +%define readme README.RPM + +###################################################################### +## Preamble. +###################################################################### + +Summary: Free software Clipper compatible compiler. +Summary(pl): Darmowy kompilator kompatybilny z językiem Clipper. +Summary(es): Compilador software-libre compatible con Clipper. +Name: %{name} +Version: %{version} +Release: %{release}%{platform} +Prefix: %{prefix} +Copyright: GPL (plus exception) +Group: Development/Languages +Vendor: harbour-project.org +URL: http://www.harbour-project.org/ +Source: %{name}-%{version}.tar.gz +Packager: Alexander S.Kresin +BuildPrereq: gcc binutils bash flex bison ncurses ncurses-devel +Requires: gcc binutils bash ncurses sh-utils +Provides: %{name} +BuildRoot: /tmp/%{name}-%{version}-root + +%description +Harbour is a CA-Clipper compatible compiler for multiple platforms. This +package includes a compiler, pre-processor, header files, virtual machine, +run-time library and documentation. + +You can find out more about harbour at http://www.harbour-project.org/. + +See http://www.harbour-project.org/faq/ for the Harbour FAQ. + +See README.RPM in the documentation directory for information specific to +this RPM distribution. + +%description -l pl +Harbour to kompatybilny z językiem CA-Clipper kompilator rozwijany na +wielu różnych platformach. Ten pakiet zawiera kompilator, preprocesor, +zbiory nagłówkowe, wirtualn± maszynę, biblioteki uruchomieniowe oraz +dokumentację. + +Więcej inforamcji o projekcie harbour można znaleĽć na + http://www.harbour-project.org/ (strona angielska) +lub na + http://www.harbour.pl.eu.org/ (strona polska) + +%description -l es +Harbour es un compilador compatible con CA-Clipper para múltiples +plataformas. Este paquete incluye un compilador, preprocesador, archivos +de cabecera, máquina virtual, librería de tiempo de ejecución (run-time) +y documentación. + +Puede encontrar más información sobre harbour en +http://www.harbour-project.org/ + +Consulte http://www.harbour-project.org/faq/ para leer las FAQ +(preguntas más frecuentes) en inglés, o bien +http://www.iespana.es/todoharbour/documentos/doc_en_linea/index.htm +(en espańol) + +Consulte README.RPM en el directorio de documentación para obtener +información (en inglés) sobre esta distribución RPM en particular. + +###################################################################### +## Preperation. +###################################################################### + +%prep +%setup -n %{name} +rm -rf $RPM_BUILD_ROOT + +###################################################################### +## Build. +###################################################################### + +%build +%{hb_env} +make + +###################################################################### +## Install. +###################################################################### + +%install + +# Install harbour itself. + +%{hb_env} +export HB_BIN_INSTALL=$RPM_BUILD_ROOT/$HB_BIN_INSTALL +export HB_INC_INSTALL=$RPM_BUILD_ROOT/$HB_INC_INSTALL +export HB_LIB_INSTALL=$RPM_BUILD_ROOT/$HB_LIB_INSTALL + +mkdir -p $HB_BIN_INSTALL +mkdir -p $HB_INC_INSTALL +mkdir -p $HB_LIB_INSTALL + +make -i install + +# Keep the size of the binaries to a minimim. +strip --strip-debug $HB_BIN_INSTALL/* +# Keep the size of the libraries to a minimim. +strip --strip-debug $HB_LIB_INSTALL/* + +# Add a harbour compiler wrapper. +cat > $HB_BIN_INSTALL/gharbour < $HB_BIN_INSTALL/harbour-link < doc/%{readme} < +EOF + +###################################################################### +## File list. +###################################################################### + +%files +%defattr(-,root,root) +%doc ChangeLog +%doc TODO +%doc ERRATA +%doc doc/*.txt +%doc doc/%{readme} +%doc doc/en/ +%doc doc/es/ + +%{prefix}/bin/harbour +%{prefix}/bin/gharbour +%{prefix}/bin/harbour-link +#%{prefix}/bin/hbtest +%{prefix}/bin/hbrun +%{prefix}/bin/hbpp +%{prefix}/bin/hbmake +%{prefix}/include/%{name}/* +%{prefix}/lib/%{name}/* + +###################################################################### +## Spec file Changelog. +###################################################################### + +%changelog +* Wed Aug 21 2002 Dave Pearson +- Spanish translation added. Provided by Carlos Andrés. + +* Fri Aug 16 2002 Dave Pearson +- Corrected the example shown in README.RPM so that it demonstrates a + fully working program being built (the previous example showed me + building a program that wouldn't usefully run). + +* Fri Mar 08 2002 Dave Pearson +- Fixed gharbour so that it should work no matter the case of the name of + the PRG file. + +* Wed Feb 13 2002 Dave Pearson +- Fixed a bug in harbour-link which meant that, since the environment + changes of Jan 17 2002, users could not specify which GT library they + wanted their application linked against. + +* Tue Jan 22 2002 Dave Pearson +- Used the "name" macro a lot more, especially in some paths. + +* Thu Jan 17 2002 Dave Pearson +- Removed the use of the /etc/profile.d scripts for setting the + harbour environment variables. The settings are now placed + directly in gharbour and harbour-link. This means that this .spec + file should be more useful on RPM using platforms other than RedHat. + +* Wed Dec 19 2001 Dave Pearson +- Added a platform ID to the name of the RPM. + +* Mon Dec 17 2001 Dave Pearson +- todo.txt is now called TODO. + +* Tue Aug 21 2001 Dave Pearson +- Added todo.txt as a doc file. + +* Sun Jul 22 2001 Dave Pearson +- harbour-link now fully respects the setting of $HB_GT_LIB. +- HB_GT_LIB wasn't set in the csh startup script. Fixed. + +* Fri Jul 20 2001 Dave Pearson +- Added the setting of $HB_GT_LIB to the environment (ncurses is used). +- Added support for installing hbmake. + +* Mon Jun 28 2001 Dave Pearson +- Changed the gharbour script so that it only invokes the C compiler if a C + file was output. This stops any error messages when someone is using the + -g option to output other target types. + +* Mon Mar 19 2001 Dave Pearson +- Reinstated hbrun in the files section. + +* Tue Feb 20 2001 Dave Pearson +- Added README.RPM to the documentation directory. + +* Sat Jan 06 2001 Dave Pearson +- The gharbour script now passes the harbour include directory, using -I, + to harbour. + +* Thu Aug 24 2000 Dave Pearson +- Changed the files section so that hbrun doesn't get installed. It isn't + useful on GNU/Linux systems. + +* Tue Aug 22 2000 Dave Pearson +- Changed the 'egcs' requirement to 'gcc'. + +* Mon Aug 21 2000 Przemyslaw Czerpak +- Polish translation added +- BuildRoot marco added. Now you can build the package from normal user + account. +- bison and flex added to BuildPrereq list +- Debug information is stripped from installed files. + +* Wed Aug 02 2000 Dave Pearson +- Removed hbtest from the list of files installed into the bin directory. +- Added 'bash' and 'sh-utils' to the list of required packages. + +* Tue Aug 01 2000 Dave Pearson +- Added harbour environment scripts to /etc/profile.d. +- Added generation of gharbour and harbour-link commands. + +* Mon Jul 31 2000 Dave Pearson +- Re-worked the layout of the spec file to make it cleaner and easier to + read and maintain. +- The latest harbour ChangeLog is now installed into the RPM's doc directory. +- The content of the RPM's doc directory reflects the layout and content of + the harbour source's doc directory. diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg index 164e03c680..f2883807b7 100644 --- a/harbour/source/debug/debugger.prg +++ b/harbour/source/debug/debugger.prg @@ -146,7 +146,7 @@ procedure __dbgEntry( uParam1, uParam2, uParam3 ) // debugger entry point ASize( s_oDebugger:aCallStack, Len( s_oDebugger:aCallStack ) + 1 ) AIns( s_oDebugger:aCallStack, 1 ) // nil means no line number stored yet - s_oDebugger:aCallStack[ 1 ] := { cProcName, {}, nil } + s_oDebugger:aCallStack[ 1 ] := { cProcName, {}, nil, nil } s_oDebugger:lCodeblock := .T. endif endif