From 53fb899fc10d808bd46e498ceb0a9d7129ea4b10 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 18 Sep 2009 13:13:32 +0000 Subject: [PATCH] 2009-09-18 15:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * doc/gmake.txt - source/vm/mainpm.c * config/os2/gcc.mk * examples/hbdoc/examples/core_es/dirstruc.txt - Deleted os2pm and mainpm references. It wasn't needed, so (with OS/2 users) we decided to delete it. --- harbour/ChangeLog | 8 ++ harbour/config/os2/gcc.mk | 23 ------ harbour/doc/gmake.txt | 15 ---- .../hbdoc/examples/core_es/dirstruc.txt | 3 - harbour/source/vm/mainpm.c | 79 ------------------- 5 files changed, 8 insertions(+), 120 deletions(-) delete mode 100644 harbour/source/vm/mainpm.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 173cb7254e..2a79a8c5e3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-18 15:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * doc/gmake.txt + - source/vm/mainpm.c + * config/os2/gcc.mk + * examples/hbdoc/examples/core_es/dirstruc.txt + - Deleted os2pm and mainpm references. It wasn't needed, so + (with OS/2 users) we decided to delete it. + 2009-09-18 14:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/os2/gcc.mk % Minor sync of internal libpath/liblist forming logic diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk index ac8a8fefbf..a95d5e122a 100644 --- a/harbour/config/os2/gcc.mk +++ b/harbour/config/os2/gcc.mk @@ -32,25 +32,10 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -ifeq ($(C_MAIN),) - ifeq ($(HB_GT_LIB),os2pm) - # If building a PM program, override the main object. - LDFLAGS += $(TOP)$(ROOT)source/vm/$(OBJ_DIR)/mainpm.o - endif -endif - SYSLIBS := SYSLIBPATHS := ifneq ($(HB_LINKING_RTL),) - ifeq ($(C_MAIN),) - ifeq ($(filter os2pm,$(HB_GT_LIB)),os2pm) - # Special handling for PM mode - LIBS += $(HB_GT_LIB) - LIBS += gtos2 - endif - endif - SYSLIBS += socket endif @@ -60,16 +45,8 @@ LD_OUT := -o$(subst x,x, ) LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib)) -# static linking with GCC 3.2.2 libc as not require its presence on user system LDFLAGS += $(LIBPATHS) -ifeq ($(C_MAIN),) - ifeq ($(HB_GT_LIB),os2pm) - # Override the default link rule in order to add a call to emxbind - LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$(BIN_DIR)/$@ $(^F) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) $(LDLIBS) & emxbind -ep $@ - endif -endif - # NOTE: The empty line directly before 'endef' HAVE TO exist! # It causes that every command will be separated by LF #define lib_object diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index fdbcfbe0df..168bd875db 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -201,21 +201,6 @@ For GCC on OS/2 for VIO mode: HB_COMPILER gcc HB_GT_LIB gtos2 -For GCC on OS/2 for PM mode: - Note: Harbour does not get built in PM mode, but Harbour programs do. - Note: You must point C_INCLUDE_PATH to the EMX include directory and - you must also point LIBRARY_PATH to the EMX library directory. - HB_PLATFORM os2 - HB_COMPILER gcc - HB_GT_LIB os2pm - -For IBM Visual Age C++ on OS/2 for PM mode: - Note: Harbour does not get built in PM mode, but Harbour programs do. - Note: You must create an empty unistd.h in the IBMCPP\INCLUDE directory. - HB_PLATFORM os2 - HB_COMPILER icc - HB_GT_LIB os2pm - For Borland C++ 5.5 HB_PLATFORM win HB_COMPILER bcc diff --git a/harbour/examples/hbdoc/examples/core_es/dirstruc.txt b/harbour/examples/hbdoc/examples/core_es/dirstruc.txt index 48287ed6e1..315b386f1c 100644 --- a/harbour/examples/hbdoc/examples/core_es/dirstruc.txt +++ b/harbour/examples/hbdoc/examples/core_es/dirstruc.txt @@ -87,9 +87,6 @@ busca de remover directorios vac | | | | | +---gtk - Implementaci¢n para entorno GTK+ | | | -| | +---os2pm - Implementaci¢n para OS/2 Presentation Manager -| | | -| | | | | +---tests - Programas de Testeo | | | | | +---hbgfwin - Implementaci¢n para entorno Windows diff --git a/harbour/source/vm/mainpm.c b/harbour/source/vm/mainpm.c deleted file mode 100644 index 1026ed12e6..0000000000 --- a/harbour/source/vm/mainpm.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * OS/2 Presentation Manager application entry point - * - * Copyright 2001 Maurilio Longo - * www - http://www.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. - * - */ - - -#define INCL_BASE -#define INCL_PM -#include - -#include "hbapi.h" -#include "hbvm.h" - - -int main( int argc, char * argv[] ) -{ - int iErrorCode; - HAB hab; /* Anchor Block handle */ - HMQ hmq; /* Message Queue handle */ - - hab = WinInitialize( 0 ); - hmq = WinCreateMsgQueue( hab, 0 ); - - hb_cmdargInit( argc, argv ); - hb_vmInit( TRUE ); - iErrorCode = hb_vmQuit(); - - WinDestroyMsgQueue( hmq ); - WinTerminate( hab ); - - return iErrorCode; -}