2010-07-26 12:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbqt/tests/wvtqt.hbp
  * contrib/hbxbp/tests/wvtqt.hbp
    ! Added missing SVN header.
    % Cleanup.

  * INSTALL
  * contrib/hbpost.hbm
  * config/global.mk
    * Changed HB_BUILD_IMPLIB to HB_INSTALL_IMPLIB to reflect
      new meaning after recent changes. With new build system
      the implibs are always created in lib working dir, and
      this setting only controls whether to copy it to final
      install directory. The default is still 'no'. Setting it
      to yes is only recommended if the installation will be
      used in local environment (3rd party .dlls) only. IOW
      never set this to yes when creating a build for other
      users (f.e. for distribution).
      INCOMPATIBLE if you used this setting, pls change it now.

  * INSTALL
    + Documented HB_STATIC_* options.

  * contrib/make.hbs
    * Updated TODO list.

  * src/debug/debugger.prg
  * src/rtl/dirscan.prg
  * tests/wcecon.prg
  * contrib/xhb/traceprg.prg
  * contrib/hbqt/tests/wvtqt.hbp
  * contrib/hbqt/generator2/hbqtgen2.prg
  * contrib/hbxbp/tests/demoxbp.prg
  * contrib/hbxbp/tests/dialogqt.prg
  * contrib/hbxbp/tests/wvtqt.hbp
  * contrib/hbhpdf/tests/harupdf.prg
  * contrib/gtwvg/tests/wvgtbrowser.prg
  * contrib/gtwvg/tests/wvgwvtclasses.prg
  * contrib/hbtip/tests/dbtohtml.prg
  * contrib/hbtip/mail.prg
  * contrib/hbide/idemisc.prg
  * contrib/hbide/ideactions.prg
  * contrib/hbide/idetools.prg
  * contrib/hbide/idesources.prg
  * contrib/hbide/hbide.prg
  * examples/uhttpd2/umain.prg
  * examples/hbvpdf/tests/pdf_demo.prg
  * examples/httpsrv/uhttpd.prg
  * examples/httpsrv/cgifunc.prg
  * examples/httpsrv/modules/tableservletdb.prg
  * examples/httpsrv/session.prg
    * HB_OSPATHSEPARATOR() -> HB_PS()
    % Delete temp vars along the way.

  * utils/hbmk2/hbmk2.prg
    + Generalized internals for support for older Harbour and
      xhb versions.
    + Added -hb20 option. (thanks for asking for it so nicely ;)
This commit is contained in:
Viktor Szakats
2010-07-26 10:36:23 +00:00
parent c0cc1d5268
commit 46f7e48f29
31 changed files with 273 additions and 191 deletions

View File

@@ -128,8 +128,8 @@
#define LISTEN_PORT 8082 // differs from standard 80 port for tests in case
// anyone has a apache/IIS installed
#define FILE_STOP ".uhttpd.stop"
#define FILE_ACCESS_LOG "logs" + HB_OSPathSeparator() + "access.log"
#define FILE_ERROR_LOG "logs" + HB_OSPathSeparator() + "error.log"
#define FILE_ACCESS_LOG "logs" + hb_ps() + "access.log"
#define FILE_ERROR_LOG "logs" + hb_ps() + "error.log"
#define DIRECTORYINDEX_ARRAY { "index.html", "index.htm" }
#define PAGE_STATUS_REFRESH 5
@@ -235,7 +235,7 @@ FUNCTION MAIN( ... )
// defaults not changeble via ini file
lStop := FALSE
cConfig := EXE_Path() + hb_OSPathSeparator() + APP_NAME + ".ini"
cConfig := EXE_Path() + hb_ps() + APP_NAME + ".ini"
lConsole := TRUE
nStartServiceThreads := START_SERVICE_THREADS
@@ -1474,21 +1474,21 @@ STATIC FUNCTION CGIExec( cProc, /*@*/ cOutPut )
// No hIn, hErr == hOut
// save current directory
cCurPath := hb_CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir()
cCurPath := hb_CurDrive() + hb_osDriveSeparator() + hb_ps() + CurDir()
//hb_toOutDebug( "cCurPath: %s\n\r", cCurPath )
// Change dir to document root
DirChange( s_cDocumentRoot )
//hb_toOutDebug( "New Path: %s\n\r", hb_CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir() )
//hb_toOutDebug( "New Path: %s\n\r", hb_CurDrive() + hb_osDriveSeparator() + hb_ps() + CurDir() )
hProc := hb_processOpen( cProc, @hIn, @hOut, @hOut, .T. ) // .T. = Detached Process (Hide Window)
// return to original folder
DirChange( cCurPath )
//hb_toOutDebug( "New 2 Path: %s\n\r", hb_CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir() )
//hb_toOutDebug( "New 2 Path: %s\n\r", hb_CurDrive() + hb_osDriveSeparator() + hb_ps() + CurDir() )
IF hProc > -1
//hb_toOutDebug( "Process handler: %s\n\r", hProc )
@@ -1619,8 +1619,8 @@ STATIC FUNCTION CGIKill( hProc, hmtxCGIKill )
********************************************************************/
FUNCTION uhttpd_OSFileName( cFileName )
IF HB_OSPathSeparator() != "/"
RETURN STRTRAN( cFileName, "/", HB_OSPathSeparator() )
IF hb_ps() != "/"
RETURN STRTRAN( cFileName, "/", hb_ps() )
ENDIF
RETURN cFileName
@@ -2164,7 +2164,7 @@ STATIC PROCEDURE SysSettings()
STATIC FUNCTION Exe_Path()
LOCAL cPath := hb_argv( 0 )
LOCAL nPos := RAt( HB_OSPathSeparator(), cPath )
LOCAL nPos := RAt( hb_ps(), cPath )
IF nPos == 0
cPath := ""
ELSE
@@ -2174,7 +2174,7 @@ STATIC FUNCTION Exe_Path()
STATIC FUNCTION Exe_Name()
LOCAL cPrg := hb_argv( 0 )
LOCAL nPos := RAt( HB_OSPathSeparator(), cPrg )
LOCAL nPos := RAt( hb_ps(), cPrg )
IF nPos > 0
cPrg := SubStr( cPrg, nPos+1 )
ENDIF
@@ -2248,10 +2248,10 @@ STATIC FUNCTION ParseIni( cConfig )
"MAIN" => { ;
"PORT" => LISTEN_PORT ,;
"APPLICATION_ROOT" => EXE_Path() ,;
"DOCUMENT_ROOT" => EXE_Path() + HB_OSPathSeparator() + "home" ,;
"DOCUMENT_ROOT" => EXE_Path() + hb_ps() + "home" ,;
"SHOW_INDEXES" => FALSE ,;
"SCRIPTALIASMIXEDCASE" => TRUE ,;
"SESSIONPATH" => EXE_Path() + HB_OSPathSeparator() + "sessions" ,;
"SESSIONPATH" => EXE_Path() + hb_ps() + "sessions" ,;
"DIRECTORYINDEX" => DIRECTORYINDEX_ARRAY ,;
"CONSOLE-ROWS" => MaxRow() + 1 ,;
"CONSOLE-COLS" => MaxCol() + 1 ;
@@ -2673,7 +2673,7 @@ STATIC FUNCTION Handler_HrbScript( cFileName )
IF !EMPTY( pHRB := HB_HRBLOAD( cHRBBody ) )
// save current directory
cCurPath := hb_CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir()
cCurPath := hb_CurDrive() + hb_osDriveSeparator() + hb_ps() + CurDir()
// Change dir to document root
DirChange( s_cDocumentRoot )