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

Merge https://github.com/harbour/core

Browse Source
This commit is contained in:
Viktor Szakats
2013-03-22 11:46:21 +01:00
parent 2464f85f17 3640917ad8
commit 28af20f1f0
12 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml Normal file
View File

@@ -0,0 +1,5 @@
language: c
compiler: gcc
script: make
before_install:
- sudo apt-get install -qq libmagic-dev

27
ChangeLog.txt
View File

@@ -10,6 +10,33 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-03-22 11:12 UTC+0100 Viktor Szakats (harbour syenar.net)
* README.txt
+ added link to automated build service page
2013-03-22 03:49 UTC+0100 Viktor Szakats (harbour syenar.net)
* README.txt
! expat installation examples deleted (it's hosted locally)
2013-03-22 02:26 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbnetio/utils/hbnetio/hbnetio.hbp
* contrib/hbwin/tests/dlg.prg
* contrib/hbnetio/utils/hbnetio/netiocon.prg -> contrib/hbnetio/utils/hbnetio/_console.prg
* contrib/hbnetio/utils/hbnetio/netiosvc.prg -> contrib/hbnetio/utils/hbnetio/_winsvc.prg
* contrib/hbnetio/utils/hbnetio/netiosrv.prg -> contrib/hbnetio/utils/hbnetio/hbnetio.prg
+ hbnetio made runnable as script
* minor cleanups
2013-03-22 01:52 UTC+0100 Viktor Szakats (harbour syenar.net)
* extras/guestbk/guestbk.hbp
* extras/guestbk/guestbk.prg
* extras/guestbk/inifiles.prg -> extras/guestbk/_inifile.prg
* extras/guestbk/cgi.prg -> extras/guestbk/_cgi.prg
+ guestbk made runnable as script
+ enabled -w3 warnings
! fixed to build with gtcgi
! fixed -w3 warnings
2013-03-21 19:00 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
+ when running a script with hbrun/hbmk2 form cmdline,

7
README.txt
View File

@@ -470,7 +470,6 @@ TABLE OF CONTENT
for contrib/hbcups lib: $ sudo apt-get install libcups2-dev
for contrib/hbcurl lib: $ sudo apt-get install libcurl4-openssl-dev OR
$ sudo apt-get install libcurl4-gnutls-dev
for contrib/hbexpat lib: $ sudo apt-get install libexpat1-dev
for contrib/hbfbird lib: $ sudo apt-get install firebird2.1-dev OR
$ sudo apt-get install libfirebird2.0-dev
for contrib/hbfimage lib: $ sudo apt-get install libfreeimage-dev
@@ -508,7 +507,6 @@ TABLE OF CONTENT
for contrib/hbcairo lib: cairo-devel
for contrib/hbcups lib: libcups2-devel
for contrib/hbcurl lib: curl-devel
for contrib/hbexpat lib: libexpat-devel
for contrib/hbfbird lib: firebird-devel
for contrib/hbfimage lib: freeimage-devel
for contrib/hbgd lib: gd-devel
@@ -1311,6 +1309,11 @@ TABLE OF CONTENT
Mac app: https://itunes.apple.com/us/app/committed/id560767719
Mac tool: https://github.com/marcocampana/git-notifier
5.) Build status and details
https://travis-ci.org/harbour/core
10. TROUBLESHOOTING
===================

0
contrib/hbnetio/utils/hbnetio/netiocon.prg → contrib/hbnetio/utils/hbnetio/_console.prg
View File

0
contrib/hbnetio/utils/hbnetio/netiosvc.prg → contrib/hbnetio/utils/hbnetio/_winsvc.prg
View File

7
contrib/hbnetio/utils/hbnetio/hbnetio.hbp
View File

@@ -2,13 +2,12 @@
hbnetio.hbc
-mt
-w3 -es2 -l-
-w3 -es2 -l
-o${hb_name}
netiosrv.prg
netiocon.prg
netiomgm.hb
hbnetio.prg
netiosvc.prg{win}
-main=WinMain{win}
hbwin.hbc{win}

13
contrib/hbnetio/utils/hbnetio/netiosrv.prg → contrib/hbnetio/utils/hbnetio/hbnetio.prg
View File

@@ -204,7 +204,9 @@ PROCEDURE netiosrv_Main( lUI, ... )
netiosrv[ _NETIOSRV_lRPC ] := .T.
CASE Lower( cParam ) == "--version"
RETURN
CASE Lower( cParam ) == "-help" .OR. ;
CASE Lower( cParam ) == "-?" .OR. ;
Lower( cParam ) == "-h" .OR. ;
Lower( cParam ) == "-help" .OR. ;
Lower( cParam ) == "--help"
HB_Usage()
RETURN
@@ -871,16 +873,19 @@ STATIC PROCEDURE HB_Usage()
OutStd( hb_StrFormat( " Default: %1$d", _NETIOMGM_PORT_DEF ) , hb_eol() )
OutStd( " -adminiface=<ipaddr> accept manegement connections on IPv4 interface <ipaddress>" , hb_eol() )
OutStd( hb_StrFormat( " Default: %1$s", _NETIOMGM_IPV4_DEF ) , hb_eol() )
OutStd( " -adminpass=<passwd> set remote management password" , hb_eol() )
OutStd( " -adminpass=<passwd> set remote management password and enable management server" , hb_eol() )
OutStd( hb_eol() )
OutStd( " -noui don't open interactive console" , hb_eol() )
OutStd( hb_eol() )
#if defined( __PLATFORM__WINDOWS )
#if ! defined( __HBSCRIPT__HBSHELL ) .AND. defined( __PLATFORM__WINDOWS )
OutStd( " -i install as service (requires admin rights)" , hb_eol() )
OutStd( " -u uninstall service (requires admin rights)" , hb_eol() )
OutStd( hb_eol() )
#endif
OutStd( " --version display version header only" , hb_eol() )
OutStd( " -help|--help this help" , hb_eol() )
OutStd( " -?|-h|-help|--help this help" , hb_eol() )
RETURN
SET PROCEDURE TO "_console.prg"
SET PROCEDURE TO "netiomgm.hb"

2
contrib/hbwin/tests/dlg.prg
View File

@@ -1,7 +1,7 @@
/*
* This example demonstrates how to work with some features of the native Win32
* API. The following function displays a dialog created with an external
* resource editor (Pelles C)
* resource editor.
* 2010-06-10 - 00:16:41 - [vailtom]
*/

20
extras/guestbk/cgi.prg → extras/guestbk/_cgi.prg
View File

@@ -124,7 +124,9 @@ METHOD AddPara( cPara, cAlign ) CLASS THTML
METHOD Generate() CLASS THTML
LOCAL cFile, i, hFile, nPos, cRes := ""
#if 0
LOCAL lFlag := .F.
#endif
// Is this a meta file or hand generated script?
IF Empty( ::cHTMLFile )
@@ -208,13 +210,13 @@ METHOD SaveToFile( cFile ) CLASS THTML
METHOD ProcessCGI() CLASS THTML
LOCAL cQuery := ""
LOCAL cBuff := ""
LOCAL nBuff := 0
LOCAL cQuery
LOCAL cBuff := ""
LOCAL nBuff := 0
LOCAL i
IF Empty( ::aCGIContents )
::aCGIContents := { ;
::aCGIContents := { ;
GetEnv( "SERVER_SOFTWARE" ), ;
GetEnv( "SERVER_NAME" ), ;
GetEnv( "GATEWAY_INTERFACE" ), ;
@@ -234,8 +236,7 @@ METHOD ProcessCGI() CLASS THTML
GetEnv( "AUTH_TYPE" ), ;
GetEnv( "CONTENT_TYPE" ), ;
GetEnv( "CONTENT_LENGTH" ), ;
GetEnv( "ANNOTATION_SERVER" ) ;
}
GetEnv( "ANNOTATION_SERVER" ) }
cQuery := ::GetCGIParam( CGI_QUERY_STRING )
@@ -247,8 +248,8 @@ METHOD ProcessCGI() CLASS THTML
IF i > Len( cQuery ) .OR. SubStr( cQuery, i, 1 ) == "&"
AAdd( ::aQueryFields, ;
{ SubStr( cBuff, 1, At( "=", cBuff ) - 1 ), ;
AAdd( ::aQueryFields, { ;
SubStr( cBuff, 1, At( "=", cBuff ) - 1 ), ;
StrTran( SubStr( cBuff, At( "=", cBuff ) + 1, ;
Len( cBuff ) - At( "=", cBuff ) + 1 ), "+", " " ) } )
cBuff := ""
@@ -264,11 +265,8 @@ METHOD ProcessCGI() CLASS THTML
nBuff--
ENDIF
ENDIF
NEXT
ENDIF
ENDIF
RETURN Self

0
extras/guestbk/inifiles.prg → extras/guestbk/_inifile.prg
View File

8
extras/guestbk/guestbk.hbp
View File

@@ -1,4 +1,8 @@
-w3 -es2
-nulrdd
-gtcgi
guestbk.prg
inifiles.prg
cgi.prg

4
extras/guestbk/guestbk.prg
View File

@@ -51,7 +51,6 @@ PROCEDURE Main()
LOCAL oIni := TIniFile():New( "C:\inetpub\wwwroot\guestbk.ini" )
LOCAL oHTML := THtml():New()
LOCAL aEntr := {}
LOCAL cOddColor, cEvenColor
LOCAL cCode, i, j, l, cField, nEntry, cColor
LOCAL aEntries, aLine, cLine
@@ -155,3 +154,6 @@ PROCEDURE Main()
ENDIF
RETURN
SET PROCEDURE TO "_cgi.prg"
SET PROCEDURE TO "_inifile.prg"