Attachment 117489 Details for Bug 68111 – Patch for CBE 4.5 plugin

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Patch for CBE 4.5 plugin

cbe-patch-4.5.0.txt (text/plain), 2.88 KB, created by Paul Klicnik

on 2008-11-10 16:46:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Klicnik

Created: 2008-11-10 16:46:04 EST

Size: 2.88 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.logging.events
>Index: src.native/CommonBaseEvent/include.common
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.logging.events/src.native/CommonBaseEvent/include.common,v
>retrieving revision 1.1
>diff -u -r1.1 include.common
>--- src.native/CommonBaseEvent/include.common	6 Sep 2006 17:54:08 -0000	1.1
>+++ src.native/CommonBaseEvent/include.common	10 Nov 2008 20:00:47 -0000
>@@ -56,7 +56,13 @@
> 	DYNAMIC_EXT_LIB = so
> 	STATIC_EXT_LIB = a
> endif
>-
>+ifeq ($(UNAME), Darwin)
>+	BUILD_PLATFORM = darwin_ppc
>+	JDK_PLATFORM = darwin
>+#	DYNAMIC_EXT_LIB = so
>+	DYNAMIC_EXT_LIB = dylib
>+	STATIC_EXT_LIB = a
>+endif
> ifndef BUILD_PLATFORM
> 	error Unrecognized platform configuration
> endif
>Index: src.native/CommonBaseEvent/makefile
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.logging.events/src.native/CommonBaseEvent/makefile,v
>retrieving revision 1.1
>diff -u -r1.1 makefile
>--- src.native/CommonBaseEvent/makefile	6 Sep 2006 17:54:07 -0000	1.1
>+++ src.native/CommonBaseEvent/makefile	10 Nov 2008 20:00:47 -0000
>@@ -13,21 +13,6 @@
> 	
> all:
> 	$(MAKE) -f cImpl.mak
>-	$(MAKE) -f sample.mak
>-	
>-	$(MAKE) -f unitTest.mak NAME=UTAssociatedEvent
>-	$(MAKE) -f unitTest.mak NAME=UTAssociationEngine
>-	$(MAKE) -f unitTest.mak NAME=UTCommonBaseEvent
>-	$(MAKE) -f unitTest.mak NAME=UTComponentIdentification
>-	$(MAKE) -f unitTest.mak NAME=UTContextDataElement
>-	$(MAKE) -f unitTest.mak NAME=UTEventFormatter
>-	$(MAKE) -f unitTest.mak NAME=UTExtendedDataElement
>-	$(MAKE) -f unitTest.mak NAME=UTMsgDataElement
>-	$(MAKE) -f unitTest.mak NAME=UTSituation
>-	$(MAKE) -f unitTest.mak NAME=UTSituationType
>-	$(MAKE) -f unitTest.mak NAME=UTXMLUtility
>-	$(MAKE) -f unitTest.mak NAME=UTEventFactory
>-	$(MAKE) -f unitTest.mak NAME=UTTemplateContentHandler
> 	
> clean:
> 	$(MAKE) -f cImpl.mak clean
>@@ -75,4 +60,4 @@
> 	cd packaging;  zip -r ../cbe.$(BUILD_PLATFORM).zip *; cd ..
> 	cd sdk; zip -r ../cbe.$(BUILD_PLATFORM).sdk.zip *; cd ..
> 	cd ut; zip -r ../cbe.$(BUILD_PLATFORM).ut.zip *; cd .. 
>-	
>\ No newline at end of file
>+	
>Index: src.native/CommonBaseEvent/cImpl/CommonBaseEvent.h
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.logging.events/src.native/CommonBaseEvent/cImpl/CommonBaseEvent.h,v
>retrieving revision 1.1
>diff -u -r1.1 CommonBaseEvent.h
>--- src.native/CommonBaseEvent/cImpl/CommonBaseEvent.h	6 Sep 2006 17:54:10 -0000	1.1
>+++ src.native/CommonBaseEvent/cImpl/CommonBaseEvent.h	10 Nov 2008 20:00:47 -0000
>@@ -68,7 +68,7 @@
> #include <stdlib.h>
> 
> 
>-#if ! defined MVS && ! defined __OS400__
>+#if !defined __APPLE__ && ! defined MVS && ! defined __OS400__
> #include <malloc.h>
> #endif
>

Actions: View

Attachments on bug 68111: 55369 | 56192 | 87834 | 97731 | 117488 | 117489 | 136113 | 136140