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

Move instdir-only ooenv into its own Package

Browse source 
Change-Id: I399f4c5c6618dd151bd649f07e1b9d661e224324
This commit is contained in:
Stephan Bergmann 2014-11-26 16:03:12 +01:00
parent 4e14439b06
commit 233cccfe31
5 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
instsetoo_native/CustomTarget_setup.mk
View file

@ -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 $(ENABLE_OOENV),ooenv) \
$(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))) \
@ -26,7 +25,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)/ooenv \
$(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
@ -89,18 +87,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)/ooenv :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
echo 'ulimit -c unlimited' && \
echo '# debugging assistance' && \
echo 'export SAL_DISABLE_FLOATGRAB=1' && \
echo 'export G_SLICE=always-malloc' && \
echo 'export MALLOC_CHECK_=2' && \
echo 'export MALLOC_PERTURB_=153' && \
echo 'export OOO_DISABLE_RECOVERY=1' \
) > $@
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \

1
instsetoo_native/Module_instsetoo_native.mk
View file

@ -21,6 +21,7 @@ $(eval $(call gb_Module_add_targets,instsetoo_native,\
CustomTarget_setup \
Package_setup \
Package_setup_ure \
$(if $(ENABLE_OOENV),Package_instsetoo_native_ooenv) \
))
# vim: set noet sw=4 ts=4:

14
instsetoo_native/Package_instsetoo_native_ooenv.mk Normal file
View file

@ -0,0 +1,14 @@
# -*- 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,instsetoo_native_ooenv,$(SRCDIR)/instsetoo_native))
$(eval $(call gb_Package_add_file,instsetoo_native_ooenv,$(LIBO_BIN_FOLDER)/ooenv,ooenv))
# vim: set noet sw=4 ts=4:

1
instsetoo_native/Package_setup.mk
View file

@ -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 $(ENABLE_OOENV),ooenv) \
$(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))) \

25
instsetoo_native/ooenv Normal file
View file

@ -0,0 +1,25 @@
#
# 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 .
#
ulimit -c unlimited
# debugging assistance
export SAL_DISABLE_FLOATGRAB=1
export G_SLICE=always-malloc
export MALLOC_CHECK_=2
export MALLOC_PERTURB_=153
export OOO_DISABLE_RECOVERY=1