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

2010-08-03 11:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbrun/hbrun.prg
    + Will now add the script's home directory to the header dir list.

  * contrib/make.hbs
  * config/postinst.hbs
  + config/hbextern.hbs
    + Moved extern header generation low level logic to separate script.
    + Added feedback about extern generation.
    + Moved core extern header generation logic to postinst.hbs.
    ! Minor fix to output when postinst is used in non-install phase.

  * contrib/global.mk
    + Displays HB_REBUILD_EXTERN setting.

  * Makefile
    * Changed to always execute config/postinst.hbs, not just in
      install phase.

  * include/hbextudd.ch
  * include/hbextsca.ch
  * include/hbextcdp.ch
  * include/hbextlng.ch
  * include/hbextern.ch
    + Replaced content with automatically generated one.

  * contrib/hbxbp/xbpgeneric.prg
  * contrib/hbide/idemisc.prg
  * contrib/hbide/idesaveload.prg
  * contrib/hbide/ideprojmanager.prg
  * contrib/hbide/ideshortcuts.prg
    * Deleted "just" functions and replaced them with HB_SYMBOL_UNUSED()
      macro, which has no runtime overhead.

  * contrib/hbide/hbide.hbp
  - contrib/hbide/iderequests.prg
    - Deleted requesting HBQT component via "just" function. Now it's
      done by EXTERNAL statements. BTW this function was not called,
      so it was ineffective.  Pls correct me if I missed the point
      of the old solution.
This commit is contained in:
Viktor Szakats
2010-08-04 09:24:15 +00:00
parent c983884a04
commit 8de8345e77
19 changed files with 1629 additions and 1900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
harbour/ChangeLog
View File

@@ -16,9 +16,50 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-08-03 11:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbrun/hbrun.prg
+ Will now add the script's home directory to the header dir list.
* contrib/make.hbs
* config/postinst.hbs
+ config/hbextern.hbs
+ Moved extern header generation low level logic to separate script.
+ Added feedback about extern generation.
+ Moved core extern header generation logic to postinst.hbs.
! Minor fix to output when postinst is used in non-install phase.
* contrib/global.mk
+ Displays HB_REBUILD_EXTERN setting.
* Makefile
* Changed to always execute config/postinst.hbs, not just in
install phase.
* include/hbextudd.ch
* include/hbextsca.ch
* include/hbextcdp.ch
* include/hbextlng.ch
* include/hbextern.ch
+ Replaced content with automatically generated one.
* contrib/hbxbp/xbpgeneric.prg
* contrib/hbide/idemisc.prg
* contrib/hbide/idesaveload.prg
* contrib/hbide/ideprojmanager.prg
* contrib/hbide/ideshortcuts.prg
* Deleted "just" functions and replaced them with HB_SYMBOL_UNUSED()
macro, which has no runtime overhead.
* contrib/hbide/hbide.hbp
- contrib/hbide/iderequests.prg
- Deleted requesting HBQT component via "just" function. Now it's
done by EXTERNAL statements. BTW this function was not called,
so it was ineffective. Pls correct me if I missed the point
of the old solution.
2010-08-04 01:47 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/ideshortcuts.prg
! Deleted calls to HB_TRACE(). oErr was not being referenced
! Deleted calls to HB_TRACE(). oErr was not being referenced
after HB_TR_ALWAYS => HB_TR_DEBUG.
2010-08-03 10:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

2
harbour/Makefile
View File

@@ -48,7 +48,7 @@ include $(ROOT)config/dir.mk
ifneq ($(HB_NO_HBSCRIPT),yes)
install::
first clean install::
$(if $(wildcard $(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT)),+$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)config/postinst.hbs,@$(ECHO) $(ECHOQUOTE)! Warning: hbrun not found, config/postinst.hbs skipped.$(ECHOQUOTE))
endif

3
harbour/config/global.mk
View File

@@ -303,6 +303,9 @@ ifeq ($(HB_INIT_DONE),)
ifneq ($(HB_EXTERNAL_ADDONS),)
$(info ! HB_EXTERNAL_ADDONS: $(HB_EXTERNAL_ADDONS))
endif
ifneq ($(HB_REBUILD_EXTERN),)
$(info ! HB_REBUILD_EXTERN: $(HB_REBUILD_EXTERN))
endif
ifneq ($(HB_REBUILD_PARSER),)
$(info ! HB_REBUILD_PARSER: $(HB_REBUILD_PARSER))
endif

91
harbour/config/hbextern.hbs Normal file
View File

@@ -0,0 +1,91 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* extern generator functions (low-level)
*
* Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
* their web site at http://www.gnu.org/).
*
*/
#pragma warninglevel=3
STATIC FUNCTION __hb_extern_get_list( cInputName )
LOCAL cStdOut
LOCAL hRegex
LOCAL aResult
LOCAL aExtern
LOCAL tmp
IF GetEnv( "HB_COMPILER" ) $ "gcc|mingw|mingw64|cygwin"
IF hb_processRun( "nm -g --defined-only -C " + cInputName,, @cStdOut ) == 0
IF ! Empty( hRegex := hb_regexComp( '[[:blank:]]HB_FUN_(.*)[[:space:]]', .T., .T. ) )
aResult := hb_regexAll( hRegex, StrTran( cStdOut, Chr( 13 ) ),,,,, .T. )
aExtern := {}
FOR EACH tmp IN aResult
AAdd( aExtern, tmp[ 2 ] )
NEXT
ASort( aExtern,,, {| tmp, tmp1 | tmp < tmp1 } )
RETURN aExtern
ENDIF
ENDIF
ENDIF
RETURN NIL
STATIC FUNCTION __hb_extern_gen( aExtern, cOutputName, lANNOUNCE )
LOCAL cExtern
LOCAL tmp
cExtern := "/*" + hb_eol()
cExtern += " * $" + "Id" + "$" + hb_eol()
cExtern += " */" + hb_eol()
cExtern += hb_eol()
cExtern += "/* -------------------------------------------------------------------- */" + hb_eol()
cExtern += "/* WARNING: Automatically generated code. DO NOT EDIT! */" + hb_eol()
cExtern += "/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */" + hb_eol()
cExtern += "/* compiler family. */" + hb_eol()
cExtern += "/* -------------------------------------------------------------------- */" + hb_eol()
cExtern += hb_eol()
cExtern += "#ifndef " + "__HBEXTERN__" + Upper( __FNameNameGet( cOutputName ) ) + "__" + hb_eol()
cExtern += "#define " + "__HBEXTERN__" + Upper( __FNameNameGet( cOutputName ) ) + "__" + hb_eol()
IF lANNOUNCE
cExtern += hb_eol()
cExtern += "ANNOUNCE " + "__" + Upper( __FNameNameGet( cOutputName ) ) + "_EXTERN__" + hb_eol()
ENDIF
cExtern += hb_eol()
FOR EACH tmp IN aExtern
IF ! hb_WildMatch( "HB_GT_*_DEFAULT", tmp ) .AND. ;
! hb_WildMatch( "__*_EXTERN__", tmp )
cExtern += "EXTERNAL " + tmp + hb_eol()
ENDIF
NEXT
cExtern += hb_eol()
cExtern += "#endif" + hb_eol()
RETURN hb_MemoWrit( cOutputName, cExtern )
STATIC FUNCTION __FNameNameGet( cFileName )
LOCAL cName
hb_FNameSplit( cFileName,, @cName )
RETURN cName

95
harbour/config/postinst.hbs
View File

@@ -57,6 +57,10 @@ PROCEDURE Main()
RETURN
ENDIF
/* Regenerating extern headers */
mk_extern_core()
/* Installing some misc files */
IF GetEnv( "HB_PLATFORM" ) $ "win|wce|os2|dos"
@@ -180,9 +184,12 @@ PROCEDURE Main()
/* Creating docs for core */
OutStd( "! Compiling core documentation (.hbd)..." + hb_eol() )
IF ! Empty( GetEnv( "HB_INSTALL_DOC" ) )
mk_hbd_core( "." + hb_ps() )
OutStd( "! Compiling core documentation (.hbd)..." + hb_eol() )
mk_hbd_core( "." + hb_ps() )
ENDIF
/* Creating install packages */
@@ -326,34 +333,24 @@ STATIC FUNCTION mk_hbl( cIn, cOut )
RETURN .F.
STATIC FUNCTION mk_hbd_core( cDir )
LOCAL cName
LOCAL cName := "harbour"
LOCAL tmp
LOCAL aErrMsg
LOCAL aEntry
LOCAL aErrMsg := {}
LOCAL aEntry := __hbdoc_LoadDir( cDir, cName, aErrMsg )
IF ! Empty( GetEnv( "HB_INSTALL_DOC" ) )
FOR EACH tmp IN aErrMsg
OutErr( hb_StrFormat( "! %1$s", tmp ) + hb_eol() )
NEXT
cName := "harbour"
aErrMsg := {}
aEntry := __hbdoc_LoadDir( cDir, cName, aErrMsg )
FOR EACH tmp IN aErrMsg
OutErr( hb_StrFormat( "! %1$s", tmp ) + hb_eol() )
NEXT
IF ! Empty( aEntry )
cName := PathSepToSelf( GetEnv( "HB_INSTALL_DOC" ) ) + hb_ps() + cName + ".hbd"
IF __hbdoc_SaveHBD( cName, aEntry )
OutStd( "! Created " + cName + " <= " + cDir + hb_eol() )
RETURN .T.
ELSE
OutErr( hb_StrFormat( "! Error: Saving '%1$s'", cName ) + hb_eol() )
ENDIF
IF ! Empty( aEntry )
cName := PathSepToSelf( GetEnv( "HB_INSTALL_DOC" ) ) + hb_ps() + cName + ".hbd"
IF __hbdoc_SaveHBD( cName, aEntry )
OutStd( "! Created " + cName + " <= " + cDir + hb_eol() )
RETURN .T.
ELSE
OutErr( hb_StrFormat( "! Error: Saving '%1$s'", cName ) + hb_eol() )
ENDIF
ELSE
OutErr( "! Warning: HB_INSTALL_DOC not set, core documentation not compiled." + hb_eol() )
ENDIF
RETURN .F.
@@ -532,3 +529,51 @@ STATIC FUNCTION unix_name()
ENDCASE
RETURN StrTran( Lower( query_stdout( "uname -s" ) ), " ", "_" )
STATIC FUNCTION mk_extern_core()
LOCAL aExtern
LOCAL aSCALAR
LOCAL aCODEPAGE
LOCAL aLANG
LOCAL aUSRRDD
LOCAL aMain
LOCAL tmp
IF GetEnv( "HB_REBUILD_EXTERN" ) == "yes" .AND. ;
! Empty( GetEnv( "HB_DYNLIB_ST" ) )
OutStd( "! Generating core extern headers..." + hb_eol() )
IF ( aExtern := __hb_extern_get_list( GetEnv( "HB_DYNLIB_DIR" ) + hb_ps() + GetEnv( "HB_DYNLIB_ST" ) + GetEnv( "HB_DYNLIB_EXT" ) ) ) != NIL
aSCALAR := {}
aCODEPAGE := {}
aLANG := {}
aUSRRDD := {}
aMain := {}
FOR EACH tmp IN aExtern
DO CASE
CASE "|" + tmp $ "|HBARRAY|HBBLOCK|HBCHARACTER|HBDATE|HBTIMESTAMP|HBLOGICAL|HBNIL|HBNUMERIC" ; AAdd( aSCALAR, tmp )
CASE Left( tmp, Len( "HB_CODEPAGE_" ) ) == "HB_CODEPAGE_" ; AAdd( aCODEPAGE, tmp )
CASE Left( tmp, Len( "HB_LANG_" ) ) == "HB_LANG_" ; AAdd( aLANG , tmp )
CASE Left( tmp, Len( "UR_SUPER_" ) ) == "UR_SUPER_" ; AAdd( aUSRRDD , tmp )
OTHERWISE ; AAdd( aMain , tmp )
ENDCASE
NEXT
__hb_extern_gen( aSCALAR , "include" + hb_ps() + "hbextsca.ch", .F. )
__hb_extern_gen( aCODEPAGE, "include" + hb_ps() + "hbextcdp.ch", .F. )
__hb_extern_gen( aLANG , "include" + hb_ps() + "hbextlng.ch", .F. )
__hb_extern_gen( aUSRRDD , "include" + hb_ps() + "hbextudd.ch", .F. )
__hb_extern_gen( aMain , "include" + hb_ps() + "hbextern.ch", .F. )
RETURN .T.
ENDIF
ENDIF
RETURN .F.
#include "hbextern.hbs"

1
harbour/contrib/hbide/hbide.hbp
View File

@@ -32,7 +32,6 @@ ideeditor.prg
idefindreplace.prg
idedocks.prg
idesaveload.prg
iderequests.prg
idethemes.prg
ideprojmanager.prg
idesources.prg

7
harbour/contrib/hbide/idemisc.prg
View File

@@ -93,11 +93,6 @@ PROCEDURE AppSys()
/*----------------------------------------------------------------------*/
PROCEDURE hbide_justACall()
RETURN
/*----------------------------------------------------------------------*/
FUNCTION hbide_setIde( oIde )
LOCAL oldIde
STATIC ide
@@ -169,7 +164,7 @@ FUNCTION hbide_execPopup( aPops, aqPos, qParent )
ENDIF
qPop := NIL
hbide_justACall( xRet )
HB_SYMBOL_UNUSED( xRet )
RETURN cAct
/*----------------------------------------------------------------------*/

5
harbour/contrib/hbide/ideprojmanager.prg
View File

@@ -1474,7 +1474,8 @@ METHOD IdeProjManager:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt )
METHOD IdeProjManager:showOutput( cOutput, mp2, oProcess )
hbide_justACall( mp2, oProcess )
HB_SYMBOL_UNUSED( mp2 )
HB_SYMBOL_UNUSED( oProcess )
hbide_convertBuildStatusMsgToHtml( cOutput, ::oOutputResult:oWidget )
@@ -1485,7 +1486,7 @@ METHOD IdeProjManager:showOutput( cOutput, mp2, oProcess )
METHOD IdeProjManager:finished( nExitCode, nExitStatus, oProcess )
LOCAL cTmp, n, n1, cTkn, cExe
hbide_justACall( oProcess )
HB_SYMBOL_UNUSED( oProcess )
::outputText( hbide_outputLine() )
cTmp := "Exit Code [ " + hb_ntos( nExitCode ) + " ] Exit Status [ " + hb_ntos( nExitStatus ) + " ] " +;

249
harbour/contrib/hbide/iderequests.prg
View File

@@ -1,249 +0,0 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
/*
* EkOnkar
* ( The LORD is ONE )
*
* Harbour-Qt IDE
*
* Pritpal Bedi <pritpal@vouchcac.com>
* 30Nov2009
*/
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
FUNCTION RequestModules()
hbxbp_just( QAbstractButton():new() )
hbxbp_just( QAbstractItemModel():new() )
hbxbp_just( QAbstractItemView():new() )
hbxbp_just( QAbstractListModel():new() )
hbxbp_just( QAbstractPrintDialog():new() )
hbxbp_just( QAbstractScrollArea():new() )
hbxbp_just( QAbstractSlider():new() )
hbxbp_just( QAbstractSpinBox():new() )
hbxbp_just( QAbstractTableModel():new() )
hbxbp_just( QAction():new() )
hbxbp_just( QApplication():new() )
hbxbp_just( QBitmap():new() )
hbxbp_just( QBoxLayout():new() )
hbxbp_just( QBrush():new() )
hbxbp_just( QButtonGroup():new() )
hbxbp_just( QCalendarWidget():new() )
hbxbp_just( QCheckBox():new() )
hbxbp_just( QClipboard():new() )
hbxbp_just( QColor():new() )
hbxbp_just( QColorDialog():new() )
hbxbp_just( QComboBox():new() )
hbxbp_just( QCommandLinkButton():new() )
hbxbp_just( QCommonStyle():new() )
hbxbp_just( QConicalGradient():new() )
hbxbp_just( QCoreApplication():new() )
hbxbp_just( QCursor():new() )
hbxbp_just( QDateEdit():new() )
hbxbp_just( QDateTime():new() )
hbxbp_just( QDateTimeEdit():new() )
hbxbp_just( QDesktopWidget():new() )
hbxbp_just( QDial():new() )
hbxbp_just( QDialog():new() )
hbxbp_just( QDir():new() )
hbxbp_just( QDirModel():new() )
hbxbp_just( QDockWidget():new() )
hbxbp_just( QDoubleSpinBox():new() )
hbxbp_just( QDropEvent():new() )
hbxbp_just( QDragMoveEvent():new() )
hbxbp_just( QDragEnterEvent():new() )
hbxbp_just( QDragLeaveEvent():new() )
hbxbp_just( QErrorMessage():new() )
hbxbp_just( QEvent():new() )
hbxbp_just( QEventLoop():new() )
hbxbp_just( QFileDialog():new() )
hbxbp_just( QFileSystemModel():new() )
hbxbp_just( QFocusEvent():new() )
hbxbp_just( QFocusFrame():new() )
hbxbp_just( QFont():new() )
hbxbp_just( QFontComboBox():new() )
hbxbp_just( QFontDatabase():new() )
hbxbp_just( QFontDialog():new() )
hbxbp_just( QFontInfo():new() )
hbxbp_just( QFontMetrics():new() )
hbxbp_just( QFontMetricsF():new() )
hbxbp_just( QFormLayout():new() )
hbxbp_just( QFrame():new() )
hbxbp_just( QFtp():new() )
hbxbp_just( QGradient():new() )
hbxbp_just( QGridLayout():new() )
hbxbp_just( QGroupBox():new() )
hbxbp_just( QHBoxLayout():new() )
hbxbp_just( QHeaderView():new() )
hbxbp_just( QHttp():new() )
hbxbp_just( QIcon():new() )
hbxbp_just( QImage():new() )
hbxbp_just( QImageReader():new() )
hbxbp_just( QImageWriter():new() )
hbxbp_just( QInputDialog():new() )
hbxbp_just( QInputEvent():new() )
hbxbp_just( QIODevice():new() )
hbxbp_just( QKeyEvent():new() )
hbxbp_just( QKeySequence():new() )
hbxbp_just( QLabel():new() )
hbxbp_just( QLatin1Char():new() )
hbxbp_just( QLatin1String():new() )
hbxbp_just( QLayout():new() )
hbxbp_just( QLayoutItem():new() )
hbxbp_just( QLCDNumber():new() )
hbxbp_just( QLine():new() )
hbxbp_just( QLinearGradient():new() )
hbxbp_just( QLineEdit():new() )
hbxbp_just( QList():new() )
hbxbp_just( QListView():new() )
hbxbp_just( QListWidget():new() )
hbxbp_just( QListWidgetItem():new() )
hbxbp_just( QMainWindow():new() )
hbxbp_just( QMenu():new() )
hbxbp_just( QMenuBar():new() )
hbxbp_just( QMessageBox():new() )
hbxbp_just( QModelIndex():new() )
hbxbp_just( QMouseEvent():new() )
hbxbp_just( QMoveEvent():new() )
hbxbp_just( QObject():new() )
hbxbp_just( QPaintDevice():new() )
hbxbp_just( QPageSetupDialog():new() )
hbxbp_just( QPainter():new() )
hbxbp_just( QPaintEvent():new() )
hbxbp_just( QPalette():new() )
hbxbp_just( QPen():new() )
hbxbp_just( QPicture():new() )
hbxbp_just( QPixmap():new() )
hbxbp_just( QPoint():new() )
hbxbp_just( QPointF():new() )
hbxbp_just( QPrintDialog():new() )
hbxbp_just( QPrintEngine():new() )
hbxbp_just( QPrinter():new() )
hbxbp_just( QPrintPreviewDialog():new() )
hbxbp_just( QProcess():new() )
hbxbp_just( QProgressBar():new() )
hbxbp_just( QProgressDialog():new() )
hbxbp_just( QPushButton():new() )
hbxbp_just( QRadialGradient():new() )
hbxbp_just( QRadioButton():new() )
hbxbp_just( QRect():new() )
hbxbp_just( QRectF():new() )
hbxbp_just( QRegion():new() )
hbxbp_just( QResizeEvent():new() )
hbxbp_just( QResource():new() )
hbxbp_just( QScrollArea():new() )
hbxbp_just( QScrollBar():new() )
hbxbp_just( QSignalMapper():new() )
hbxbp_just( QSize():new() )
hbxbp_just( QSizeF():new() )
hbxbp_just( QSizeGrip():new() )
hbxbp_just( QSizePolicy():new() )
hbxbp_just( QSlider():new() )
hbxbp_just( QSound():new() )
hbxbp_just( QSpacerItem():new() )
hbxbp_just( QSpinBox():new() )
hbxbp_just( QSplashScreen():new() )
hbxbp_just( QSplitter():new() )
hbxbp_just( QStandardItem():new() )
hbxbp_just( QStandardItemModel():new() )
hbxbp_just( QStatusBar():new() )
hbxbp_just( QStringList():new() )
hbxbp_just( QStringListModel():new() )
hbxbp_just( QSystemTrayIcon():new() )
hbxbp_just( QTabBar():new() )
hbxbp_just( QTableView():new() )
hbxbp_just( QTableWidget():new() )
hbxbp_just( QTableWidgetItem():new() )
hbxbp_just( QTabWidget():new() )
hbxbp_just( QTextBlock():new() )
hbxbp_just( QTextBlockFormat():new() )
hbxbp_just( QTextBlockGroup():new() )
hbxbp_just( QTextBrowser():new() )
hbxbp_just( QTextBoundaryFinder():new() )
hbxbp_just( QTextCharFormat():new() )
hbxbp_just( QTextCodec():new() )
hbxbp_just( QTextCursor():new() )
hbxbp_just( QTextDecoder():new() )
hbxbp_just( QTextDocument():new() )
hbxbp_just( QTextDocumentFragment():new() )
hbxbp_just( QTextDocumentWriter():new() )
hbxbp_just( QTextEdit():new() )
hbxbp_just( QTextFrame():new() )
hbxbp_just( QTextItem():new() )
hbxbp_just( QTextLayout():new() )
hbxbp_just( QTextLength():new() )
hbxbp_just( QTextLine():new() )
hbxbp_just( QTextObject():new() )
hbxbp_just( QTextStream():new() )
hbxbp_just( QTimeEdit():new() )
hbxbp_just( QTimer():new() )
hbxbp_just( QToolBar():new() )
hbxbp_just( QToolBox():new() )
hbxbp_just( QToolButton():new() )
hbxbp_just( QTreeView():new() )
hbxbp_just( QTreeWidget():new() )
hbxbp_just( QTreeWidgetItem():new() )
hbxbp_just( QUrl():new() )
hbxbp_just( QVariant():new() )
hbxbp_just( QVBoxLayout():new() )
hbxbp_just( QWheelEvent():new() )
hbxbp_just( QWidget():new() )
hbxbp_just( QWidgetItem():new() )
RETURN NIL
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/idesaveload.prg
View File

@@ -1492,7 +1492,7 @@ METHOD IdeSetup:execEvent( cEvent, p, p1 )
IF ( nRow := ::oUI:q_tableVar:currentRow() ) >= 0
HB_TRACE( HB_TR_DEBUG, "RECEIVING ENTER KEY" )
::oUI:q_tableVar:editItem( p )
hbide_justACall( nRow )
HB_SYMBOL_UNUSED( nRow )
#if 0
IF ::oUI:q_tableVar:currentColumn() == 0
::oUI:q_tableVar:setCurrentCell( ::oUI:q_tableVar:currentRow(), 1 )

2
harbour/contrib/hbide/ideshortcuts.prg
View File

@@ -757,7 +757,7 @@ METHOD IdeShortcuts:evalMacro( cString )
eval( bBlock, self )
lEvaluated := .t.
RECOVER USING oErr
hbide_justACall( oErr:description )
HB_SYMBOL_UNUSED( oErr )
END SEQUENCE
ErrorBlock( bError )

5
harbour/contrib/hbxbp/xbpgeneric.prg
View File

@@ -417,11 +417,6 @@ FUNCTION hbxbp_ConvertAFactFromXBP( cMode, xValue )
/*----------------------------------------------------------------------*/
FUNCTION hbxbp_Just()
RETURN nil
/*----------------------------------------------------------------------*/
FUNCTION HbXbp_SetCodec( cCodec )
IF !empty( cCodec )
hbqt_SetCodecForCStrings( cCodec )

119
harbour/contrib/make.hbs
View File

@@ -86,8 +86,6 @@ PROCEDURE Main( ... )
s_cBinDir := hb_DirBase()
#endif
// mk_extern_core()
/* Load list of projects */
hProjectList := { => }
@@ -440,7 +438,7 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
/* Create EXTERN list */
IF lPrimary .AND. hProjectList[ cProject ][ "cType" ] $ "hblib|hbdyn"
mk_extern_lib( hProjectList[ cProject ][ "cOutputName" ], FNameExtSet( cProjectPath, ".hbx" ) )
mk_extern_lib( hProjectList[ cProject ][ "cOutputName" ], FNameExtSet( PathSepToSelf( cProjectPath ), ".hbx" ) )
ENDIF
ENDIF
NEXT
@@ -557,54 +555,13 @@ STATIC FUNCTION mk_hb_processRun( cCommand, ... )
RETURN hb_processRun( cCommand, ... )
STATIC FUNCTION mk_extern_core()
LOCAL aExtern
LOCAL aSCALAR
LOCAL aCODEPAGE
LOCAL aLANG
LOCAL aUSRRDD
LOCAL aMain
LOCAL tmp
IF GetEnv( "HB_REBUILD_EXTERN" ) == "yes" .AND. ;
! Empty( GetEnv( "HB_DYNLIB_ST" ) )
IF ( aExtern := __hb_extern_get_list( GetEnv( "HB_DYNLIB_DIR" ) + hb_ps() + GetEnv( "HB_DYNLIB_ST" ) + GetEnv( "HB_DYNLIB_EXT" ) ) ) != NIL
aSCALAR := {}
aCODEPAGE := {}
aLANG := {}
aUSRRDD := {}
aMain := {}
FOR EACH tmp IN aExtern
DO CASE
CASE "|" + tmp $ "|HBARRAY|HBBLOCK|HBCHARACTER|HBDATE|HBTIMESTAMP|HBLOGICAL|HBNIL|HBNUMERIC" ; AAdd( aSCALAR, tmp )
CASE Left( tmp, Len( "HB_CODEPAGE_" ) ) == "HB_CODEPAGE_" ; AAdd( aCODEPAGE, tmp )
CASE Left( tmp, Len( "HB_LANG_" ) ) == "HB_LANG_" ; AAdd( aLANG , tmp )
CASE Left( tmp, Len( "UR_SUPER_" ) ) == "UR_SUPER_" ; AAdd( aUSRRDD , tmp )
OTHERWISE ; AAdd( aMain , tmp )
ENDCASE
NEXT
__hb_extern_gen( aSCALAR , "hbextsca.ch", .F. )
__hb_extern_gen( aCODEPAGE, "hbextcdp.ch", .F. )
__hb_extern_gen( aLANG , "hbextlng.ch", .F. )
__hb_extern_gen( aUSRRDD , "hbextudd.ch", .F. )
__hb_extern_gen( aMain , "hbextern.ch", .F. )
RETURN .T.
ENDIF
ENDIF
RETURN .F.
STATIC FUNCTION mk_extern_lib( cInputName, cOutputName )
LOCAL aExtern
IF GetEnv( "HB_REBUILD_EXTERN" ) == "yes"
OutStd( hb_StrFormat( "! Generating extern header: %1$s", cOutputName ) + hb_eol() )
IF ( aExtern := __hb_extern_get_list( cInputName ) ) != NIL
RETURN __hb_extern_gen( aExtern, cOutputName, .T. )
ENDIF
@@ -612,65 +569,6 @@ STATIC FUNCTION mk_extern_lib( cInputName, cOutputName )
RETURN .F.
STATIC FUNCTION __hb_extern_get_list( cInputName )
LOCAL cStdOut
LOCAL hRegex
LOCAL aResult
LOCAL aExtern
LOCAL tmp
IF GetEnv( "HB_COMPILER" ) $ "gcc|mingw|mingw64|cygwin"
IF hb_processRun( "nm -g --defined-only -C " + cInputName,, @cStdOut ) == 0
IF ! Empty( hRegex := hb_regexComp( '[[:blank:]]HB_FUN_(.*)[[:space:]]', .T., .T. ) )
aResult := hb_regexAll( hRegex, StrTran( cStdOut, Chr( 13 ) ),,,,, .T. )
aExtern := {}
FOR EACH tmp IN aResult
AAdd( aExtern, tmp[ 2 ] )
NEXT
ASort( aExtern,,, {| tmp, tmp1 | tmp < tmp1 } )
RETURN aExtern
ENDIF
ENDIF
ENDIF
RETURN NIL
STATIC FUNCTION __hb_extern_gen( aExtern, cOutputName, lANNOUNCE )
LOCAL cExtern
LOCAL tmp
IF Empty( aExtern )
RETURN FErase( cOutputName ) == 0
ENDIF
cExtern := "/*" + hb_eol()
cExtern += " * $" + "Id" + "$" + hb_eol()
cExtern += " */" + hb_eol()
cExtern += hb_eol()
cExtern += "/* -------------------------------------------------------------------- */" + hb_eol()
cExtern += "/* WARNING: Automatically generated code. DO NOT EDIT! */" + hb_eol()
cExtern += "/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */" + hb_eol()
cExtern += "/* compiler family. */" + hb_eol()
cExtern += "/* -------------------------------------------------------------------- */" + hb_eol()
cExtern += hb_eol()
cExtern += "#ifndef " + "__HBEXTERN__" + Upper( FNameNameGet( cOutputName ) ) + "__" + hb_eol()
cExtern += "#define " + "__HBEXTERN__" + Upper( FNameNameGet( cOutputName ) ) + "__" + hb_eol()
IF lANNOUNCE
cExtern += hb_eol()
cExtern += "ANNOUNCE " + "__" + Upper( FNameNameGet( cOutputName ) ) + "_EXTERN__" + hb_eol()
ENDIF
cExtern += hb_eol()
FOR EACH tmp IN aExtern
IF ! hb_WildMatch( "HB_GT_*_DEFAULT", tmp ) .AND. ;
! hb_WildMatch( "__*_EXTERN__", tmp )
cExtern += "EXTERNAL " + tmp + hb_eol()
ENDIF
NEXT
cExtern += hb_eol()
cExtern += "#endif" + hb_eol()
RETURN hb_MemoWrit( cOutputName, cExtern )
STATIC FUNCTION mk_hbd( cDir )
LOCAL cName
LOCAL tmp
@@ -708,13 +606,6 @@ STATIC FUNCTION mk_hbd( cDir )
STATIC FUNCTION AScanL( aArray, cString )
RETURN AScan( aArray, {| tmp | Lower( tmp ) == cString } )
STATIC FUNCTION FNameNameGet( cFileName )
LOCAL cName
hb_FNameSplit( cFileName,, @cName )
RETURN cName
STATIC FUNCTION FNameDirGet( cFileName )
LOCAL cDir
@@ -972,3 +863,5 @@ PROCEDURE LoadProjectListFromString( hProjectList, cString )
NEXT
RETURN
#include "../config/hbextern.hbs"

60
harbour/include/hbextcdp.ch
View File

@@ -2,58 +2,15 @@
* $Id$
*/
/*
* Harbour Project source code:
* All HB_CODEPAGE_* externals.
*
* Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
/* -------------------------------------------------------------------- */
/* WARNING: Automatically generated code. DO NOT EDIT! */
/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */
/* compiler family. */
/* -------------------------------------------------------------------- */
#ifndef HB_EXTCDP_CH_
#define HB_EXTCDP_CH_
#ifndef __HBEXTERN__HBEXTCDP__
#define __HBEXTERN__HBEXTCDP__
/* Codepage support */
EXTERNAL HB_CODEPAGE_BG866
EXTERNAL HB_CODEPAGE_BGISO
EXTERNAL HB_CODEPAGE_BGMIK
@@ -76,6 +33,7 @@ EXTERNAL HB_CODEPAGE_ES850
EXTERNAL HB_CODEPAGE_ES850C
EXTERNAL HB_CODEPAGE_ES850M
EXTERNAL HB_CODEPAGE_ESISO
EXTERNAL HB_CODEPAGE_ESMWIN
EXTERNAL HB_CODEPAGE_ESWIN
EXTERNAL HB_CODEPAGE_FI850
EXTERNAL HB_CODEPAGE_FR850
@@ -138,4 +96,4 @@ EXTERNAL HB_CODEPAGE_UA1251
EXTERNAL HB_CODEPAGE_UA866
EXTERNAL HB_CODEPAGE_UAKOI8
#endif /* HB_EXTCDP_CH_ */
#endif

2509
harbour/include/hbextern.ch
View File

File diff suppressed because it is too large Load Diff

63
harbour/include/hbextlng.ch
View File

@@ -1,59 +1,15 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* All HB_LANG_* externals.
*
* Copyright 2009 April White <april users.sourceforge.net>
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#ifndef HB_EXTLNG_CH_
#define HB_EXTLNG_CH_
/* -------------------------------------------------------------------- */
/* WARNING: Automatically generated code. DO NOT EDIT! */
/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */
/* compiler family. */
/* -------------------------------------------------------------------- */
/* lang support */
#ifndef __HBEXTERN__HBEXTLNG__
#define __HBEXTERN__HBEXTLNG__
EXTERNAL HB_LANG_BE866
EXTERNAL HB_LANG_BEWIN
@@ -70,6 +26,7 @@ EXTERNAL HB_LANG_DE
EXTERNAL HB_LANG_DEWIN
EXTERNAL HB_LANG_EL
EXTERNAL HB_LANG_ELWIN
EXTERNAL HB_LANG_EN
EXTERNAL HB_LANG_EO
EXTERNAL HB_LANG_ES
EXTERNAL HB_LANG_ESWIN
@@ -122,6 +79,4 @@ EXTERNAL HB_LANG_UAWIN
EXTERNAL HB_LANG_ZHB5
EXTERNAL HB_LANG_ZHGB
/* End of lang support */
#endif /* HB_EXTLNG_CH_ */
#endif

60
harbour/include/hbextsca.ch
View File

@@ -2,64 +2,22 @@
* $Id$
*/
/*
* Harbour Project source code:
* Scalar classes
*
* Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
/* -------------------------------------------------------------------- */
/* WARNING: Automatically generated code. DO NOT EDIT! */
/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */
/* compiler family. */
/* -------------------------------------------------------------------- */
#ifndef HB_EXTSCA_CH_
#define HB_EXTSCA_CH_
#ifndef __HBEXTERN__HBEXTSCA__
#define __HBEXTERN__HBEXTSCA__
EXTERNAL HBARRAY
EXTERNAL HBBLOCK
EXTERNAL HBCHARACTER
EXTERNAL HBDATE
EXTERNAL HBTIMESTAMP
EXTERNAL HBLOGICAL
EXTERNAL HBNIL
EXTERNAL HBNUMERIC
EXTERNAL HBTIMESTAMP
#endif /* HB_EXTSCA_CH_ */
#endif

204
harbour/include/hbextudd.ch
View File

@@ -2,146 +2,104 @@
* $Id$
*/
/*
* Harbour Project source code:
* The declarations for User RDD functions.
*
* Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
/* -------------------------------------------------------------------- */
/* WARNING: Automatically generated code. DO NOT EDIT! */
/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */
/* compiler family. */
/* -------------------------------------------------------------------- */
#ifndef HB_EXTURS_CH_
#define HB_EXTURS_CH_
#ifndef __HBEXTERN__HBEXTUDD__
#define __HBEXTERN__HBEXTUDD__
/* User RDD functions */
EXTERNAL UR_SUPER_BOF
EXTERNAL UR_SUPER_EOF
EXTERNAL UR_SUPER_FOUND
EXTERNAL UR_SUPER_GOBOTTOM
EXTERNAL UR_SUPER_GOTOP
EXTERNAL UR_SUPER_GOTO
EXTERNAL UR_SUPER_GOTOID
EXTERNAL UR_SUPER_SEEK
EXTERNAL UR_SUPER_SKIP
EXTERNAL UR_SUPER_SKIPFILTER
EXTERNAL UR_SUPER_SKIPRAW
EXTERNAL UR_SUPER_DELETED
EXTERNAL UR_SUPER_ADDFIELD
EXTERNAL UR_SUPER_FIELDDISPLAY
EXTERNAL UR_SUPER_FIELDNAME
EXTERNAL UR_SUPER_APPEND
EXTERNAL UR_SUPER_DELETE
EXTERNAL UR_SUPER_RECALL
EXTERNAL UR_SUPER_FIELDCOUNT
EXTERNAL UR_SUPER_FLUSH
EXTERNAL UR_SUPER_GOCOLD
EXTERNAL UR_SUPER_GOHOT
EXTERNAL UR_SUPER_PUTREC
EXTERNAL UR_SUPER_GETREC
EXTERNAL UR_SUPER_GETVALUE
EXTERNAL UR_SUPER_PUTVALUE
EXTERNAL UR_SUPER_GETVARLEN
EXTERNAL UR_SUPER_RECCOUNT
EXTERNAL UR_SUPER_RECINFO
EXTERNAL UR_SUPER_RECNO
EXTERNAL UR_SUPER_RECID
EXTERNAL UR_SUPER_FIELDINFO
EXTERNAL UR_SUPER_CREATEFIELDS
EXTERNAL UR_SUPER_SETFIELDEXTENT
EXTERNAL UR_SUPER_ALIAS
EXTERNAL UR_SUPER_CLOSE
EXTERNAL UR_SUPER_CREATE
EXTERNAL UR_SUPER_OPEN
EXTERNAL UR_SUPER_INFO
EXTERNAL UR_SUPER_DBEVAL
EXTERNAL UR_SUPER_PACK
EXTERNAL UR_SUPER_PACKREC
EXTERNAL UR_SUPER_SORT
EXTERNAL UR_SUPER_TRANS
EXTERNAL UR_SUPER_TRANSREC
EXTERNAL UR_SUPER_ZAP
EXTERNAL UR_SUPER_APPEND
EXTERNAL UR_SUPER_BOF
EXTERNAL UR_SUPER_CHILDEND
EXTERNAL UR_SUPER_CHILDSTART
EXTERNAL UR_SUPER_CHILDSYNC
EXTERNAL UR_SUPER_SYNCCHILDREN
EXTERNAL UR_SUPER_CLEARFILTER
EXTERNAL UR_SUPER_CLEARLOCATE
EXTERNAL UR_SUPER_CLEARREL
EXTERNAL UR_SUPER_CLEARSCOPE
EXTERNAL UR_SUPER_CLOSE
EXTERNAL UR_SUPER_CLOSEMEMFILE
EXTERNAL UR_SUPER_COMPILE
EXTERNAL UR_SUPER_CREATE
EXTERNAL UR_SUPER_CREATEFIELDS
EXTERNAL UR_SUPER_CREATEMEMFILE
EXTERNAL UR_SUPER_DBEVAL
EXTERNAL UR_SUPER_DELETE
EXTERNAL UR_SUPER_DELETED
EXTERNAL UR_SUPER_DROP
EXTERNAL UR_SUPER_EOF
EXTERNAL UR_SUPER_ERROR
EXTERNAL UR_SUPER_EVALBLOCK
EXTERNAL UR_SUPER_EXISTS
EXTERNAL UR_SUPER_FIELDCOUNT
EXTERNAL UR_SUPER_FIELDDISPLAY
EXTERNAL UR_SUPER_FIELDINFO
EXTERNAL UR_SUPER_FIELDNAME
EXTERNAL UR_SUPER_FILTERTEXT
EXTERNAL UR_SUPER_FLUSH
EXTERNAL UR_SUPER_FORCEREL
EXTERNAL UR_SUPER_RELAREA
EXTERNAL UR_SUPER_RELEVAL
EXTERNAL UR_SUPER_RELTEXT
EXTERNAL UR_SUPER_SETREL
EXTERNAL UR_SUPER_FOUND
EXTERNAL UR_SUPER_GETREC
EXTERNAL UR_SUPER_GETVALUE
EXTERNAL UR_SUPER_GETVALUEFILE
EXTERNAL UR_SUPER_GETVARLEN
EXTERNAL UR_SUPER_GOBOTTOM
EXTERNAL UR_SUPER_GOCOLD
EXTERNAL UR_SUPER_GOHOT
EXTERNAL UR_SUPER_GOTO
EXTERNAL UR_SUPER_GOTOID
EXTERNAL UR_SUPER_GOTOP
EXTERNAL UR_SUPER_INFO
EXTERNAL UR_SUPER_LOCATE
EXTERNAL UR_SUPER_LOCK
EXTERNAL UR_SUPER_OPEN
EXTERNAL UR_SUPER_OPENMEMFILE
EXTERNAL UR_SUPER_ORDCREATE
EXTERNAL UR_SUPER_ORDDESTROY
EXTERNAL UR_SUPER_ORDINFO
EXTERNAL UR_SUPER_ORDLSTADD
EXTERNAL UR_SUPER_ORDLSTCLEAR
EXTERNAL UR_SUPER_ORDLSTDELETE
EXTERNAL UR_SUPER_ORDLSTFOCUS
EXTERNAL UR_SUPER_ORDLSTREBUILD
EXTERNAL UR_SUPER_ORDSETCOND
EXTERNAL UR_SUPER_ORDCREATE
EXTERNAL UR_SUPER_ORDDESTROY
EXTERNAL UR_SUPER_ORDINFO
EXTERNAL UR_SUPER_CLEARFILTER
EXTERNAL UR_SUPER_CLEARLOCATE
EXTERNAL UR_SUPER_CLEARSCOPE
EXTERNAL UR_SUPER_FILTERTEXT
EXTERNAL UR_SUPER_PACK
EXTERNAL UR_SUPER_PACKREC
EXTERNAL UR_SUPER_PUTREC
EXTERNAL UR_SUPER_PUTVALUE
EXTERNAL UR_SUPER_PUTVALUEFILE
EXTERNAL UR_SUPER_RAWLOCK
EXTERNAL UR_SUPER_RDDINFO
EXTERNAL UR_SUPER_READDBHEADER
EXTERNAL UR_SUPER_RECALL
EXTERNAL UR_SUPER_RECCOUNT
EXTERNAL UR_SUPER_RECID
EXTERNAL UR_SUPER_RECINFO
EXTERNAL UR_SUPER_RECNO
EXTERNAL UR_SUPER_RELAREA
EXTERNAL UR_SUPER_RELEVAL
EXTERNAL UR_SUPER_RELTEXT
EXTERNAL UR_SUPER_RENAME
EXTERNAL UR_SUPER_SEEK
EXTERNAL UR_SUPER_SETFIELDEXTENT
EXTERNAL UR_SUPER_SETFILTER
EXTERNAL UR_SUPER_SETLOCATE
EXTERNAL UR_SUPER_LOCATE
EXTERNAL UR_SUPER_COMPILE
EXTERNAL UR_SUPER_ERROR
EXTERNAL UR_SUPER_EVALBLOCK
EXTERNAL UR_SUPER_RAWLOCK
EXTERNAL UR_SUPER_LOCK
EXTERNAL UR_SUPER_SETREL
EXTERNAL UR_SUPER_SKIP
EXTERNAL UR_SUPER_SKIPFILTER
EXTERNAL UR_SUPER_SKIPRAW
EXTERNAL UR_SUPER_SORT
EXTERNAL UR_SUPER_SYNCCHILDREN
EXTERNAL UR_SUPER_TRANS
EXTERNAL UR_SUPER_TRANSREC
EXTERNAL UR_SUPER_UNLOCK
EXTERNAL UR_SUPER_CLOSEMEMFILE
EXTERNAL UR_SUPER_CREATEMEMFILE
EXTERNAL UR_SUPER_OPENMEMFILE
EXTERNAL UR_SUPER_GETVALUEFILE
EXTERNAL UR_SUPER_PUTVALUEFILE
EXTERNAL UR_SUPER_READDBHEADER
EXTERNAL UR_SUPER_WRITEBHEADER
EXTERNAL UR_SUPER_WRITEDBHEADER
EXTERNAL UR_SUPER_DROP
EXTERNAL UR_SUPER_EXISTS
EXTERNAL UR_SUPER_RENAME
EXTERNAL UR_SUPER_RDDINFO
EXTERNAL UR_SUPER_ZAP
#endif /* HB_EXTURS_CH_ */
#endif

9
harbour/utils/hbrun/hbrun.prg
View File

@@ -137,7 +137,7 @@ PROCEDURE _APPMAIN( cFile, ... )
CASE ".prg"
CASE ".hbs"
cFile := HB_COMPILEBUF( HB_ARGV( 0 ), "-n2", "-w", "-es2", "-q0", ;
s_aIncDir, "-D" + "__HBSCRIPT__HBRUN", cFile )
s_aIncDir, "-I" + FNameDirGet( cFile ), "-D" + "__HBSCRIPT__HBRUN", cFile )
IF cFile == NIL
ERRORLEVEL( 1 )
ENDIF
@@ -155,6 +155,13 @@ PROCEDURE _APPMAIN( cFile, ... )
RETURN
STATIC FUNCTION FNameDirGet( cFileName )
LOCAL cDir
hb_FNameSplit( cFileName, @cDir )
RETURN cDir
/* Public hbrun API */
FUNCTION hbrun_DirBase()
RETURN s_cDirBase