diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1a3f7737db..a773ec256d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-11 16:30 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbide/ideedit.prg + * contrib/hbide/idemisc.prg + * contrib/hbide/idesaveload.prg + * contrib/hbrun/hbrun.prg + * utils/hbmk2/hbmk2.prg + * utils/hbmk2/hbmk2.es_PE.po + * utils/hbmk2/hbmk2.hu_HU.po + * utils/hbmk2/hbmk2.pt_BR.po + - deleted support for .hbs extension for Harbour Scripts. + use .hb now. INCOMPATIBLE. + 2012-06-11 15:31 UTC+0200 Viktor Szakats (harbour syenar.net) * include/harbour.hbx * src/vm/dynsym.c diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index e553107d6f..9bd09b8ca7 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -2208,7 +2208,7 @@ METHOD IdeEdit:handlePreviousWord( lUpdatePrevWord ) nL := len( cWord ) + nSpace nB := qCursor:position() - nL - IF lower( ::oEditor:cExt ) $ ".prg,.hb,.hbs" .AND. ! ::oINI:lSupressHbKWordsToUpper + IF lower( ::oEditor:cExt ) $ ".prg,.hb" .AND. ! ::oINI:lSupressHbKWordsToUpper qCursor:beginEditBlock() qCursor:setPosition( nB ) qCursor:movePosition( QTextCursor_NextCharacter, QTextCursor_KeepAnchor, nL ) diff --git a/harbour/contrib/hbide/idemisc.prg b/harbour/contrib/hbide/idemisc.prg index d4e2925b6c..f61cded310 100644 --- a/harbour/contrib/hbide/idemisc.prg +++ b/harbour/contrib/hbide/idemisc.prg @@ -572,7 +572,7 @@ FUNCTION hbide_isValidSource( cSourceFile ) hb_fNameSplit( cSourceFile, , , @cExt ) - RETURN ( lower( cExt ) $ ".c,.cpp,.prg,.res,.rc,.hb,.hbs" ) + RETURN ( lower( cExt ) $ ".c,.cpp,.prg,.res,.rc,.hb" ) /*----------------------------------------------------------------------*/ @@ -1970,7 +1970,7 @@ FUNCTION app_image( cName ) FUNCTION hbide_isCompilerSource( cSource, cIncList ) LOCAL cExt, aExt - DEFAULT cIncList TO ".c,.cpp,.prg,.hb,.hbs,.rc,.res,.hbm,.hbc,.qrc,.ui,.hbp" + DEFAULT cIncList TO ".c,.cpp,.prg,.hb,.rc,.res,.hbm,.hbc,.qrc,.ui,.hbp" cIncList := lower( cIncList ) aExt := hb_aTokens( lower( cIncList ), "," ) diff --git a/harbour/contrib/hbide/idesaveload.prg b/harbour/contrib/hbide/idesaveload.prg index a8fa04288e..1cf7a70518 100644 --- a/harbour/contrib/hbide/idesaveload.prg +++ b/harbour/contrib/hbide/idesaveload.prg @@ -121,7 +121,7 @@ CLASS IdeINI INHERIT IdeObject DATA cCurrentReplace INIT "" DATA cCurrentView INIT "" // - DATA cTextFileExtensions INIT ".c,.cpp,.prg,.h,.ch,.txt,.log,.ini,.env,.ppo,.qtp,.hb,.hbs," + ; + DATA cTextFileExtensions INIT ".c,.cpp,.prg,.h,.ch,.txt,.log,.ini,.env,.ppo,.qtp,.hb," + ; ".cc,.hbc,.hbp,.hbm,.xml,.bat,.sh,.rc,.ui,.uic,.bak,.fmg,.qth,.qrc" DATA aProjFiles INIT {} DATA aFiles INIT {} @@ -1171,7 +1171,7 @@ METHOD IdeSetup:setIcons() ::oUI:q_buttonKeyUp : setIcon( QIcon( hbide_image( "dc_up" ) ) ) ::oUI:q_buttonKeyDown : setIcon( QIcon( hbide_image( "dc_down" ) ) ) - /* Paths */ + /* Paths */ ::oUI:q_buttonPathHrbRoot : setIcon( QIcon( hbide_image( "open" ) ) ) ::oUI:q_buttonPathHbmk2 : setIcon( QIcon( hbide_image( "open" ) ) ) ::oUI:q_buttonPathEnv : setIcon( QIcon( hbide_image( "open" ) ) ) @@ -1193,10 +1193,10 @@ METHOD IdeSetup:setIcons() ::oUI:q_buttonThmApp : setIcon( QIcon( hbide_image( "copy" ) ) ) ::oUI:q_buttonThmSav : setIcon( QIcon( hbide_image( "save" ) ) ) - /* Dictionaries */ + /* Dictionaries */ ::oUI:q_buttonDictPath : setIcon( QIcon( hbide_image( "open" ) ) ) - /* VSS */ + /* VSS */ ::oUI:q_buttonVSSExe : setIcon( QIcon( hbide_image( "open" ) ) ) ::oUI:q_buttonVSSDatabase : setIcon( QIcon( hbide_image( "open" ) ) ) diff --git a/harbour/contrib/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg index b6c35db523..c03a90f25b 100644 --- a/harbour/contrib/hbrun/hbrun.prg +++ b/harbour/contrib/hbrun/hbrun.prg @@ -159,7 +159,6 @@ PROCEDURE _APPMAIN( cFile, ... ) cExt := Lower( cExt ) SWITCH cExt CASE ".hb" - CASE ".hbs" CASE ".prg" CASE ".hrb" CASE ".dbf" @@ -173,7 +172,6 @@ PROCEDURE _APPMAIN( cFile, ... ) hbrun_Prompt( hb_AParams(), "USE " + cFile + " SHARED" ) EXIT CASE ".hb" - CASE ".hbs" CASE ".prg" IF Empty( GetEnv( "HBRUN_NOHEAD" ) ) hHeaders := __hbrun_CoreHeaderFiles() /* add core header files */ @@ -325,7 +323,6 @@ STATIC FUNCTION plugins_load( hPlugins, aParams ) SWITCH Lower( hb_FNameExt( cFile:__enumKey() ) ) CASE ".hb" - CASE ".hbs" CASE ".prg" cFile := hb_compileFromBuf( cFile, __hbrun_CoreHeaderFiles(), hb_ProgName(), "-n2", "-w", "-es2", "-q0" ) IF cFile == NIL @@ -587,7 +584,7 @@ STATIC PROCEDURE hbrun_Usage() "Copyright (c) 1999-2012, Przemyslaw Czerpak, Viktor Szakats" + hb_eol() + ; "http://harbour-project.org/" + hb_eol() +; hb_eol() +; - "Syntax: hbrun [ []]" + hb_eol() ) + "Syntax: hbrun [ []]" + hb_eol() ) RETURN @@ -788,7 +785,7 @@ FUNCTION __hbrun_FindInPath( cFileName, xPath ) LOCAL aExt hb_FNameSplit( cFileName, @cDir, @cName, @cExt ) - aExt := iif( Empty( cExt ), { ".hb", ".hbs", ".hrb" }, { cExt } ) + aExt := iif( Empty( cExt ), { ".hb", ".hrb" }, { cExt } ) FOR EACH cExt IN aExt /* Check original filename (in supplied path or current dir) */ @@ -852,7 +849,6 @@ STATIC FUNCTION win_reg_app( lRegister, lAllUser, cAppPath ) LOCAL aEntries := {; cHive + '\' , "" ,; cHive + '\.hb\' , "HarbourScript" ,; - cHive + '\.hbs\' , "HarbourScript" ,; cHive + '\HarbourScript\' , "Harbour Script File" ,; cHive + '\HarbourScript\DefaultIcon\' , cAppPath + ",-1" ,; cHive + '\HarbourScript\Shell\' , "Run" ,; diff --git a/harbour/utils/hbmk2/hbmk2.es_PE.po b/harbour/utils/hbmk2/hbmk2.es_PE.po index 74227a9726..3564f9341c 100644 --- a/harbour/utils/hbmk2/hbmk2.es_PE.po +++ b/harbour/utils/hbmk2/hbmk2.es_PE.po @@ -1438,7 +1438,7 @@ msgstr "" #: hbmk2.prg:13120 #, c-format -msgid ".hb, .hbs or .hrb file passed as first parameter will be run as Harbour script. (EXPERIMENTAL)" +msgid ".hb or .hrb file passed as first parameter will be run as Harbour script. (EXPERIMENTAL)" msgstr "" #: hbmk2.prg:2590 @@ -1458,7 +1458,7 @@ msgstr "" #: hbmk2.prg:13102 #, c-format -msgid "add plugin. can be: .hb, .hbs, .prg, .hrb" +msgid "add plugin. can be: .hb, .prg, .hrb" msgstr "" #: hbmk2.prg:5315 diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index e6039c9125..cddc81be71 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -1434,7 +1434,7 @@ msgstr "" #: hbmk2.prg:13120 #, c-format -msgid ".hb, .hbs or .hrb file passed as first parameter will be run as Harbour script. (EXPERIMENTAL)" +msgid ".hb or .hrb file passed as first parameter will be run as Harbour script. (EXPERIMENTAL)" msgstr "" #: hbmk2.prg:2590 @@ -1454,7 +1454,7 @@ msgstr "" #: hbmk2.prg:13102 #, c-format -msgid "add plugin. can be: .hb, .hbs, .prg, .hrb" +msgid "add plugin. can be: .hb, .prg, .hrb" msgstr "" #: hbmk2.prg:5315 diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 9548c6bae0..d5e7f76a4f 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -570,7 +570,6 @@ PROCEDURE _APPMAIN( ... ) IF PCount() >= 1 tmp := Lower( hb_FNameExt( hb_PValue( 1 ) ) ) IF tmp == ".hb" .OR. ; - tmp == ".hbs" .OR. ; tmp == ".hrb" __hbrun_minimal( ... ) QUIT @@ -3118,7 +3117,6 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ENDIF CASE hb_FNameExt( cParamL ) == ".prg" .OR. ; - hb_FNameExt( cParamL ) == ".hbs" .OR. ; hb_FNameExt( cParamL ) == ".hb" FOR EACH cParam IN FN_Expand( PathMakeAbsolute( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] ), Empty( aParam[ _PAR_cFileName ] ) ) @@ -5521,7 +5519,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) /* Do entry function detection on platform required and supported */ IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ! lStopAfterCComp .AND. l_cMAIN == NIL - tmp := iif( HBMK_IS_IN( Lower( hb_FNameExt( hbmk[ _HBMK_cFIRST ] ) ), ".prg|.hb|.hbs|.clp" ) .OR. Empty( hb_FNameExt( hbmk[ _HBMK_cFIRST ] ) ), FNameDirExtSet( hbmk[ _HBMK_cFIRST ], hbmk[ _HBMK_cWorkDir ], ".c" ), hbmk[ _HBMK_cFIRST ] ) + tmp := iif( HBMK_IS_IN( Lower( hb_FNameExt( hbmk[ _HBMK_cFIRST ] ) ), ".prg|.hb|.clp" ) .OR. Empty( hb_FNameExt( hbmk[ _HBMK_cFIRST ] ) ), FNameDirExtSet( hbmk[ _HBMK_cFIRST ], hbmk[ _HBMK_cWorkDir ], ".c" ), hbmk[ _HBMK_cFIRST ] ) IF ! Empty( tmp := getFirstFunc( hbmk, tmp ) ) l_cMAIN := tmp ENDIF @@ -8607,9 +8605,8 @@ STATIC PROCEDURE PlugIn_Load( hbmk, cFileName ) IF ! Empty( cFile ) lOK := .F. - /* Optimization: Don't try to load it as .hrb if the extension is .prg, .hb or .hbs (Harbour script) */ + /* Optimization: Don't try to load it as .hrb if the extension is .prg, .hb (Harbour script) */ IF !( Lower( cExt ) == ".prg" ) .AND. ; - !( Lower( cExt ) == ".hbs" ) .AND. ; !( Lower( cExt ) == ".hb" ) BEGIN SEQUENCE WITH {| oError | Break( oError ) } hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile ) @@ -12112,7 +12109,6 @@ STATIC PROCEDURE __hbrun_minimal( cFile, ... ) IF ! Empty( cFile := FindInPath( cFile ) ) SWITCH Lower( hb_FNameExt( cFile ) ) CASE ".hb" - CASE ".hbs" __hbrun_LoadExtDynamicFromSource( aDynamic, cFile ) /* NOTE: Assumptions: - one dynamic libs belongs to one .hbc file @@ -12839,7 +12835,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-depimplibs=" , I_( " is the name of the dependency. Add to the import library source list." ) },; { "-depimplibd=" , I_( " is the name of the dependency. Set generated import library name to " ) },; NIL,; - { "-plugin=" , I_( "add plugin. can be: .hb, .hbs, .prg, .hrb" ) },; + { "-plugin=" , I_( "add plugin. can be: .hb, .prg, .hrb" ) },; { "-pi=" , I_( "pass input file to plugins" ) },; { "-pflag=" , I_( "pass flag to plugins" ) },; NIL,; @@ -12898,7 +12894,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) I_( 'Options accepting macros also support command substitution. Enclose command inside ``, and, if the command contains space, also enclose in double quotes. F.e. "-cflag=`wx-config --cflags`", or ldflags={unix&gcc}"`wx-config --libs`".' ),; I_( "Defaults and feature support vary by platform/compiler." ) ,; hb_StrFormat( I_( "Options can also be specified in environment variable %1$s" ), _HBMK_ENV_NAME ),; - I_( ".hb, .hbs or .hrb file passed as first parameter will be run as Harbour script. (EXPERIMENTAL)" ) } + I_( ".hb or .hrb file passed as first parameter will be run as Harbour script. (EXPERIMENTAL)" ) } hb_default( @lLong, .F. ) diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po index 56b1818765..27424ab7a1 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -1438,7 +1438,7 @@ msgstr "" #: hbmk2.prg:13120 #, c-format -msgid ".hb, .hbs or .hrb file passed as first parameter will be run as Harbour script. (EXPERIMENTAL)" +msgid ".hb or .hrb file passed as first parameter will be run as Harbour script. (EXPERIMENTAL)" msgstr "" #: hbmk2.prg:2590 @@ -1458,7 +1458,7 @@ msgstr "" #: hbmk2.prg:13102 #, c-format -msgid "add plugin. can be: .hb, .hbs, .prg, .hrb" +msgid "add plugin. can be: .hb, .prg, .hrb" msgstr "" #: hbmk2.prg:5315