strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scp2: move python executables to AutoInstall

Browse source 
Change-Id: I94919f11150f39148219afc613ced99f74c539c0
This commit is contained in:
Michael Stahl 2014-10-28 22:40:39 +01:00
parent f4fac5eed2
commit 368729decb
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Repository.mk
View file

@ -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 \

2
scp2/AutoInstall.mk
View file

@ -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))

12
scp2/source/python/file_python.scp
View file

@ -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