2009-03-17 20:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* bin/hb-mkdyn.sh
  * bin/hb-func.sh
    ! mingw/cygwin .dll name generation tweaked to work 
      properly. This fixes both TOFIXes in prev commit.

  * mpkg_win.bat
    + Added -9 switch to zip.

  - contrib/examples/hbdoc/examples/core_es/hbpplib.txt
  * contrib/examples/hbdoc/examples/core_es/dirstruc.txt
    * Cleanup.
This commit is contained in:
Viktor Szakats
2009-03-17 19:15:32 +00:00
parent 9903514888
commit f8c4e8bafc
6 changed files with 38 additions and 72 deletions

View File

@@ -8,6 +8,19 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-17 20:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-mkdyn.sh
* bin/hb-func.sh
! mingw/cygwin .dll name generation tweaked to work
properly. This fixes both TOFIXes in prev commit.
* mpkg_win.bat
+ Added -9 switch to zip.
- contrib/examples/hbdoc/examples/core_es/hbpplib.txt
* contrib/examples/hbdoc/examples/core_es/dirstruc.txt
* Cleanup.
2009-03-17 17:52 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbmysql/readme.txt
* contrib/hbapollo/readme.txt
@@ -40,9 +53,9 @@
are created in lib while rest of compilers create it in
bin. I think we should sync them by creating a copy
of the .dlls in bin for mingw/cygwin. Przemek, could
you help here?
you help here? [DONE]
; TOFIX: "Making <dllname>..." screen messages. I'll need some
help here also.
help here also. [DONE]
* bin/hb-mkdyn.sh
* ${MAJOR} default set to 1.

View File

@@ -42,7 +42,7 @@ get_hbplatform()
get_hbver()
{
local FVER MAJOR MINOR REVIS hb_rootdir
local FVER MAJOR MINOR RELEA hb_rootdir
hb_rootdir="${1-.}"
FVER="${hb_rootdir}/include/hbver.h"
@@ -52,6 +52,17 @@ get_hbver()
echo "${MAJOR}.${MINOR}.${RELEA}"
}
get_hbver_win()
{
local FVER MAJOR MINOR hb_rootdir
hb_rootdir="${1-.}"
FVER="${hb_rootdir}/include/hbver.h"
MAJOR=`sed -e '/HB_VER_MAJOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
MINOR=`sed -e '/HB_VER_MINOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
echo "${MAJOR}${MINOR}"
}
get_hbverstat()
{
local FVER VERSTAT hb_rootdir
@@ -717,7 +728,11 @@ mk_hblibso()
name=`get_solibname`
hb_rootdir="${1-.}"
hb_ver=`get_hbver "${hb_rootdir}"`
if [ "${HB_ARCHITECTURE}" = "win" ]; then
hb_ver=`get_hbver_win "${hb_rootdir}"`
else
hb_ver=`get_hbver "${hb_rootdir}"`
fi
hb_libs=`mk_hbgetlibs "$2"`
[ -z "${HB_GT_LIB}" ] && HB_GT_LIB="gtstd"
@@ -811,8 +826,8 @@ mk_hblibso()
full_lib_name_mt="lib${name}mt.${hb_ver}${lib_ext}"
elif [ "${HB_ARCHITECTURE}" = "win" ]; then
lib_ext=".dll"
full_lib_name="${name}${lib_ext}"
full_lib_name_mt="${name}mt${lib_ext}"
full_lib_name="${name}-${hb_ver}${lib_ext}"
full_lib_name_mt="${name}mt-${hb_ver}${lib_ext}"
elif [ "${HB_ARCHITECTURE}" = "hpux" ]; then
lib_ext=".sl"
full_lib_name="lib${name}-${hb_ver}${lib_ext}"

View File

@@ -131,7 +131,7 @@ if [ "${SLIB_EXT}" = ".dylib" ]; then
ln -sf "${FULLNAME}" "${DSTDIR}${BASE}.${MAJOR}${SLIB_EXT}" && \
ln -sf "${FULLNAME}" "${DSTDIR}${BASE}${SLIB_EXT}"
elif [ "${SLIB_EXT}" = ".dll" ]; then
FULLNAME="${LIB_NAME}-${MAJOR}${MINOR}${SLIB_EXT}"
FULLNAME="${LIB_NAME}${SLIB_EXT}"
if [ "$HB_COMPILER" = "mingwce" ]; then
SYSLIBS=" -lwininet -lws2"
else

View File

@@ -38,11 +38,7 @@ busca de remover directorios vac
| (cambios hist¢ricos)
|
+---bin - Ejecutables y batch de construcci¢n
| | deber¡a contener harbour.exe y otros ejecutables (*)
| |
| +---b32 - aqui se construye los binarios 32 bits Borland
| |
| +---vc - aqui se construye los binarios 32 bits Microsoft
| deber¡a contener harbour.exe y otros ejecutables (*)
|
+---config - Archivos de Config. (.cf) para the GNU Make system
| |
@@ -153,20 +149,6 @@ busca de remover directorios vac
+---include - Archivos Include para ambos Harbour y C
|
+---lib - Librerias de ejecuci¢n para cada plataforma (*)
| |
| +---b16 - borland 16 bits
| |
| +---b32 - borland 32 bits
| |
| +---vc - microsoft 32 bits (Visual C++)
|
+---obj - Archivos binarios .obj (*) (#2)
| |
| +---b16 - borland 16 bits
| |
| +---b32 - borland 32 bits
| |
| +---vc - microsoft 32 bits (Visual C++)
|
+---samples - Archivos de ejemplo y peque¤as aplicaciones
| |
@@ -235,7 +217,7 @@ busca de remover directorios vac
|
+---hbextern - generador de hbextern.ch
|
+---hbmake - Utilidad Make de Harbour
+---hbmk - Utilidad Make de Harbour
|
+---hbpp - Preprocesador de Harbour como m¢dulo aislado
|

View File

@@ -1,44 +0,0 @@
/*
* $Id$
*/
/*
* Las siguientes partes son derechos adquiridos de sus autores individuales.
* www - http://www.harbour-project.org
*
* Copyright 2001 Felipe Coury <fcoury@flexsys-ci.com>
* Documentaci¢n en Ingls
*
* Copyright 2001 Alejandro de G rate <alex_degarate@hotmail.com>
* Traducci¢n al Espa¤ol de hbpplib.txt
*
* Vea doc/license.txt por los trminos de la licencia.
*
*/
LIBRERIA DE PREPROCESAMIENTO DE HARBOUR EN TIEMPO DE EJECUCION
==============================================================
C¢mo crear hbpp.lib
===================
Este archivo deber¡a contener prreproc.c, hbpplib32, bldhbpp.bat,
testpre.prg, bld32exe.bat y hbpplib.txt (este archivo).
En orden de crear y testear esta librer¡a, Ud. deber¡a poner:
(suponiendo que el directorio de trabajo sea HARBOUR)
- preproc.c en el directorio \harbour\source\hbpp ;
- hbpplib.b32 y bldhbpp.bat en el directorio \harbour ;
- testpre.prg y bld32exe.bat en el directorio \harbour\tests\working ;
- hbpplib.txt en el directorio \harbour\doc ;
Entonces, Ud. necesita correr bldhbpp.bat para crear hbpp.lib sobre
el directorio \harbour\libs\b32. Note que por ahora el £nico makefile
es para compilar con los compiladores de Borland.
Se solicita a quienes tienen otros compiladores/entornos colaboren
escribiendo los makefiles faltantes. Gracias.
Para testear testpre.prg Ud. s¢lo necesita ir al subdirectorio
harbour\test\working y hacerlo usando TESTPRE.

View File

@@ -76,7 +76,7 @@ rem ; Build .zip package
if exist %HB_PKGNAME%.zip del %HB_PKGNAME%.zip
pushd
cd %HB_INSTALL_BASE%
zip -X -r -o %~dp0%HB_PKGNAME%.zip . -i %HB_DIRNAME%\*
zip -9 -X -r -o %~dp0%HB_PKGNAME%.zip . -i %HB_DIRNAME%\*
popd
:MK_ERROR