#87913# Now building a light basic without CreateUnoDialog() functionality

4 files changed, 97 insertions, 168 deletions

diff --git a/basic/prj/d.lst b/basic/prj/d.lst
index 55c535af156e..0076a04c4984 100644
--- a/basic/prj/d.lst
+++ b/basic/prj/d.lst
@@ -1,14 +1,19 @@
 touch: ..\%__SRC%\misc\basic.hid %_DEST%\bin%_EXT%\basic.hid
 ..\%__SRC%\lib\basic.lib %_DEST%\lib%_EXT%\basic.lib
+..\%__SRC%\lib\basicl.lib %_DEST%\lib%_EXT%\basicl.lib
 ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\slb\sb.lib %_DEST%\lib%_EXT%\xsb.lib
+..\%__SRC%\slb\sbl.lib %_DEST%\lib%_EXT%\xsbl.lib
 ..\%__SRC%\srs\classes.srs %_DEST%\res%_EXT%\basic.srs
 ..\%__SRC%\res\*.srs %_DEST%\res%_EXT%\*.srs
 ..\%__SRC%\bin\sb?????.dll %_DEST%\bin%_EXT%\sb?????.dll
 ..\%__SRC%\bin\sb?????.sym %_DEST%\bin%_EXT%\sb?????.sym
 ..\%__SRC%\misc\sb?????.map %_DEST%\bin%_EXT%\sb?????.map
+..\%__SRC%\bin\sbl?????.dll %_DEST%\bin%_EXT%\sbl?????.dll
+..\%__SRC%\bin\sbl?????.sym %_DEST%\bin%_EXT%\sbl?????.sym
+..\%__SRC%\misc\sbl?????.map %_DEST%\bin%_EXT%\sbl?????.map
 ..\%__SRC%\bin\testtool.exe %_DEST%\bin%_EXT%\testtool.exe
 ..\%__SRC%\bin\testtool %_DEST%\bin%_EXT%\testtool.bin
 ..\%__SRC%\bin\stt%UPD%49.res %_DEST%\bin%_EXT%\testtool.res
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index e756511f135d..81263e55e3b8 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: eventatt.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: ab $ $Date: 2001-06-13 10:38:27 $
+ *  last change: $Author: thb $ $Date: 2001-06-20 07:43:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -520,6 +520,7 @@ void SAL_CALL DialogEventAttacher::attachEvents
 
 void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 {
+#ifndef SVX_LIGHT
     Reference< XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory() );
     if( !xMSF.is() )
         return;
@@ -580,6 +581,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     aRetVal <<= xDlg;
     SbxVariableRef refVar = rPar.Get(0);
     unoToSbxValue( (SbxVariable*)refVar, aRetVal );
+#endif
 }
 
 
diff --git a/basic/source/classes/makefile.mk b/basic/source/classes/makefile.mk
index 33545b31f039..28e1ce1f09dc 100644
--- a/basic/source/classes/makefile.mk
+++ b/basic/source/classes/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-02 07:12:48 $
+#   last change: $Author: thb $ $Date: 2001-06-20 07:43:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,6 +64,7 @@ PRJ=..$/..
 
 PRJNAME=BASIC
 TARGET=classes
+LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------------
 
@@ -73,21 +74,34 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Allgemein -----------------------------------------------------------
 
-SLOFILES=	\
+COMMON_SLOFILES=	\
     $(SLO)$/sb.obj       \
     $(SLO)$/sbxmod.obj	\
     $(SLO)$/image.obj	\
     $(SLO)$/sbintern.obj	\
     $(SLO)$/sbunoobj.obj	\
-    $(SLO)$/eventatt.obj	\
     $(SLO)$/propacc.obj	\
     $(SLO)$/disas.obj
 
+SLOFILES=	$(COMMON_SLOFILES)	\
+    $(SLO)$/eventatt.obj
+
 OBJFILES=	\
     $(OBJ)$/sbintern.obj
 
 SRCFILES=	sb.src
 
+SECOND_BUILD=SVXLIGHT
+SVXLIGHT_SLOFILES=	$(SLO)$/eventatt.obj
+SVXLIGHTCDEFS+=-DSVX_LIGHT
+
+
+LIB1TARGET= $(SLB)$/$(TARGET).lib
+LIB1OBJFILES = $(SLOFILES)
+
+LIB2TARGET= $(SLB)$/$(TARGET)l.lib
+LIB2OBJFILES = $(REAL_SVXLIGHT_SLOFILES) $(COMMON_SLOFILES)
+
 # --- Targets -------------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk
index 7fc8e407a556..6f1d5b4e7548 100644
--- a/basic/util/makefile.mk
+++ b/basic/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: ab $ $Date: 2001-03-03 15:48:21 $
+#   last change: $Author: thb $ $Date: 2001-06-20 07:43:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -69,27 +69,10 @@ GEN_HID=TRUE
 
 # --- Settings ---------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
-
-.IF "$(GUI)"=="WIN"
-.IF "$(product)" != ""
-LINKFLAGS=$(LINKFLAGS) /NOPACKC
-.ENDIF
-.ENDIF
-
-.IF "$(depend)" == ""
 
 # --- Allgemein ---------------------------------------------------
 
-USE_LDUMP2=TRUE
-
-.IF "$(header)" == ""
-
-#SRSFILES=	$(SRS)$/app.srs $(SRS)$/testtool.srs
-
-
 LIB1TARGET=$(SLB)$/sb.lib
 LIB1FILES=		\
     $(SLB)$/basicmgr.lib   \
@@ -113,20 +96,14 @@ SHL1STDLIBS= \
             $(SVMEMLIB)	\
             $(COMPHELPERLIB) \
             $(UNOTOOLSLIB) \
+            $(SOTLIB) \
+            $(VOSLIB) \
             $(XMLSCRIPTLIB)
 
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=$(LIBCIMT)
+#SHL1STDLIBS+=$(LIBCIMT)
 .ENDIF
 
-.IF "$(SO3)" != ""
-SHL1STDLIBS+=\
-            $(SOTLIB) \
-            $(VOSLIB)
-.ENDIF
-
-
-
 .IF "$(GUI)" != "UNX"
 SHL1OBJS=	\
     $(SLO)$/sb.obj
@@ -142,10 +119,58 @@ DEF1DEPN	=	\
 DEFLIB1NAME	=sb
 DEF1DES		=StarBasic
 
+
+# Light basic
+
+LIB2TARGET=$(SLB)$/sbl.lib
+LIB2FILES=		\
+    $(SLB)$/basicmgr.lib   \
+    $(SLB)$/classesl.lib	 \
+    $(SLB)$/comp.lib 	 \
+    $(SLB)$/runtime.lib
+
+SHL2TARGET= sbl$(UPD)$(DLLPOSTFIX)
+SHL2IMPLIB= basicl
+
+SHL2STDLIBS= \
+            $(CPPULIB) \
+            $(CPPUHELPERLIB) \
+            $(TOOLSLIB) \
+            $(SVTOOLLIB) \
+            $(SVLLIB)	\
+            $(SVLIB) \
+            $(SJLIB) \
+            $(VOSLIB) \
+            $(SALLIB) \
+            $(SVMEMLIB)	\
+            $(SOTLIB) \
+            $(VOSLIB) \
+            $(COMPHELPERLIB) \
+            $(UNOTOOLSLIB)
+
+.IF "$(GUI)"=="WNT"
+#SHL2STDLIBS+=$(LIBCIMT)
+.ENDIF
+
+.IF "$(GUI)" != "UNX"
+SHL2OBJS=	\
+    $(SLO)$/sb.obj
+.ENDIF
+
+SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
+SHL2LIBS=	$(SLB)$/sbl.lib
+
+DEF2NAME	=$(SHL2TARGET)
+DEF2DEPN	=	\
+    $(MISC)$/$(SHL2TARGET).flt $(SLB)$/sbl.lib
+
+DEFLIB2NAME	=sbl
+DEF2DES		=StarBasic Light
+
+
 # --- SBASIC IDE --------------------------------------------------------
 
 APP1TARGET=$(PRJNAME)
-.IF "$(GUI)" != "MAC"
 APP1STDLIBS= \
             $(SALLIB) \
             $(TOOLSLIB) \
@@ -158,21 +183,13 @@ APP1STDLIBS= \
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
             $(SJLIB) \
+            $(SOTLIB) \
             $(VOSLIB) \
             $(SVMEMLIB)
+
 .IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
 APP1STDLIBS+=$(CPPULIB)
 .ENDIF
-.ELSE
-APP1STDLIBS= \
-            $(SOLARLIBDIR)$/SALMAIN.OBJ \
-            $(SOLARLIBDIR)$/NOSHAREDMAIN.LIB \
-            $(TOOLSLIB) \
-            $(SVTOOLLIB) \
-            $(SVLIB) \
-            $(SJLIB) \
-            $(SO2LIB)
-.ENDIF
 .IF "$(GUI)"=="UNX"
 APP1STDLIBS+= \
             $(VOSLIB) \
@@ -189,32 +206,15 @@ APP1STDLIBS+=	\
 .ENDIF
 
 
-.IF "$(SO3)" != ""
-APP1STDLIBS+=\
-            $(SOTLIB)
-.ENDIF
-
-.IF "$(GUI)" != "MAC"
 APP1DEPN=	$(L)$/itools.lib $(SVLIBDEPEND) $(LB)$/basic.lib $(LB)$/app.lib $(LB)$/sample.lib
-.ELSE
-APP1DEPN = $(APP1STDLIBS) $(APP1LIBS)
-MACRES = $(SV_RES)SV.R $(SV_RES)SV_DEMO.R $(SV_RES)SV_POWER.R
-.ENDIF
 
 APP1OBJS = $(OBJ)$/ttbasic.obj 
 
 .IF "$(GUI)" != "UNX"
 APP1OBJS+=	\
-            $(OBJ)$/app.obj
-
-.IF "$(COM)"!="ICC"
-APP1OBJS+=	\
+            $(OBJ)$/app.obj \
             $(SLO)$/sbintern.obj
 .ENDIF
-.ENDIF
-
-#APP1DEF=	$(MISC)$/$(PRJNAME).def
-#APP1RES=	$(RES)$/sb.res
 
 RES1TARGET=$(PRJNAME)
 SRS1FILES= \
@@ -228,103 +228,9 @@ RESLIB1SRSFILES= \
         $(SRS)$/app.srs \
         $(SRS)$/classes.srs
 
-# --- jstest ------------------------------------------------------
-
-#.IF "$(GUI)" != "MAC"
-
-#APP4TARGET=jstest
-#APP4STDLIBS= \
-#			$(TOOLSLIB) \
-#			$(SVTOOLLIB) \
-#			$(SVLIB) \
-#			$(SVMEMLIB) \
-#			$(SO2LIB)	\
-#			$(SALLIB) \
-#			$(ONELIB)	\
-#			$(LB)$/basic.lib
-
-#.IF "$(GUI)"=="UNX"
-#APP4STDLIBS+= \
-#			$(VOSLIB) $(SALLIB)
-#.ENDIF
-
-
-#APP4DEPN=\
-#		$(L)$/svtool.lib \
-#		$(L)$/itools.lib \
-#		$(SVLIBDEPEND) \
-#		$(OBJ)$/jstest.obj
-
-#APP4OBJS=		$(OBJ)$/jstest.obj
-
-#.ENDIF
-
 # --- Targets -----------------------------------------------------------
 
-ALL: $(LIB1TARGET)		   \
-     $(LB)$/basic.lib       \
-     ALLTAR
-
-
-#-------------------------------------------------------------------------
-#								Windows 3.x
-#-------------------------------------------------------------------------
-
-
-.IF "$(GUI)" == "WIN"
-
-LINKFLAGS+=/NOCV /IG
-LINK=$(DEVROOT)$/bin\optlinks\optlinks
-
-$(MISC)$/$(PRJNAME).def: makefile.mk
-    echo NAME		 BASIC											 >$@
-    echo DESCRIPTION 'StarBASIC DevSystem (C)1994 STAR DIVISION GmbH'>>$@
-    echo EXETYPE	 WINDOWS										 >>$@
-    echo PROTMODE													 >>$@
-    echo STUB		 'winSTUB.EXE'                                   >>$@
-    echo CODE		 LOADONCALL MOVEABLE							 >>$@
-    echo DATA		 PRELOAD MULTIPLE MOVEABLE						 >>$@
-    echo HEAPSIZE	 4096											 >>$@
-    echo STACKSIZE	 30000											 >>$@
-.ENDIF # GUI == WIN
-
-#-------------------------------------------------------------------------
-#								MAC
-#-------------------------------------------------------------------------
-
-.IF "$(GUI)" == "MAC"
-
-$(MISC)$/$(PRJNAME).def: makefile.mk
-    echo Kein def-File fuer Applikationen auf Mac
-.ENDIF # GUI == MAC
-
-#-------------------------------------------------------------------------
-#										OS/2
-#-------------------------------------------------------------------------
-
-.IF "$(GUI)" == "OS2"
-
-$(MISC)$/$(PRJNAME).def: makefile.mk
-.IF "$(COM)"!="WTC"
-    echo NAME		 BASIC WINDOWAPI								  >$@
-    echo DESCRIPTION 'StarBASIC DevSystem (C)1993 STAR DIVISION GmbH' >>$@
-    echo EXETYPE	 OS2											  >>$@
-    echo PROTMODE													  >>$@
-    echo STUB		 'OS2STUB.EXE'                                    >>$@
-    echo CODE		 LOADONCALL 									  >>$@
-    echo DATA		 PRELOAD MULTIPLE								  >>$@
-    echo HEAPSIZE	 4096											  >>$@
-    echo STACKSIZE	 30000											  >>$@
-.ELSE
-    @echo option DESCRIPTION 'StarBasic DLL'                           >$@
-    @echo name $(BIN)$/$(SHL1TARGET).dll                             >>$@
-#    @ldump -E1 -A -F$(MISC)$/$(SHL1TARGET).flt $(SLB)$/sb.lib    >>temp.def
-    @ldump -E1 -A -F$(MISC)$/$(SHL1TARGET).flt $(LIB1TARGET)    >>temp.def
-    @awk -f s:\util\exp.awk temp.def
-    del temp.def
-.ENDIF
-
-.ENDIF # GUI == OS2
+.INCLUDE :  target.mk
 
 #-------------------------------------------------------------------------
 #								Windows NT
@@ -347,17 +253,19 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo exception >> $@
     @echo bad_alloc >> $@
     @echo __CT >> $@
-.IF "$(GUI)"=="OS2"
-    @echo __alloc	>> $@
-    @echo __malloc	>> $@
-.ENDIF
-
-.ENDIF
-
-# ------------------------------------------------------------------------
-.ENDIF
 
-.INCLUDE :  target.mk
+$(MISC)$/$(SHL2TARGET).flt: makefile.mk
+    @echo ------------------------------
+    @echo Making: $@
+    @echo WEP > $@
+    @echo LIBMAIN >> $@
+    @echo LibMain >> $@
+    @echo Sbi >> $@
+    @echo SvRTL >> $@
+    @echo SbRtl_ >> $@
+    @echo exception >> $@
+    @echo bad_alloc >> $@
+    @echo __CT >> $@
 
 $(SRS)$/basic.srs:
     +$(TYPE) $(SRS)$/classes.srs + $(SRS)$/runtime.srs > $@