fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "2013-03-20 00:48 UTC+0100 Viktor Szakats (harbour syenar.net)""

Browse Source 
This reverts commit bb777c776c.
This commit is contained in:
Viktor Szakats
2013-03-20 00:51:40 +01:00
parent bb777c776c
commit 8c6f90cc84
6 changed files with 117 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog.txt
View File

@@ -10,6 +10,18 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-03-20 00:48 UTC+0100 Viktor Szakats (harbour syenar.net)
* config/postinst.hb
* utils/hbmk2/hbmk2.prg
% string forming optimizations
* doc/en/tlabel.txt
* doc/en/treport.txt
* made filename usage clear
* README.txt
+ added new OpenSSL documentation wiki
2013-03-19 14:18 UTC+0100 Viktor Szakats (harbour syenar.net)
* README.txt
+ added links where commits can be followed

1
README.txt
View File

@@ -1639,6 +1639,7 @@ TABLE OF CONTENT
HB_WITH_OPENSSL - OpenSSL [multiplatform, free, open-source]
http://www.openssl.org/
http://www.openssl.org/related/binaries.html
http://wiki.opensslfoundation.com/
HB_WITH_PCRE - Perl Compatible Regular Expressions [multiplatform, free, open-source]
http://www.pcre.org/
HB_WITH_PGSQL - PostgreSQL [multiplatform, free, open-source]

108
config/postinst.hb
View File

@@ -288,23 +288,24 @@ PROCEDURE Main( ... )
/* In the generated script always use tar because we can't be sure
if cBin_Tar exists in the installation environment */
cSH_Script := '#!/bin/sh' + Chr( 10 )
cSH_Script += 'if [ "\$1" = "--extract" ]; then' + Chr( 10 )
cSH_Script += ' tail -c ' + hb_ntos( hb_FSize( cTar_Path ) ) + ' "\$0" > "' + cTar_NameExt + '"' + Chr( 10 )
cSH_Script += ' exit' + Chr( 10 )
cSH_Script += 'fi' + Chr( 10 )
cSH_Script += 'if [ \`id -u\` != 0 ]; then' + Chr( 10 )
cSH_Script += ' echo "This package has to be installed from root account."' + Chr( 10 )
cSH_Script += ' exit 1' + Chr( 10 )
cSH_Script += 'fi' + Chr( 10 )
cSH_Script += 'echo "Do you want to install Harbour (y/n)"' + Chr( 10 )
cSH_Script += 'read ASK' + Chr( 10 )
cSH_Script += 'if [ "\${ASK}" != "y" ] && [ "\${ASK}" != "Y" ]; then' + Chr( 10 )
cSH_Script += ' exit 1' + Chr( 10 )
cSH_Script += 'fi' + Chr( 10 )
cSH_Script += '(tail -c ' + hb_ntos( hb_FSize( cTar_Path ) ) + ' "\$0" | gzip -cd | (cd /;tar xvpf -)) ' + iif( GetEnvC( "HB_PLATFORM" ) == "linux", "&& ldconfig", "" ) + Chr( 10 )
cSH_Script += 'exit \$?' + Chr( 10 )
cSH_Script += 'HB_INST_EOF' + Chr( 10 )
cSH_Script := ;
'#!/bin/sh' + Chr( 10 ) + ;
'if [ "\$1" = "--extract" ]; then' + Chr( 10 ) + ;
' tail -c ' + hb_ntos( hb_FSize( cTar_Path ) ) + ' "\$0" > "' + cTar_NameExt + '"' + Chr( 10 ) + ;
' exit' + Chr( 10 ) + ;
'fi' + Chr( 10 ) + ;
'if [ \`id -u\` != 0 ]; then' + Chr( 10 ) + ;
' echo "This package has to be installed from root account."' + Chr( 10 ) + ;
' exit 1' + Chr( 10 ) + ;
'fi' + Chr( 10 ) + ;
'echo "Do you want to install Harbour (y/n)"' + Chr( 10 ) + ;
'read ASK' + Chr( 10 ) + ;
'if [ "\${ASK}" != "y" ] && [ "\${ASK}" != "Y" ]; then' + Chr( 10 ) + ;
' exit 1' + Chr( 10 ) + ;
'fi' + Chr( 10 ) + ;
'(tail -c ' + hb_ntos( hb_FSize( cTar_Path ) ) + ' "\$0" | gzip -cd | (cd /;tar xvpf -)) ' + iif( GetEnvC( "HB_PLATFORM" ) == "linux", "&& ldconfig", "" ) + Chr( 10 ) + ;
'exit \$?' + Chr( 10 ) + ;
'HB_INST_EOF' + Chr( 10 )
hb_MemoWrit( tmp, cSH_Script + hb_MemoRead( cTar_Path ) )
@@ -684,17 +685,23 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName )
__hb_extern_get_exception_list( cOutputName, @aInclude, @aExclude, @hDynamic )
cExtern := ""
IF Empty( aInclude ) .AND. ;
Empty( aExclude )
cExtern += cLine
cExtern += " * NOTE: You can add manual override which functions to include or" + hb_eol()
cExtern += " * exclude from automatically generated EXTERNAL/DYNAMIC list." + hb_eol()
cExtern += cHelp
cExtern += ;
cLine + ;
" * NOTE: You can add manual override which functions to include or" + hb_eol() + ;
" * exclude from automatically generated EXTERNAL/DYNAMIC list." + hb_eol() + ;
cHelp
ELSE
cExtern += cLine
cExtern += " * NOTE: Following comments are control commands for the generator." + hb_eol()
cExtern += " * Do not edit them unless you know what you are doing." + hb_eol()
cExtern += cHelp
cExtern += ;
cLine + ;
" * NOTE: Following comments are control commands for the generator." + hb_eol() + ;
" * Do not edit them unless you know what you are doing." + hb_eol() + ;
cHelp
IF ! Empty( aInclude )
cExtern += hb_eol()
FOR EACH tmp IN aInclude
@@ -708,23 +715,26 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName )
NEXT
ENDIF
ENDIF
cExtern += hb_eol()
cExtern += cLine
cExtern += " * WARNING: Automatically generated code below. DO NOT EDIT! (except casing)" + hb_eol()
cExtern += " * Regenerate with HB_REBUILD_EXTERN=yes build option." + hb_eol()
cExtern += " */" + hb_eol()
cExtern += hb_eol()
cExtern += "#ifndef " + "__HBEXTERN_CH__" + Upper( hb_FNameName( cOutputName ) ) + "__" + hb_eol()
cExtern += "#define " + "__HBEXTERN_CH__" + Upper( hb_FNameName( cOutputName ) ) + "__" + hb_eol()
cExtern += hb_eol()
cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "ANNOUNCE" + " )" + hb_eol()
cExtern += " ANNOUNCE " + cSelfName + hb_eol()
cExtern += "#endif" + hb_eol()
cExtern += hb_eol()
cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol()
cExtern += " #command DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol()
cExtern += "#endif" + hb_eol()
cExtern += hb_eol()
cExtern += ;
hb_eol() + ;
cLine + ;
" * WARNING: Automatically generated code below. DO NOT EDIT! (except casing)" + hb_eol() + ;
" * Regenerate with HB_REBUILD_EXTERN=yes build option." + hb_eol() + ;
" */" + hb_eol() + ;
hb_eol() + ;
"#ifndef " + "__HBEXTERN_CH__" + Upper( hb_FNameName( cOutputName ) ) + "__" + hb_eol() + ;
"#define " + "__HBEXTERN_CH__" + Upper( hb_FNameName( cOutputName ) ) + "__" + hb_eol() + ;
hb_eol() + ;
"#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "ANNOUNCE" + " )" + hb_eol() + ;
" ANNOUNCE " + cSelfName + hb_eol() + ;
"#endif" + hb_eol() + ;
hb_eol() + ;
"#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol() + ;
" #command DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol() + ;
"#endif" + hb_eol() + ;
hb_eol()
IF Empty( aInclude )
aExtern := aFuncList
ELSE
@@ -742,11 +752,13 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName )
cExtern += "DYNAMIC " + hb_HGetDef( hDynamic, tmp, tmp ) + hb_eol()
ENDIF
NEXT
cExtern += hb_eol()
cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol()
cExtern += " #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol()
cExtern += "#endif" + hb_eol()
cExtern += hb_eol()
cExtern += "#endif" + hb_eol()
cExtern += ;
hb_eol() + ;
"#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol() + ;
" #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol() + ;
"#endif" + hb_eol() + ;
hb_eol() + ;
"#endif" + hb_eol()
RETURN hb_MemoWrit( cOutputName, cExtern )

2
doc/en/tlabel.txt
View File

@@ -62,7 +62,7 @@
$EXAMPLES$
PROCEDURE Main()
USE test NEW
LABEL FORM EE
LABEL FORM test.lbl
USE
RETURN
$STATUS$

2
doc/en/treport.txt
View File

@@ -90,7 +90,7 @@
$EXAMPLES$
PROCEDURE Main()
USE test NEW
REPORT FORM EE
REPORT FORM test.frm
USE
RETURN
$STATUS$

73
utils/hbmk2/hbmk2.prg
View File

@@ -13479,17 +13479,23 @@ STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName )
__hb_extern_get_exception_list( cOutputName, @aInclude, @aExclude, @hDynamic )
cExtern := ""
IF Empty( aInclude ) .AND. ;
Empty( aExclude )
cExtern += cLine
cExtern += " * NOTE: You can add manual override which functions to include or" + hb_eol()
cExtern += " * exclude from automatically generated EXTERNAL/DYNAMIC list." + hb_eol()
cExtern += cHelp
cExtern += ;
cLine + ;
" * NOTE: You can add manual override which functions to include or" + hb_eol() + ;
" * exclude from automatically generated EXTERNAL/DYNAMIC list." + hb_eol() + ;
cHelp
ELSE
cExtern += cLine
cExtern += " * NOTE: Following comments are control commands for the generator." + hb_eol()
cExtern += " * Do not edit them unless you know what you are doing." + hb_eol()
cExtern += cHelp
cExtern += ;
cLine + ;
" * NOTE: Following comments are control commands for the generator." + hb_eol() + ;
" * Do not edit them unless you know what you are doing." + hb_eol() + ;
cHelp
IF ! Empty( aInclude )
cExtern += hb_eol()
FOR EACH tmp IN aInclude
@@ -13503,23 +13509,26 @@ STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName )
NEXT
ENDIF
ENDIF
cExtern += hb_eol()
cExtern += cLine
cExtern += " * WARNING: Automatically generated code below. DO NOT EDIT! (except casing)" + hb_eol()
cExtern += " * Regenerate using " + _SELF_NAME_ + " '-hbx=' option." + hb_eol()
cExtern += " */" + hb_eol()
cExtern += hb_eol()
cExtern += "#ifndef " + "__HBEXTERN_CH__" + StrToDefine( hb_FNameName( cOutputName ) ) + "__" + hb_eol()
cExtern += "#define " + "__HBEXTERN_CH__" + StrToDefine( hb_FNameName( cOutputName ) ) + "__" + hb_eol()
cExtern += hb_eol()
cExtern += "#if defined( " + _HBMK_HBEXTREQ + " ) .OR. defined( " + cSelfName + "ANNOUNCE" + " )" + hb_eol()
cExtern += " ANNOUNCE " + cSelfName + hb_eol()
cExtern += "#endif" + hb_eol()
cExtern += hb_eol()
cExtern += "#if defined( " + _HBMK_HBEXTREQ + " ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol()
cExtern += " #command DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol()
cExtern += "#endif" + hb_eol()
cExtern += hb_eol()
cExtern += ;
hb_eol() + ;
cLine + ;
" * WARNING: Automatically generated code below. DO NOT EDIT! (except casing)" + hb_eol() + ;
" * Regenerate using " + _SELF_NAME_ + " '-hbx=' option." + hb_eol() + ;
" */" + hb_eol() + ;
hb_eol() + ;
"#ifndef " + "__HBEXTERN_CH__" + StrToDefine( hb_FNameName( cOutputName ) ) + "__" + hb_eol() + ;
"#define " + "__HBEXTERN_CH__" + StrToDefine( hb_FNameName( cOutputName ) ) + "__" + hb_eol() + ;
hb_eol() + ;
"#if defined( " + _HBMK_HBEXTREQ + " ) .OR. defined( " + cSelfName + "ANNOUNCE" + " )" + hb_eol() + ;
" ANNOUNCE " + cSelfName + hb_eol() + ;
"#endif" + hb_eol() + ;
hb_eol() + ;
"#if defined( " + _HBMK_HBEXTREQ + " ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol() + ;
" #command DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol() + ;
"#endif" + hb_eol() + ;
hb_eol()
IF Empty( aInclude )
aExtern := aFuncList
ELSE
@@ -13537,12 +13546,14 @@ STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName )
cExtern += "DYNAMIC " + hb_HGetDef( hDynamic, tmp, tmp ) + hb_eol()
ENDIF
NEXT
cExtern += hb_eol()
cExtern += "#if defined( " + _HBMK_HBEXTREQ + " ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol()
cExtern += " #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol()
cExtern += "#endif" + hb_eol()
cExtern += hb_eol()
cExtern += "#endif" + hb_eol()
cExtern += ;
hb_eol() + ;
"#if defined( " + _HBMK_HBEXTREQ + " ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol() + ;
" #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol() + ;
"#endif" + hb_eol() + ;
hb_eol() + ;
"#endif" + hb_eol()
/* Do not touch the file if the content is unchanged */
IF hb_MemoRead( cOutputName ) == cExtern