2012-10-08 00:31 UTC+0200 Viktor Szakats (harbour syenar.net)

* bin/commit.hb
    * made git detection generic
    ! fixed calling shell on OS/2

  * config/global.mk
    * minor sync with other parts of Harbour

  * contrib/hbblink/blinker.prg
    ! fixed SWPRUNCMD() on OS/2

  * contrib/hbxpp/runshell.prg
    ! fixed for RUNSHELL() on non-*nix platforms
This commit is contained in:
Viktor Szakats
2012-10-07 22:34:24 +00:00
parent f247467d11
commit 079551ba1d
5 changed files with 26 additions and 7 deletions

View File

@@ -16,6 +16,20 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-10-08 00:31 UTC+0200 Viktor Szakats (harbour syenar.net)
* bin/commit.hb
* made git detection generic
! fixed calling shell on OS/2
* config/global.mk
* minor sync with other parts of Harbour
* contrib/hbblink/blinker.prg
! fixed SWPRUNCMD() on OS/2
* contrib/hbxpp/runshell.prg
! fixed for RUNSHELL() on non-*nix platforms
2012-10-07 23:38 UTC+0200 Viktor Szakats (vszakats syenar.net)
* doc/Makefile
- doc/howtosvn.txt

View File

@@ -94,7 +94,8 @@ STATIC FUNCTION VCSDetect()
DO CASE
CASE hb_DirExists( ".svn" ) ; RETURN "svn"
CASE hb_DirExists( ".." + hb_ps() + ".git" ) ; RETURN "git"
CASE hb_DirExists( ".git" ) ; RETURN "git"
CASE hb_DirExists( ".." + hb_ps() + ".git" ) ; RETURN "git"
ENDCASE
RETURN ""
@@ -181,7 +182,7 @@ STATIC FUNCTION Shell()
#endif
IF ! Empty( cShell )
#if defined( __PLATFORM__WINDOWS ) .OR. defined( __PLATFORM__DOS )
#if ! defined( __PLATFORM__UNIX )
cShell := cShell + " /c"
#endif
ENDIF

View File

@@ -326,7 +326,7 @@ endif
CMDPREF :=
ifneq ($(HB_SHELL),sh)
ifneq ($(COMSPEC),)
CMDPREF := $(COMSPEC) /C
CMDPREF := $(COMSPEC) /c
endif
endif

View File

@@ -323,10 +323,10 @@ FUNCTION SWPRUNCMD( cCommand, nMem, cRunPath, cTempPath )
#endif
IF ! Empty( cShell )
#if defined( __PLATFORM__WINDOWS ) .OR. defined( __PLATFORM__DOS )
cCommand := cShell + " /c " + cCommand
#else
#if defined( __PLATFORM__UNIX )
cCommand := cShell + " " + cCommand
#else
cCommand := cShell + " /c " + cCommand
#endif
ENDIF

View File

@@ -81,7 +81,11 @@ FUNCTION RunShell( cCommand, cProgram, lAsync, lBackground )
ENDIF
IF HB_ISSTRING( cCommand )
cProgram += " " + cCommand
#if defined( __PLATFORM__UNIX )
cProgram += " " + cCommand
#else
cProgram += " /c " + cCommand
#endif
ENDIF
RETURN hb_processRun( LTrim( cProgram ), NIL, NIL, NIL, lAsync )