Attachment 97731 Details for Bug 68111 – updated CBE patch

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

[patch] updated CBE patch

cbe-darwin-200804271000.diff (text/plain), 8.79 KB, created by Scott Cytacki

on 2008-04-27 13:25:31 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Cytacki

Created: 2008-04-27 13:25:31 EDT

Size: 8.79 KB

patch

obsolete

>Index: CommonBaseEvent/UnitTest/scripts/UT_CBE_Darwin.sh
>===================================================================
>RCS file: CommonBaseEvent/UnitTest/scripts/UT_CBE_Darwin.sh
>diff -N CommonBaseEvent/UnitTest/scripts/UT_CBE_Darwin.sh
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ CommonBaseEvent/UnitTest/scripts/UT_CBE_Darwin.sh	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,225 @@
>+#!/bin/sh
>+#
>+# File: UT_CBE_DarwinPPC.sh
>+#--------------------------------------------------------------------------
>+# This script is used for running Common Base Event native implementation
>+# unit/regression tests and the Sample.
>+#
>+# Usage: UT_CBE_DarwinPPC.sh [options]
>+# Options: 
>+#       -l  full path to the location of the library file libcbe.so; if not 
>+#           specified, the DYLD_LIBRARY_PATH and currently directory will be 
>+#           used as searching path
>+#       -a  full path to the locatin of the executables; if not specified, 
>+#           environment variable PATH and current directory will be used 
>+#           as the searching path
>+#       -o  output file name; if not specified, the default file name
>+#           'cbenative.uttest.out' will be used
>+#       -i  input file name for Sample; if not specified, the default file 
>+#           name sample.xml will be used
>+#       -s  output file name for Sample serialize; if not specified, the 
>+#           default file name serialized.xml will be used
>+#       -d  output file name for Sample deserialize; if not specified, the
>+#           default file name deserialized.xml will be used
>+#----------------------------------------------------------------------------
>+
>+USAGE="Usage: $0 [-l] [library path] [-a] [application path] [-o] [output filename] [-i] [sample input filename] [-s] [sample serialize output filename] [-d] [sample deserialize output filename]";
>+
>+LIB_FILE="libcbe.dylib"
>+LIB_FILE_EXIST="false"
>+
>+
>+#----------------------------------------------------------------------------
>+# Parse command line options
>+#----------------------------------------------------------------------------
>+
>+while getopts l:a:o:i:s:d: OPTION ; do
>+    case "$OPTION" in
>+        l) CBE_LIB_PATH="$OPTARG" ;;
>+        a) APP_PATH="$OPTARG" ;;
>+        o) OUTFILE="$OPTARG" ;;
>+        i) INFILE="$OPTARG" ;;
>+        s) SERIALIZE_FILE="$OPTARG" ;;
>+        d) DESERIALIZE_FILE="$OPTARG" ;;
>+       \?) echo "$USAGE" ;
>+           exit 1
>+           ;;
>+    esac
>+done
>+
>+#----------------------------------------------------------------------------
>+# Setup library path
>+#----------------------------------------------------------------------------
>+  
>+if [ -n "$CBE_LIB_PATH" -a -d "$CBE_LIB_PATH" ] ;              
>+then 
>+    DYLD_LIBRARY_PATH="$CBE_LIB_PATH:$DYLD_LIBRARY_PATH" ; 
>+else
>+    DYLD_LIBRARY_PATH=".:$DYLD_LIBRARY_PATH" ;                     
>+fi
>+
>+
>+#----------------------------------------------------------------------------
>+# Setup unit/regression tests executable path
>+#----------------------------------------------------------------------------
>+
>+if [ -n "$APP_PATH" -a -d "$APP_PATH" ] ;              
>+then 
>+    PATH="$APP_PATH:$PATH" ; 
>+else
>+    APP_PATH=.
>+    PATH="$APP_PATH:$PATH" ;                     
>+fi
>+
>+
>+#----------------------------------------------------------------------------
>+# Setup output file
>+# 
>+# The default output file name is cbenative.uttest.out; if a file with this
>+# name already exists, it will be renamed by attaching the timestamp to it
>+#----------------------------------------------------------------------------
>+ 
>+if [ -z "$OUTFILE" ] ;              
>+then 
>+    OUTFILE=cbenative.uttest.out 
>+fi
>+
>+if [ -f "$OUTFILE" ] ;
>+then
>+    mv "$OUTFILE" $OUTFILE.`date "+%Y%m%d.%H%M%S"` ;
>+fi
>+
>+export PATH
>+export DYLD_LIBRARY_PATH
>+
>+#----------------------------------------------------------------------------
>+# Check for existence of library file
>+#----------------------------------------------------------------------------
>+
>+OFS=${IFS}
>+
>+IFS=:
>+
>+for p in $DYLD_LIBRARY_PATH
>+do
>+   if [ -f $p/$LIB_FILE ]
>+   then
>+      LIB_FILE_EXIST="true" ; 
>+      break ;
>+    fi 
>+done
>+
>+
>+if [ "$LIB_FILE_EXIST" = "false" ]
>+then
>+    echo "Library file $LIB_FILE not found."
>+    exit 1 ;
>+fi
>+
>+
>+#---------------------------------------------------------------------------
>+# Check existence of test applications and run tests
>+#---------------------------------------------------------------------------
>+echo
>+echo "Working directory is: `pwd`" ;
>+echo "Output file is: $OUTFILE" ;
>+echo
>+
>+echo "Start Common Base Event Testing" >> $OUTFILE
>+
>+APP_EXISTS=false;
>+
>+
>+IFS=${OFS}
>+
>+APPLICATIONS="UTAssociatedEvent
>+              UTAssociationEngine
>+              UTComponentIdentification
>+              UTContextDataElement
>+              UTTemplateContentHandler
>+              UTEventFactory
>+              UTExtendedDataElement
>+              UTMsgDataElement
>+              UTSituation
>+              UTSituationType
>+              UTXMLUtility
>+              UTCommonBaseEvent
>+              UTEventFormatter"
>+
>+
>+for i in $APPLICATIONS
>+do
>+    IFS=: ;
>+    for s in $PATH
>+    do
>+        if [ -x $s/$i ]
>+        then
>+            APP_EXISTS=true;
>+            APP=$s/$i ;
>+            break ;
>+        fi
>+    done
>+    
>+    if [ "$APP_EXISTS" = "true" ]
>+    then 
>+        echo  "Run $i:" ;
>+        $APP > tmp.out
>+        more tmp.out | grep Total
>+        more tmp.out >> $OUTFILE         
>+        APP_EXISTS=false;
>+    else
>+        echo "File $i not found or not executable." ;
>+    fi
>+done
>+
>+rm tmp.out
>+
>+
>+
>+#--------------------------------------------------------------
>+# Run Sample
>+#--------------------------------------------------------------
>+
>+if [ -z "$INFILE" ]
>+then
>+    INFILE=sample.xml
>+fi
>+
>+if [ ! -f "$INFILE" ]
>+then
>+    echo Sample input file $INFILE not found.
>+    exit 1 ;
>+fi
>+
>+if [ -z "$SERIALIZE_FILE" ]
>+then
>+    SERIALIZE_FILE=serialized.xml
>+fi
>+
>+if [ -z "$DESERIALIZE_FILE" ]
>+then
>+    DESERIALIZE_FILE=deserialized.xml
>+fi
>+
>+SAMPLE_EXISTS=false
>+
>+for s in $PATH
>+do
>+    if [ -x $s/Sample ]
>+    then
>+        SAMPLE_EXISTS=true ;
>+    fi
>+done
>+
>+if [ "$SAMPLE_EXISTS" = "true" ]
>+then
>+    echo "Run Sample:" ;
>+    Sample -i $INFILE -os $SERIALIZE_FILE -od $DESERIALIZE_FILE | grep Total
>+else
>+    echo "File Sample not found or not executable." ;
>+fi
>+
>+IFS=${OFS}
>+
>+echo
>+echo "Done" ;
>Index: 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
>--- CommonBaseEvent/cImpl/CommonBaseEvent.h	6 Sep 2006 17:54:10 -0000	1.1
>+++ CommonBaseEvent/cImpl/CommonBaseEvent.h	27 Apr 2008 13:54:38 -0000
>@@ -67,8 +67,7 @@
> 
> #include <stdlib.h>
> 
>-
>-#if ! defined MVS && ! defined __OS400__
>+#if ! defined __APPLE__ && ! defined MVS && ! defined __OS400__
> #include <malloc.h>
> #endif
> 
>Index: 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
>--- CommonBaseEvent/include.common	6 Sep 2006 17:54:08 -0000	1.1
>+++ CommonBaseEvent/include.common	27 Apr 2008 13:54:38 -0000
>@@ -44,6 +44,13 @@
> 	DYNAMIC_EXT_LIB = so
> 	STATIC_EXT_LIB = a
> endif
>+ifeq ($(UNAME), Darwin)
>+	BUILD_PLATFORM = darwin
>+	JDK_PLATFORM = darwin
>+	# DYNAMIC_EXT_LIB = so
>+	DYNAMIC_EXT_LIB = dylib
>+	STATIC_EXT_LIB = a
>+endif
> ifeq ($(UNAME), OS/390)
> 	BUILD_PLATFORM = os390
> 	JDK_PLATFORM = os390
>Index: CommonBaseEvent/include.darwin
>===================================================================
>RCS file: CommonBaseEvent/include.darwin
>diff -N CommonBaseEvent/include.darwin
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ CommonBaseEvent/include.darwin	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,57 @@
>+#
>+# Global include for Darwin/PowerPC
>+#
>+CC = gcc 
>+CXX = g++
>+LINK = $(CC)
>+LINKCPP = $(CXX)
>+SHLIB_FLAG = -dynamiclib
>+CXX_AR=$(AR) cr
>+STLIB_FLAG =  -Xlinker -Bstatic 
>+
>+#
>+# Suppress association of suffix .c with suffix .y by stating new order of evaluation of suffixes
>+#
>+.SUFFIXES:
>+.SUFFIXES: .h .hpp .cpp .c .o
>+
>+#
>+# Make
>+#
>+MAKE = make
>+
>+#
>+# C flags
>+#
>+CFLAGS = -Os
>+CFLAGSEXE = $(CFLAGS)
>+
>+#
>+# C++ flags
>+#
>+CXXFLAGS = $(CFLAGS)
>+
>+#
>+# Linkedit flags
>+#
>+LINKFLAGS = -L$(SRC_IDIR)/packaging
>+DLLLINKFLAGS = $(SHLIB_FLAG) $(LINKFLAGS) 
>+EXELINKFLAGS = $(LINKFLAGS) -lcbe
>+
>+#
>+# Defines
>+#
>+DEFINES = -DSQLUNIX -DENW -DREENTRANT -D_REENTRANT
>+
>+#
>+# Link flags
>+#
>+CBE_FLAGS = $(DLLLINKFLAGS)
>+
>+ifdef STATIC_LINKING
>+    SAMPLE_STATIC_FLAGS = $(STLIB_FLAG)
>+    SAMPLE_STATIC_LIBS =
>+    SAMPLE_STATIC_STDLIB = -nostdlib -lstdc++ -lgcc -lgcc_eh
>+endif  # 
>+
>+SAMPLE_FLAGS = $(CFLAGSEXE) $(EXELINKFLAGS) $(DEP_LINKFLAGS)

Actions: View | Diff

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