Repository.mk | 6 +
instsetoo_native/CustomTarget_setup.mk | 21 ------
instsetoo_native/Package_setup.mk | 1
pyuno/CustomTarget_pyuno_pythonloader_ini.mk | 35 +++++++++++
pyuno/Module_pyuno.mk | 2
pyuno/Package_pyuno_pythonloader_ini.mk | 16 +++++
scp2/InstallModule_python.mk | 1
scp2/source/python/profileitem_python.scp | 83 ---------------------------
8 files changed, 59 insertions(+), 106 deletions(-)
New commits:
commit a756b783e3cdb9234a375014e91487ae84921170
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Nov 26 17:20:52 2014 +0100
Use Package_pyuno_pythonloader_ini for install
Change-Id: Ia4f06beea2e16b6a0235c87ae47cec8430cd1f40
diff --git a/Repository.mk b/Repository.mk
index 9078590..5476f89 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -840,6 +840,12 @@ $(eval $(call
gb_Helper_register_packages_for_install,writer_brand,\
))
endif # GUIBASE=unx
+ifneq ($(DISABLE_PYTHON),TRUE)
+$(eval $(call gb_Helper_register_packages_for_install,python, \
+ pyuno_pythonloader_ini \
+))
+endif
+
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index 68d23cf..30ca821 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -46,7 +46,6 @@ endif
$(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\
scp2/source/python/file_python \
scp2/source/python/file_python_librelogo \
- scp2/source/python/profileitem_python \
scp2/source/python/module_python \
))
diff --git a/scp2/source/python/profileitem_python.scp
b/scp2/source/python/profileitem_python.scp
deleted file mode 100644
index 29d33e8..0000000
--- a/scp2/source/python/profileitem_python.scp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-#ifndef DISABLE_PYUNO
-
-Profile gid_Profile_Pythonloader_Uno_Ini
- ModuleID = gid_Module_Pyuno;
- #ifdef UNX
- Name = "pythonloader.unorc";
- #else
- Name = "pythonloader.uno.ini";
- #endif
- Dir = GID_BRAND_DIR_ETC;
- Styles = (NETWORK);
-End
-
-#ifndef SYSTEM_PYTHON
-ProfileItem gid_Profileitem_Pythonloader_Pythonhome
- ProfileID = gid_Profile_Pythonloader_Uno_Ini;
- ModuleID = gid_Module_Pyuno;
- Section = "Bootstrap";
- Order = 1;
- Key = "PYUNO_LOADER_PYTHONHOME";
- #if defined MACOSX
- Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework";
- #else
- Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
- #endif
-End
-#endif
-
-ProfileItem gid_Profileitem_Pythonloader_Pythonpath
- ProfileID = gid_Profile_Pythonloader_Uno_Ini;
- ModuleID = gid_Module_Pyuno;
- Section = "Bootstrap";
- Order = 1;
- Key = "PYUNO_LOADER_PYTHONPATH";
- #if defined SYSTEM_PYTHON
- Value = "$ORIGIN";
- #elif defined MACOSX
- #define FRAMEWORKLIB
CONCAT2($ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
- Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
- /lib-dynload FRAMEWORKLIB,
- /lib-tk FRAMEWORKLIB,
- /site-packages $ORIGIN);
- #elif defined UNX
- Value = CONCAT9($ORIGIN/python-core-,PYVERSION,
- /lib $ORIGIN/python-core-,PYVERSION,
- /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
- /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
- /lib/site-packages $ORIGIN);
- #elif defined _gcc3
- Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION,
- /lib $ORIGIN/python-core-,PYVERSION,
- /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
- /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
- /lib/site-packages $ORIGIN));
- #else
- Value = STRING(CONCAT5($ORIGIN/python-core-,PYVERSION,
- /lib $ORIGIN/python-core-,PYVERSION,
- /lib/site-packages $ORIGIN));
- #endif
-End
-
-// DISABLE_PYUNO
-#endif
commit 004e515ba659edd8cd9c3d915c1c0722be7e252c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Nov 26 17:01:27 2014 +0100
Extract python-only pythonloader.uno ini-file into its own Package
Change-Id: Ifa9d12fa190f929807dc0dc7342e162aeb9a0576
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 40a8557..b34a516 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -13,7 +13,6 @@ $(eval $(call
gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
$(call gb_Helper_get_rcfile,louno) \
- $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
$(call gb_Helper_get_rcfile,setup) \
@@ -25,7 +24,6 @@ $(eval $(call
gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,bootstrap) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,fundamental) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,louno) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,pythonloader.uno) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,uno) \
: $(SRCDIR)/instsetoo_native/CustomTarget_setup.mk
@@ -87,25 +85,6 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'UNO_USER_PACKAGES_CACHE=$$UNO_USER_PACKAGES/cache' \
) > $@
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,pythonloader.uno) :
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- ( \
- printf '[Bootstrap]\n' && \
- $(if $(SYSTEM_PYTHON),, \
- printf 'PYUNO_LOADER_PYTHONHOME=%s\n' \
- $(if $(filter MACOSX,$(OS)), \
-
'$$ORIGIN/../Frameworks/LibreOfficePython.framework', \
-
'$$ORIGIN/python-core-$(PYTHON_VERSION)') &&) \
- printf 'PYUNO_LOADER_PYTHONPATH=%s$$ORIGIN\n' \
- $(if $(SYSTEM_PYTHON), \
- '', \
- $(if $(filter MACOSX,$(OS)), \
- '$(foreach dir,/ /lib-dynload /lib-tk
/site-packages,$(patsubst
%/,%,$$ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir)))
', \
- $(if $(filter WNTMSC,$(OS)$(COM)), \
- '$(foreach dir,/ /site-packages,$(patsubst
%/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ', \
- '$(foreach dir,/ /lib-dynload /lib-tk
/site-packages,$(patsubst
%/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) '))) \
- ) > $@
-
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,redirect) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
diff --git a/instsetoo_native/Package_setup.mk
b/instsetoo_native/Package_setup.mk
index 9bf5789..5b1e427 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -12,7 +12,6 @@ $(eval $(call
gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
- $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
$(call gb_Helper_get_rcfile,setup) \
diff --git a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
new file mode 100644
index 0000000..920a7a3
--- /dev/null
+++ b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,pyuno/pythonloader_ini))
+
+$(eval $(call gb_CustomTarget_register_targets,pyuno/pythonloader_ini, \
+ $(call gb_Helper_get_rcfile,pythonloader.uno) \
+))
+
+$(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)/$(call
gb_Helper_get_rcfile,pythonloader.uno): \
+ $(SRCDIR)/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( printf '[Bootstrap]\n' && \
+ $(if $(SYSTEM_PYTHON),, \
+ printf 'PYUNO_LOADER_PYTHONHOME=%s\n' \
+ $(if $(filter MACOSX,$(OS)), \
+ '$$ORIGIN/../Frameworks/LibreOfficePython.framework', \
+ '$$ORIGIN/python-core-$(PYTHON_VERSION)') &&) \
+ printf 'PYUNO_LOADER_PYTHONPATH=%s$$ORIGIN\n' \
+ $(if $(SYSTEM_PYTHON), \
+ '', \
+ $(if $(filter MACOSX,$(OS)), \
+ '$(foreach dir,/ /lib-dynload /lib-tk
/site-packages,$(patsubst
%/,%,$$ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir)))
', \
+ $(if $(filter WNTMSC,$(OS)$(COM)), \
+ '$(foreach dir,/ /site-packages,$(patsubst
%/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ', \
+ '$(foreach dir,/ /lib-dynload /lib-tk
/site-packages,$(patsubst
%/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) '))) \
+ ) > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 2ae3733..ac09d98 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -12,9 +12,11 @@ $(eval $(call gb_Module_Module,pyuno))
ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Module_add_targets,pyuno,\
+ CustomTarget_pyuno_pythonloader_ini \
Library_pyuno \
Library_pythonloader \
Package_python_scripts \
+ Package_pyuno_pythonloader_ini \
Rdb_pyuno \
))
diff --git a/pyuno/Package_pyuno_pythonloader_ini.mk
b/pyuno/Package_pyuno_pythonloader_ini.mk
new file mode 100644
index 0000000..0fae146
--- /dev/null
+++ b/pyuno/Package_pyuno_pythonloader_ini.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,pyuno_pythonloader_ini,$(call
gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)))
+
+$(eval $(call gb_Package_add_files,pyuno_pythonloader_ini,$(LIBO_ETC_FOLDER), \
+ $(call gb_Helper_get_rcfile,pythonloader.uno) \
+))
+
+# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
