Kaydet (Commit) 3f2ceb5a authored tarafından Kevin Hendricks's avatar Kevin Hendricks

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
üst 78bdf238
......@@ -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
......
# 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
#---------------------------------------------
......
......@@ -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 ------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment