diff options
| author | Kevin Hendricks <khendricks@openoffice.org> | 2003-05-18 12:31:54 +0000 |
|---|---|---|
| committer | Kevin Hendricks <khendricks@openoffice.org> | 2003-05-18 12:31:54 +0000 |
| commit | 3f2ceb5ac237e09e5486a921805f752b9fef3daf (patch) | |
| tree | 4a291b25539d1a0f8853b77b4212bb3dd256ee6a /pyuno | |
| parent | 78bdf2385dcf3c7d97fc9dbec8115e3fae8bbc11 (diff) | |
fixes to pyuno to use the new component names,
update version of demo standalone version to 0.94
fix for tests to use the new component names
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/demo/makefile.mk | 6 | ||||
| -rw-r--r-- | pyuno/demo/pyunoenv.tcsh | 2 | ||||
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 30 |
3 files changed, 25 insertions, 13 deletions
diff --git a/pyuno/demo/makefile.mk b/pyuno/demo/makefile.mk index 89026de99b2a..8aef71f4a75d 100644 --- a/pyuno/demo/makefile.mk +++ b/pyuno/demo/makefile.mk @@ -4,7 +4,7 @@ PRJ=.. .INCLUDE : settings.mk .INCLUDE : pyversion.mk -VERSION=0.9.3 +VERSION=0.9.4 PYDIRNAME=python-$(PYVERSION) .IF "$(GUI)"=="WNT" INISUFFIX=.ini @@ -59,7 +59,7 @@ PYRUNTIME_DIRS=\ FILES=\ $(DESTROOT)$/program$/$(DLLPRE)pyuno$(DLLPOST) \ - $(DESTROOT)$/program$/$(DLLPRE)pythonloader.uno$(DLLPOST) \ + $(DESTROOT)$/program$/pythonloader.uno$(DLLPOST) \ $(DESTROOT)$/program$/pyuno$(INISUFFIX) \ $(DESTROOT)$/program$/uno.py \ $(DESTROOT)$/program$/unohelper.py \ @@ -140,7 +140,7 @@ $(DESTROOT)$/program$/pyuno_setup$(BATCHSUFFIX) : makefile.mk $(DESTROOT)$/program$/$(DLLPRE)python$(DLLPOST).$(PYVERSION) : $(SOLARLIBDIR)$/$(DLLPRE)python$(DLLPOST).$(PYVERSION) cp $? $@ -$(DESTROOT)$/program$/$(DLLPRE)pycpld$(DLLPOST) : $(DLLDEST)$/$(DLLPRE)pycpld$(DLLPOST) +$(DESTROOT)$/program$/pythonloader.uno$(DLLPOST) : $(DLLDEST)$/pythonloader.uno$(DLLPOST) cp $? $@ $(DESTROOT)$/program$/%.py : $(DLLDEST)$/%.py diff --git a/pyuno/demo/pyunoenv.tcsh b/pyuno/demo/pyunoenv.tcsh index 421c1bf39b0c..1a831996325f 100644 --- a/pyuno/demo/pyunoenv.tcsh +++ b/pyuno/demo/pyunoenv.tcsh @@ -1,5 +1,5 @@ # the path to the office installation (e.g. /home/joe/OpenOffice.org1.1Beta) -setenv OOOHOME +setenv OOOHOME /src4/OpenOffice.org1.1Beta2 # don't modify anything beyond these lines #--------------------------------------------- diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index 77cefb3aea5b..ebea109d941b 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: jbu $ $Date: 2003-04-06 17:15:52 $ +# last change: $Author: khendricks $ $Date: 2003-05-18 13:31:54 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,6 +66,9 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk + +DLLPRE = + .INCLUDE : pyversion.mk #------------------------------------------------------------------- @@ -97,14 +100,23 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) SLOFILES= $(SLO)$/pyuno_loader.obj +#COMPONENTS= \ +# tcv \ +# inv \ +# corefl \ +# insp \ +# invadp \ +# proxyfac \ +# pythonloader.uno \ + COMPONENTS= \ - tcv \ - inv \ - corefl \ - insp \ - invadp \ - proxyfac \ - pythonloader.uno \ + typeconverter.uno \ + invocation.uno \ + corereflection.uno \ + introspection.uno \ + invocadapt.uno \ + proxyfac.uno \ + pythonloader.uno # --- Targets ------------------------------------------------------ |