From b76cb86eaa0aec1d02c5ff29c5a43e1e7a675b27 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Wed, 9 Sep 2009 09:38:41 +0000
Subject: CWS-TOOLING: integrate CWS mhu20 2009-09-01 15:18:43 +0200 mhu 
 r275662 : #i32526# Fixed missing includes, and a wrong cast 2009-08-28
 13:30:05 +0200 mhu  r275530 : #i32526# Fixed missing includes and remaining
 merge conflicts. 2009-08-28 13:28:45 +0200 mhu  r275529 : #i32526#
 osl_readLine() now implemented in sal/osl/<platform>/file.cxx 2009-08-26
 19:47:53 +0200 mhu  r275445 : CWS-TOOLING: rebase CWS mhu20 to trunk@275331
 (milestone: DEV300:m56) 2009-08-25 15:47:00 +0200 mhu  r275365 : #i32526#
 Also maintain phys. file offset. 2009-08-25 15:24:56 +0200 mhu  r275364 :
 #i32526# Added buffered file I/O; refactored file.cxx into multiple files.
 2009-08-24 10:38:15 +0200 mhu  r275294 : #i32526# Correct OpenFlags for
 osl_openFile(). 2009-05-25 11:07:34 +0200 mhu  r272225 : #i32526# Added
 support for non-seekable file handles (pipe et al.). 2009-05-25 11:01:50
 +0200 mhu  r272223 : #i32526# Add osl_readLine() test, cleanup obsolete
 tests. 2009-05-25 10:56:14 +0200 mhu  r272221 : #i32526# Add missing include
 2009-05-25 10:48:51 +0200 mhu  r272220 : #i32526# Accept OpenJDK (IcedTea6)
 1.6.0_0 version string 2009-05-15 19:18:20 +0200 mhu  r271965 : #i32526#
 Initial osl/unx buffered file I/O implementation. 2009-05-15 17:41:57 +0200
 mhu  r271959 : CWS-TOOLING: rebase CWS mhu20 to trunk@271830 (milestone:
 DEV300:m48) 2009-03-26 17:28:53 +0100 mhu  r270091 : CWS-TOOLING: rebase CWS
 mhu20 to trunk@270033 (milestone: DEV300:m45)

---
 sal/workben/makefile.mk | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'sal/workben/makefile.mk')

diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index 05afbbb223ea..5f20dd07bd4a 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -35,9 +35,10 @@ PRJNAME=sal
 TARGET=workben
 LIBTARGET=NO
 TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
+#ENABLE_EXCEPTIONS=TRUE
+NO_DEFAULT_STL=YES
 
-TESTAPP=test_osl_getVolInfo
+#TESTAPP=test_osl_getVolInfo
 #TESTAPP=test_osl_joinProcess
 #TESTAPP=getlocaleinfotest
 #TESTAPP=test_osl_joinProcess
@@ -45,6 +46,7 @@ TESTAPP=test_osl_getVolInfo
 #TESTAPP=salstattest
 #TESTAPP=saldyntest
 
+TESTAPP=t_readline
 #TESTAPP=t_cipher
 #TESTAPP=t_digest
 #TESTAPP=t_random
@@ -173,6 +175,23 @@ DEF1EXPORTFILE=export.exp
 
 .ENDIF # salstattest
 
+#
+# t_readline
+#
+.IF "$(TESTAPP)" == "t_readline"
+
+CFILES=		t_readline.c
+OBJFILES=	$(OBJ)$/t_readline.obj
+
+APP1TARGET=	t_readline
+APP1OBJS=	$(OBJFILES)
+APP1STDLIBS=$(SALLIB)
+APP1DEPN=	$(SLB)$/sal.lib
+
+APP1RPATH=UREBIN
+
+.ENDIF # t_readline
+
 #
 # t_cipher
 #
-- 
cgit