From bb777c776ccb3e76e7279ae8d10d1cd2e67381b4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 20 Mar 2013 00:50:55 +0100 Subject: [PATCH] Revert "2013-03-20 00:48 UTC+0100 Viktor Szakats (harbour syenar.net)" This reverts commit 39e0af0465286f0446185c37a8ba08179824a998. --- ChangeLog.txt | 12 ----- README.txt | 1 - config/postinst.hb | 108 +++++++++++++++++++----------------------- doc/en/tlabel.txt | 2 +- doc/en/treport.txt | 2 +- utils/hbmk2/hbmk2.prg | 73 ++++++++++++---------------- 6 files changed, 81 insertions(+), 117 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 105ae73ef6..53e6f40185 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,18 +10,6 @@ * 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 diff --git a/README.txt b/README.txt index 7d77915898..ce0526868e 100644 --- a/README.txt +++ b/README.txt @@ -1639,7 +1639,6 @@ 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] diff --git a/config/postinst.hb b/config/postinst.hb index 000d2d6091..c03435cb41 100644 --- a/config/postinst.hb +++ b/config/postinst.hb @@ -288,24 +288,23 @@ 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 ) + ; - '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 ) + 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 ) hb_MemoWrit( tmp, cSH_Script + hb_MemoRead( cTar_Path ) ) @@ -685,23 +684,17 @@ 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 + ; - " * NOTE: You can add manual override which functions to include or" + hb_eol() + ; - " * exclude from automatically generated EXTERNAL/DYNAMIC list." + hb_eol() + ; - cHelp + 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 ELSE - - 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 - + 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 IF ! Empty( aInclude ) cExtern += hb_eol() FOR EACH tmp IN aInclude @@ -715,26 +708,23 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName ) NEXT ENDIF ENDIF - - 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 => EXTERNAL " + hb_eol() + ; - "#endif" + hb_eol() + ; - hb_eol() - + 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 => EXTERNAL " + hb_eol() + cExtern += "#endif" + hb_eol() + cExtern += hb_eol() IF Empty( aInclude ) aExtern := aFuncList ELSE @@ -752,13 +742,11 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName ) cExtern += "DYNAMIC " + hb_HGetDef( hDynamic, tmp, tmp ) + hb_eol() ENDIF NEXT - - cExtern += ; - hb_eol() + ; - "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol() + ; - " #uncommand DYNAMIC => EXTERNAL " + hb_eol() + ; - "#endif" + hb_eol() + ; - hb_eol() + ; - "#endif" + hb_eol() + cExtern += hb_eol() + cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol() + cExtern += " #uncommand DYNAMIC => EXTERNAL " + hb_eol() + cExtern += "#endif" + hb_eol() + cExtern += hb_eol() + cExtern += "#endif" + hb_eol() RETURN hb_MemoWrit( cOutputName, cExtern ) diff --git a/doc/en/tlabel.txt b/doc/en/tlabel.txt index 15219cb35b..09470ea2e5 100644 --- a/doc/en/tlabel.txt +++ b/doc/en/tlabel.txt @@ -62,7 +62,7 @@ $EXAMPLES$ PROCEDURE Main() USE test NEW - LABEL FORM test.lbl + LABEL FORM EE USE RETURN $STATUS$ diff --git a/doc/en/treport.txt b/doc/en/treport.txt index cc03646893..f1db525f5b 100644 --- a/doc/en/treport.txt +++ b/doc/en/treport.txt @@ -90,7 +90,7 @@ $EXAMPLES$ PROCEDURE Main() USE test NEW - REPORT FORM test.frm + REPORT FORM EE USE RETURN $STATUS$ diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg index 3871fe37ea..de7e04b2eb 100644 --- a/utils/hbmk2/hbmk2.prg +++ b/utils/hbmk2/hbmk2.prg @@ -13479,23 +13479,17 @@ 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 + ; - " * NOTE: You can add manual override which functions to include or" + hb_eol() + ; - " * exclude from automatically generated EXTERNAL/DYNAMIC list." + hb_eol() + ; - cHelp + 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 ELSE - - 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 - + 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 IF ! Empty( aInclude ) cExtern += hb_eol() FOR EACH tmp IN aInclude @@ -13509,26 +13503,23 @@ STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName ) NEXT ENDIF ENDIF - - 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 => EXTERNAL " + hb_eol() + ; - "#endif" + hb_eol() + ; - hb_eol() - + 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 => EXTERNAL " + hb_eol() + cExtern += "#endif" + hb_eol() + cExtern += hb_eol() IF Empty( aInclude ) aExtern := aFuncList ELSE @@ -13546,14 +13537,12 @@ STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName ) cExtern += "DYNAMIC " + hb_HGetDef( hDynamic, tmp, tmp ) + hb_eol() ENDIF NEXT - - cExtern += ; - hb_eol() + ; - "#if defined( " + _HBMK_HBEXTREQ + " ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol() + ; - " #uncommand DYNAMIC => EXTERNAL " + hb_eol() + ; - "#endif" + hb_eol() + ; - hb_eol() + ; - "#endif" + hb_eol() + cExtern += hb_eol() + cExtern += "#if defined( " + _HBMK_HBEXTREQ + " ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol() + cExtern += " #uncommand DYNAMIC => EXTERNAL " + hb_eol() + cExtern += "#endif" + hb_eol() + cExtern += hb_eol() + cExtern += "#endif" + hb_eol() /* Do not touch the file if the content is unchanged */ IF hb_MemoRead( cOutputName ) == cExtern