diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-28 22:40:39 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-29 11:37:49 +0100 |
| commit | 368729decbf368161b0fed3be262c2bad840b6f6 (patch) | |
| tree | 993dd8bf9eb86fac598d44522deecb018289881f | |
| parent | f4fac5eed2b17782f0255127e837cb2f07253d92 (diff) | |
scp2: move python executables to AutoInstall
Change-Id: I94919f11150f39148219afc613ced99f74c539c0
| -rw-r--r-- | Repository.mk | 7 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 12 |
3 files changed, 10 insertions, 11 deletions
diff --git a/Repository.mk b/Repository.mk index b624d92ab8c0..f7f29a67b98a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -102,6 +102,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,crashrep, \ )) endif +$(eval $(call gb_Helper_register_executables_for_install,OOO,python, \ + $(if $(filter WNT,$(OS)), \ + python \ + ) \ +)) + ifneq ($(ENABLE_PDFIMPORT),) $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \ xpdfimport \ @@ -127,7 +133,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ $(if $(filter WNT,$(OS)), \ odbcconfig \ - python \ quickstart \ sbase \ scalc \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 1e492e1288b8..588df0163df1 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -27,7 +27,7 @@ $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) -$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE)) diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 247748a83f25..e5bebefc5279 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -43,18 +43,12 @@ End #ifndef SYSTEM_PYTHON -#if !defined MACOSX +#if !defined MACOSX && !defined WNT File gid_File_Py_Bin_Python BIN_FILE_BODY; -#ifdef WNT - Name = EXENAME(python); - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); -#else Name = "python_shell.filelist"; Dir = FILELIST_DIR; Styles = (FILELIST, PACKED); -#endif End #endif @@ -102,7 +96,7 @@ End // python_wrapper.exe File gid_File_Py_Bin_Python BIN_FILE_BODY; - Name = EXENAME(python); + Name = "python.exe"; Dir = gid_Brand_Dir_Program; Styles = (PACKED); End @@ -132,7 +126,7 @@ End File gid_File_Py_Python_Bin BIN_FILE_BODY; Dir = gid_Dir_Py_PythonCore_Bin; - Name = EXENAME(python); + Name = "python.exe"; Styles = (PACKED); End |