From 0338672fa711b1fb134d6cfc34e54f6a50e66f65 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 5 Jun 2010 12:26:00 +0000 Subject: [PATCH] 2010-06-05 14:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/postinst.prg ! Fixed to use platform native pathseps in few remaining places. * examples/uhttpd2/socket.c * examples/httpsrv/socket.c + Added copyright header. --- harbour/ChangeLog | 8 ++++++ harbour/config/postinst.prg | 8 +++--- harbour/examples/httpsrv/socket.c | 48 +++++++++++++++++++++++++++++++ harbour/examples/uhttpd2/socket.c | 48 +++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6a7988c393..96b78f6a5e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-06-05 14:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/postinst.prg + ! Fixed to use platform native pathseps in few remaining places. + + * examples/uhttpd2/socket.c + * examples/httpsrv/socket.c + + Added copyright header. + 2010-06-04 20:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * package/winuni/mpkg_win_uni.nsi * Version adjustment (-20 -> -21) diff --git a/harbour/config/postinst.prg b/harbour/config/postinst.prg index 721773ad01..bcdc874569 100644 --- a/harbour/config/postinst.prg +++ b/harbour/config/postinst.prg @@ -82,8 +82,8 @@ PROCEDURE Main() GetEnv( "HB_BUILD_IMPLIB" ) == "yes" .AND. ; ! Empty( GetEnv( "HB_HOST_BIN_DIR" ) ) - FOR EACH tmp IN PackageList( "contrib\*", GetEnv( "HB_CONTRIBLIBS" ), GetEnv( "HB_CONTRIB_ADDONS" ) ) - IF hb_FileExists( "contrib\" + tmp + "\" + tmp + ".hbi" ) + FOR EACH tmp IN PackageList( "contrib" + _PS_ + "*", GetEnv( "HB_CONTRIBLIBS" ), GetEnv( "HB_CONTRIB_ADDONS" ) ) + IF hb_FileExists( "contrib" + _PS_ + tmp + _PS_ + tmp + ".hbi" ) mk_hb_processRun( GetEnv( "HB_HOST_BIN_DIR" ) + _PS_ + "hbmk2" +; " -quiet -lang=en" +; " @contrib/" + tmp + "/" + tmp + ".hbi" +; @@ -130,11 +130,11 @@ PROCEDURE Main() OutStd( "! Making shared version of Harbour binaries..." + hb_osNewLine() ) - FOR EACH tmp IN Directory( "utils\*", "D" ) + FOR EACH tmp IN Directory( "utils" + _PS_ + "*", "D" ) IF "D" $ tmp[ F_ATTR ] .AND. ; !( tmp[ F_NAME ] == "." ) .AND. ; !( tmp[ F_NAME ] == ".." ) .AND. ; - hb_FileExists( "utils\" + tmp[ F_NAME ] + "\" + tmp[ F_NAME ] + ".hbp" ) + hb_FileExists( "utils" + _PS_ + tmp[ F_NAME ] + _PS_ + tmp[ F_NAME ] + ".hbp" ) mk_hb_processRun( GetEnv( "HB_HOST_BIN_DIR" ) + _PS_ + "hbmk2" +; " -quiet -lang=en -q0 -shared" + cOptions +; diff --git a/harbour/examples/httpsrv/socket.c b/harbour/examples/httpsrv/socket.c index b83daee8d4..9102eff881 100644 --- a/harbour/examples/httpsrv/socket.c +++ b/harbour/examples/httpsrv/socket.c @@ -2,6 +2,54 @@ * $Id$ */ +/* + * Harbour Project source code: + * socket API + * + * Copyright 2009 Przemyslaw Czerpak + * 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. + * + */ + /* Function naming: diff --git a/harbour/examples/uhttpd2/socket.c b/harbour/examples/uhttpd2/socket.c index b83daee8d4..9102eff881 100644 --- a/harbour/examples/uhttpd2/socket.c +++ b/harbour/examples/uhttpd2/socket.c @@ -2,6 +2,54 @@ * $Id$ */ +/* + * Harbour Project source code: + * socket API + * + * Copyright 2009 Przemyslaw Czerpak + * 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. + * + */ + /* Function naming: