diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 12:16:35 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 12:16:35 +0000 |
| commit | e7447a56b35b06f5824928a64ba51192ede9900b (patch) | |
| tree | 47f5d7a7f57e9ac2178266c9fdf28c8a5ae6334e /scp2 | |
| parent | 98967e98c5bdc45cfb9a68df28bed806eea1f53d (diff) | |
INTEGRATION: CWS pythonupgrade (1.5.96); FILE MERGED
2004/09/30 21:10:58 jbu 1.5.96.1: #i32901# replaced version 2.2.2 with the defines from pyversion.mk, so that further python upgrades should be less difficult
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/python/makefile.mk | 10 | ||||
| -rw-r--r-- | scp2/source/python/module_python.scp | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk index 92081b16d506..576170bb591d 100644 --- a/scp2/source/python/makefile.mk +++ b/scp2/source/python/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: obo $ $Date: 2004-07-05 13:19:17 $ +# last change: $Author: obo $ $Date: 2004-11-15 13:16:17 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,6 +71,12 @@ TARGETTYPE=CUI # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : pyversion.mk + + +SCPDEFS+=\ + -DPYVERSION=$(PYVERSION) \ + -DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME) SCP_PRODUCT_TYPE=osl diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 7433f4fe0b75..85a0624a5af4 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -2,9 +2,9 @@ * * $RCSfile: module_python.scp,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2004-07-05 13:19:33 $ + * last change: $Author: obo $ $Date: 2004-11-15 13:16:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,8 +65,8 @@ Module gid_Module_Optional_Pyuno MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON ); ParentID = gid_Module_Optional; Procedures = (gid_Procedure_Python_Install); - Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Python_Sh,gid_File_Python_Dll,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll); + Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll); Minimal = NO; - Default = NO; + Default = YES; Styles = ( ); End |