instsetoo_native/CustomTarget_setup.mk | 51 ++++++++++++++++++++++++++++
instsetoo_native/Module_instsetoo_native.mk | 9 ++++
instsetoo_native/Package_config.mk | 22 ++++++++++++
instsetoo_native/Package_rdb.mk | 19 ++++++++++
instsetoo_native/Package_setup.mk | 21 +++++++++++
instsetoo_native/config/bootstraprc | 14 +++++++
instsetoo_native/config/fundamentalrc | 27 ++++++++++++++
instsetoo_native/config/unorc | 20 ++++++++++
instsetoo_native/config/unorc.ure | 13 +++++++
postprocess/Module_postprocess.mk | 7 +++
postprocess/Package_images_install.mk | 20 ++++++++++
postprocess/Package_registry_install.mk | 23 ++++++++++++
solenv/Module_solenv.mk | 1
solenv/Package_gdb_install.mk | 27 ++++++++++++++
solenv/gbuild/AllLangResTarget.mk | 14 +++++++
solenv/gbuild/Executable.mk | 29 +++++++++++++++
solenv/gbuild/Library.mk | 39 ++++++++++++++++++++-
solenv/gbuild/gbuild.mk | 2 +
18 files changed, 357 insertions(+), 1 deletion(-)
New commits:
commit 88a943b051bb78be4a3c105474ca20b57f758542
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 28 11:35:35 2013 +0200
generate versionrc for instdir
Change-Id: I5f2cdcd8a17ca250413bda066acaeab24118f9d6
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 2374fb1..366f1a9 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -12,6 +12,7 @@ $(eval $(call
gb_CustomTarget_CustomTarget,instsetoo_native/setup))
$(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
ooenv \
ure-link \
+ versionrc \
))
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
@@ -37,4 +38,14 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/ure-link :
cd $(dir $@) && \
ln -s ure ure-link
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/versionrc :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( \
+ echo '[Version]' && \
+ echo 'AllLanguages=en-US' && \
+ echo 'buildid=$(shell git log -1 --format=%H)' && \
+ echo
'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)'
&& \
+ echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \
+ ) > $@
+
# vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/Package_setup.mk
b/instsetoo_native/Package_setup.mk
index cd32a9e..9f8ca30 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -11,7 +11,11 @@ $(eval $(call
gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,instsetoo_native_setup,program/ooenv,ooenv))
+$(eval $(call gb_Package_add_files,instsetoo_native_setup,program,\
+ ooenv \
+ versionrc \
+))
+
$(eval $(call gb_Package_add_file,instsetoo_native_setup,ure-link,ure-link))
# vim: set noet sw=4 ts=4:
commit e203f79faac1d26e0d6883be9f0ff88eaaf484ed
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 28 10:21:10 2013 +0200
copy xcd files to instdir
Change-Id: Idbde83eab55864c16e3472397cb5bd433cf2431c
diff --git a/postprocess/Module_postprocess.mk
b/postprocess/Module_postprocess.mk
index 1a52832..6a38191 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -29,6 +29,7 @@ endif
ifneq ($(gb_RUNNABLE_INSTDIR),)
$(eval $(call gb_Module_add_targets,postprocess,\
Package_images_install \
+ Package_registry_install \
))
endif
diff --git a/postprocess/Package_registry_install.mk
b/postprocess/Package_registry_install.mk
new file mode 100644
index 0000000..ca9f7c2
--- /dev/null
+++ b/postprocess/Package_registry_install.mk
@@ -0,0 +1,23 @@
+# -*- 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,postprocess_registry_install,$(call
gb_CustomTarget_get_workdir,postprocess/registry)))
+
+$(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(INSTDIR)))
+
+$(eval $(call
gb_Package_add_files,postprocess_registry_install,share/registry,\
+ $(postprocess_XCDS) \
+ $(foreach lang,$(gb_Configuration_LANGS), \
+ Langpack-$(lang).xcd \
+ fcfg_langpack_$(lang).xcd \
+ registry_$(lang).xcd \
+ ) \
+))
+
+# vim: set noet sw=4 ts=4:
commit ecc07f080fba809dd3f87c88a2b265c1c63bf2dd
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 27 15:11:42 2013 +0200
copy rc files to instdir
Change-Id: I5a4433595ac19930a40132c5749a8c0150c90aae
diff --git a/instsetoo_native/Module_instsetoo_native.mk
b/instsetoo_native/Module_instsetoo_native.mk
index 2cf7c3c..7c098d3 100644
--- a/instsetoo_native/Module_instsetoo_native.mk
+++ b/instsetoo_native/Module_instsetoo_native.mk
@@ -20,6 +20,7 @@ endif
ifneq ($(gb_RUNNABLE_INSTDIR),)
$(eval $(call gb_Module_add_targets,instsetoo_native,\
CustomTarget_setup \
+ Package_config \
Package_rdb \
Package_setup \
))
diff --git a/instsetoo_native/Package_config.mk
b/instsetoo_native/Package_config.mk
new file mode 100644
index 0000000..6eef87b
--- /dev/null
+++ b/instsetoo_native/Package_config.mk
@@ -0,0 +1,22 @@
+# -*- 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_config,$(SRCDIR)/instsetoo_native/config))
+
+$(eval $(call gb_Package_set_outdir,instsetoo_native_config,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,instsetoo_native_config,program,\
+ bootstraprc \
+ fundamentalrc \
+ unorc \
+))
+
+$(eval $(call
gb_Package_add_file,instsetoo_native_config,ure/lib/unorc,unorc.ure))
+
+# vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/config/bootstraprc
b/instsetoo_native/config/bootstraprc
new file mode 100644
index 0000000..09cb1fd
--- /dev/null
+++ b/instsetoo_native/config/bootstraprc
@@ -0,0 +1,14 @@
+= 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/.
+=
+
+[ErrorReport]
+ErrorReportPort=80
+ErrorReportServer=report.libreoffice.org
+[Bootstrap]
+InstallMode=<installmode>
+ProductKey=LibreOffice 4.1
+UserInstallation=$ORIGIN/../.config
diff --git a/instsetoo_native/config/fundamentalrc
b/instsetoo_native/config/fundamentalrc
new file mode 100644
index 0000000..9f992f2
--- /dev/null
+++ b/instsetoo_native/config/fundamentalrc
@@ -0,0 +1,27 @@
+= 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/.
+=
+
+[Bootstrap]
+BRAND_BASE_DIR=${ORIGIN}/..
+CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry
res:${BRAND_BASE_DIR}/share/registry
bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
userext:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
user:${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu
+LO_JAVA_DIR=${BRAND_BASE_DIR}/program/classes
+LO_LIB_DIR=${BRAND_BASE_DIR}/program
+BAK_EXTENSIONS=${$ORIGIN/unorc:TMP_EXTENSIONS}
+BUNDLED_EXTENSIONS=${$ORIGIN/unorc:BUNDLED_EXTENSIONS}
+BUNDLED_EXTENSIONS_USER=${$ORIGIN/unorc:BUNDLED_EXTENSIONS_USER}
+SHARED_EXTENSIONS_USER=${$ORIGIN/unorc:SHARED_EXTENSIONS_USER}
+UNO_SHARED_PACKAGES_CACHE=${$ORIGIN/unorc:UNO_SHARED_PACKAGES_CACHE}
+TMP_EXTENSIONS=${$ORIGIN/unorc:TMP_EXTENSIONS}
+UNO_USER_PACKAGES_CACHE=${$ORIGIN/unorc:UNO_USER_PACKAGES_CACHE}
+URE_BIN_DIR=${BRAND_BASE_DIR}/ure-link/bin
+URE_MORE_JAVA_CLASSPATH_URLS=
+URE_OVERRIDE_JAVA_JFW_SHARED_DATA=${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml
+URE_OVERRIDE_JAVA_JFW_USER_DATA=${${BRAND_BASE_DIR}/program/bootstraprc:UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml
+URE_LIB_DIR=${BRAND_BASE_DIR}/ure-link/lib
+URE_MORE_JAVA_TYPES=$ORIGIN/classes/unoil.jar
$ORIGIN/classes/ScriptFramework.jar
${${$ORIGIN/unorc:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH}
${${$ORIGIN/unorc:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}
${${$ORIGIN/unorc:PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}
+URE_MORE_SERVICES=${${$ORIGIN/unorc:PKG_UserUnoFile}:UNO_SERVICES}
${${$ORIGIN/unorc:PKG_SharedUnoFile}:UNO_SERVICES}
${${$ORIGIN/unorc:PKG_BundledUnoFile}:UNO_SERVICES} <$ORIGIN/services>*
+URE_MORE_TYPES=<$ORIGIN/types>* ${${$ORIGIN/unorc:PKG_UserUnoFile}:UNO_TYPES}
${${$ORIGIN/unorc:PKG_SharedUnoFile}:UNO_TYPES}
${${$ORIGIN/unorc:PKG_BundledUnoFile}:UNO_TYPES}
diff --git a/instsetoo_native/config/unorc b/instsetoo_native/config/unorc
new file mode 100644
index 0000000..387c4a3
--- /dev/null
+++ b/instsetoo_native/config/unorc
@@ -0,0 +1,20 @@
+= 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/.
+=
+
+[Bootstrap]
+PKG_BundledUnoFile=$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
+PKG_SharedUnoFile=$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
+PKG_UserUnoFile=$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
+BAK_EXTENSIONS=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bak
+BUNDLED_EXTENSIONS=$BRAND_BASE_DIR/share/extensions
+BUNDLED_EXTENSIONS_USER=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled
+TMP_EXTENSIONS=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/tmp
+SHARED_EXTENSIONS_USER=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/shared
+UNO_SHARED_PACKAGES=$BRAND_BASE_DIR/share/uno_packages
+UNO_SHARED_PACKAGES_CACHE=$UNO_SHARED_PACKAGES/cache
+UNO_USER_PACKAGES=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/uno_packages
+UNO_USER_PACKAGES_CACHE=$UNO_USER_PACKAGES/cache
diff --git a/instsetoo_native/config/unorc.ure
b/instsetoo_native/config/unorc.ure
new file mode 100644
index 0000000..78d4d6e
--- /dev/null
+++ b/instsetoo_native/config/unorc.ure
@@ -0,0 +1,13 @@
+= 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/.
+=
+
+[Bootstrap]
+URE_INTERNAL_LIB_DIR=${ORIGIN}
+URE_INTERNAL_JAVA_DIR=${ORIGIN}../share/java
+URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
+UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}
+UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}
commit 764e747a3ac02db4e3535cdf99c44c2822235cf3
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 28 09:30:24 2013 +0200
copy gdb pretty printers into instdir
Change-Id: I2e4805b89d519fd5586d5a1edf5dad7662c022de
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 4e78021..ef63bea 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -26,6 +26,7 @@ ifneq ($(filter-out WNT IOS ANDROID,$(OS)),)
$(eval $(call gb_Module_add_targets,solenv,\
CustomTarget_gdb \
Package_gdb \
+ $(if $(gb_RUNNABLE_INSTDIR),Package_gdb_install) \
))
endif
diff --git a/solenv/Package_gdb_install.mk b/solenv/Package_gdb_install.mk
new file mode 100644
index 0000000..e596f68
--- /dev/null
+++ b/solenv/Package_gdb_install.mk
@@ -0,0 +1,27 @@
+# -*- 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,solenv_gdb_install,$(call
gb_CustomTarget_get_workdir,solenv/gdb)))
+
+$(eval $(call gb_Package_set_outdir,solenv_gdb_install,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,solenv_gdb_install,program,\
+ $(call gb_Library_get_runtime_filename,svl)-gdb.py \
+ $(call gb_Library_get_runtime_filename,sw)-gdb.py \
+ $(call gb_Library_get_runtime_filename,tl)-gdb.py \
+))
+
+$(eval $(call gb_Package_add_files,solenv_gdb_install,ure/lib,\
+ $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \
+ $(call gb_Library_get_runtime_filename,sal).3-gdb.py \
+))
+
+$(eval $(call gb_Package_use_custom_target,solenv_gdb_install,solenv/gdb))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
commit db1b0ca0156382bac0266d0eb09be0872d825889
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 28 09:15:16 2013 +0200
copy rdbs to instdir
Change-Id: I1855e72efc1a034d28ca2326ad8b239e2671cea7
diff --git a/instsetoo_native/Module_instsetoo_native.mk
b/instsetoo_native/Module_instsetoo_native.mk
index 2ee18e5..2cf7c3c 100644
--- a/instsetoo_native/Module_instsetoo_native.mk
+++ b/instsetoo_native/Module_instsetoo_native.mk
@@ -20,6 +20,7 @@ endif
ifneq ($(gb_RUNNABLE_INSTDIR),)
$(eval $(call gb_Module_add_targets,instsetoo_native,\
CustomTarget_setup \
+ Package_rdb \
Package_setup \
))
endif
diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk
new file mode 100644
index 0000000..af41c9e
--- /dev/null
+++ b/instsetoo_native/Package_rdb.mk
@@ -0,0 +1,19 @@
+# -*- 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_rdb,$(OUTDIR)))
+
+$(eval $(call gb_Package_set_outdir,instsetoo_native_rdb,$(INSTDIR)))
+
+$(eval $(call
gb_Package_add_file,instsetoo_native_rdb,program/services/services.rdb,xml/services.rdb))
+$(eval $(call
gb_Package_add_file,instsetoo_native_rdb,program/types/offapi.rdb,bin/offapi.rdb))
+$(eval $(call
gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/services.rdb,xml/ure/services.rdb))
+$(eval $(call
gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/types.rdb,bin/udkapi.rdb))
+
+# vim: set noet sw=4 ts=4:
commit 0346f008e7ee6d30b8990806bab8cc69b4bf181d
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 27 15:06:21 2013 +0200
gbuild: add ure-link to instdir
Change-Id: I1279ea7cdd9828598179154815a85e2a4ce7e567
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 51647eb..2374fb1 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -11,6 +11,7 @@ $(eval $(call
gb_CustomTarget_CustomTarget,instsetoo_native/setup))
$(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
ooenv \
+ ure-link \
))
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
@@ -29,4 +30,11 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
echo 'export OOO_DISABLE_RECOVERY=1' \
) > $@
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ure-link :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LN ,1)
+ rm -f $@ && \
+ mkdir -p $(dir $@)/ure && \
+ cd $(dir $@) && \
+ ln -s ure ure-link
+
# vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/Package_setup.mk
b/instsetoo_native/Package_setup.mk
index cf73f4f..cd32a9e 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -12,5 +12,6 @@ $(eval $(call
gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR)))
$(eval $(call gb_Package_add_file,instsetoo_native_setup,program/ooenv,ooenv))
+$(eval $(call gb_Package_add_file,instsetoo_native_setup,ure-link,ure-link))
# vim: set noet sw=4 ts=4:
commit 6ae02e9c617f969262e28bc705bf3cb269d665d7
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 27 14:27:51 2013 +0200
gbuild: generate ooenv for instdir
Change-Id: I1d2ab70a1557376f056b236c4785e013275bbb92
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
new file mode 100644
index 0000000..51647eb
--- /dev/null
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -0,0 +1,32 @@
+# -*- 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,instsetoo_native/setup))
+
+$(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
+ ooenv \
+))
+
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( \
+ echo 'java_path=`$(INSTDIR)/ure/bin/javaldx 2>/dev/null`' && \
+ echo 'export
LD_LIBRARY_PATH="$(INSTDIR)/program:$$java_path$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"'
&& \
+ echo 'ulimit -c unlimited' && \
+ echo 'export
PATH="$(INSTDIR)/program:$(INSTDIR)/ure/bin:$$PATH"' && \
+ echo 'export GNOME_DISABLE_CRASH_DIALOG=1' && \
+ 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' \
+ ) > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/Module_instsetoo_native.mk
b/instsetoo_native/Module_instsetoo_native.mk
index 454a77c..2ee18e5 100644
--- a/instsetoo_native/Module_instsetoo_native.mk
+++ b/instsetoo_native/Module_instsetoo_native.mk
@@ -17,4 +17,11 @@ $(eval $(call gb_Module_add_targets,instsetoo_native,\
endif
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(eval $(call gb_Module_add_targets,instsetoo_native,\
+ CustomTarget_setup \
+ Package_setup \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/Package_setup.mk
b/instsetoo_native/Package_setup.mk
new file mode 100644
index 0000000..cf73f4f
--- /dev/null
+++ b/instsetoo_native/Package_setup.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,instsetoo_native_setup,$(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)))
+
+$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,instsetoo_native_setup,program/ooenv,ooenv))
+
+# vim: set noet sw=4 ts=4:
commit 9c8786c3dff6ebe206488cdc599541b2acfd2146
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 27 13:57:05 2013 +0200
gbuild: copy image zips to instdir
Change-Id: I073be89556091321543adfe246d751e5f4df119a
diff --git a/postprocess/Module_postprocess.mk
b/postprocess/Module_postprocess.mk
index 9ed1a75..1a52832 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -26,4 +26,10 @@ $(eval $(call gb_Module_add_targets,postprocess,\
))
endif
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(eval $(call gb_Module_add_targets,postprocess,\
+ Package_images_install \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/Package_images_install.mk
b/postprocess/Package_images_install.mk
new file mode 100644
index 0000000..1759d6c
--- /dev/null
+++ b/postprocess/Package_images_install.mk
@@ -0,0 +1,20 @@
+# -*- 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,postprocess_images_install,$(call
gb_CustomTarget_get_workdir,postprocess/images)))
+
+$(eval $(call gb_Package_set_outdir,postprocess_images_install,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,postprocess_images_install,share/config,\
+ images_brand.zip \
+ $(if $(filter default,$(WITH_THEMES)),images.zip) \
+ $(foreach theme,$(filter-out
default,$(WITH_THEMES)),images_$(theme).zip) \
+))
+
+# vim: set noet sw=4 ts=4:
commit f8bf72f44a39a01d421e1dadebc1aaf25151a8d2
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 27 12:32:31 2013 +0200
gbuild: copy resources into $(INSTDIR)
Change-Id: I06d20538ec2b4f80963e0e7c6c401b3d573aac86
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 2ac22b2..13fb138 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -443,6 +443,8 @@ define gb_AllLangResTarget_set_langs
gb_AllLangResTarget_LANGS := $(1)
endef
+gb_AllLangResTarget_get_packagename = AllLangResTarget/$(1)
+
$(call gb_AllLangResTarget_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_AllLangResTarget_get_target,$*))
@@ -455,6 +457,18 @@ define gb_AllLangResTarget_AllLangResTarget
$(call gb_Postprocess_get_target,AllResources) : $(call
gb_AllLangResTarget_get_target,$(1))
$(foreach lang,$(gb_AllLangResTarget_LANGS),\
$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
+
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(call gb_Package_Package,$(call
gb_AllLangResTarget_get_packagename,$(1)),$(WORKDIR))
+$(call gb_Package_set_outdir,$(call
gb_AllLangResTarget_get_packagename,$(1)),$(INSTDIR))
+$(call gb_AllLangResTarget_get_target,$(1)) : $(call
gb_Package_get_target,$(call gb_AllLangResTarget_get_packagename,$(1)))
+$(call gb_AllLangResTarget_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target,$(call gb_AllLangResTarget_get_packagename,$(1)))
+$(call gb_Package_add_files,$(call
gb_AllLangResTarget_get_packagename,$(1)),program/resource,\
+ $(foreach lang,$(gb_AllLangResTarget_LANGS),\
+ $(subst $(WORKDIR)/,,$(call
gb_ResTarget_get_target,$(1)$(lang)))) \
+)
+endif
+
$$(eval $$(call gb_Module_register_target,$(call
gb_AllLangResTarget_get_target,$(1)),$(call
gb_AllLangResTarget_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),AllLangResTarget)
commit efd2ac98ecdd2cbf2c37efc03acdd72596031c1d
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 27 12:32:21 2013 +0200
gbuild: copy executables into $(INSTDIR)
Change-Id: I88f6327c12fa2b782aa5c82e5891006713348477
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index a74e202..5040e21 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -31,6 +31,11 @@
# defined by platform
# gb_Executable_Executable_platform
+# NOTE: SDKBIN executables are already packaged in module odk
+gb_Executable_LAYER_DIRS := \
+ OOO:program \
+ UREBIN:ure/bin
+
$(dir $(call gb_Executable_get_runtime_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
@@ -47,6 +52,11 @@ $(call gb_Executable_get_clean_target,%) :
$(call gb_Executable_get_runtime_target,$*) \
$(AUXTARGETS))
+gb_Executable_get_packagename = Executable/$(1)
+
+gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter
$(1):%,$(gb_Executable_LAYER_DIRS)))
+gb_Executable__get_instdir = $(call gb_Executable__get_dir_for_layer,$(call
gb_Executable_get_layer,$(1)))
+
define gb_Executable_Executable
$(call gb_Postprocess_get_target,AllExecutables) : $(call
gb_Executable_get_target,$(1))
ifeq (,$$(findstring $(1),$$(gb_Executable_KNOWN)))
@@ -67,12 +77,31 @@ $(call gb_Executable_get_runtime_target,$(1)) :| $(dir
$(call gb_Executable_get_
$(call gb_Executable_get_clean_target,$(1)) : $(call
gb_LinkTarget_get_clean_target,$(2))
$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Executable_Executable_platform,$(1),$(2))
+
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(if $(filter $(call
gb_Executable_get_layer,$(1)):%,$(gb_Executable_LAYER_DIRS)),\
+ $(call gb_Executable__Executable_package,$(1),$(call
gb_Executable_get_packagename,$(1)),$(2),$(notdir $(call
gb_Executable_get_target,$(1)))) \
+)
+endif
+
$$(eval $$(call gb_Module_register_target,$(call
gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Executable)
$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call
gb_LinkTarget_get_target,$(2)),$(1))
endef
+# gb_Executable__Executable_package executable package linktarget filename
+define gb_Executable__Executable_package
+$(call gb_Package_Package,$(2),$(WORKDIR))
+$(call gb_Package_set_outdir,$(2),$(INSTDIR))
+$(call gb_Package_add_file,$(2),$(call
gb_Executable__get_instdir,$(1))/$(4),$(subst $(WORKDIR)/,,$(call
gb_LinkTarget_get_target,$(3))))
+
+$(call gb_Executable_get_target,$(1)) :| $(call gb_Package_get_target,$(2))
+$(call gb_Package_get_target,$(2)) : $(call gb_LinkTarget_get_target,$(3))
+$(call gb_Executable_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target,$(2))
+
+endef
+
define gb_Executable_set_targettype_gui
$(call gb_LinkTarget_get_target,Executable/$(1)$(gb_Executable_EXT)) :
TARGETGUI := $(2)
endef
commit f48a576ff2c4f2ebd20b681d0c9b8233fe674a9d
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 27 09:04:19 2013 +0200
gbuild: copy shared libs into $(INSTDIR)
Change-Id: I20612a93a25d1748725a792cfae0bce8c3ef262b
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 8db3cf0..37721d7 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -38,6 +38,10 @@
# gb_Library_FILENAMES
# gb_Library_Library_platform
+gb_Library_LAYER_DIRS := \
+ OOO:program \
+ URELIB:ure/$(notdir $(gb_Helper_OUTDIRLIBDIR))
+
# doesn't do anything, just used for hooking up component target
.PHONY: $(call gb_Library__get_final_target,%)
@@ -48,6 +52,11 @@ $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) :
rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
$(AUXTARGETS))
+gb_Library_get_packagename = Library/$(1)
+
+gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter
$(1):%,$(gb_Library_LAYER_DIRS)))
+gb_Library__get_instdir = $(call gb_Library__get_dir_for_layer,$(call
gb_Library_get_layer,$(1)))
+
define gb_Library_Library
$(call gb_Postprocess_get_target,AllLibraries) : $(call
gb_Library_get_target,$(1))
ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS)))
@@ -72,12 +81,31 @@ $(call gb_Library_get_target,$(1)) : $(call
gb_LinkTarget_get_target,$(2)) \
$(call gb_Library_get_clean_target,$(1)) : $(call
gb_LinkTarget_get_clean_target,$(2))
$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call
gb_Library_get_dllname,$(1)))
+
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(if $(filter $(call gb_Library_get_layer,$(1)):%,$(gb_Library_LAYER_DIRS)),\
+ $(call gb_Library__Library_package,$(1),$(call
gb_Library_get_packagename,$(1)),$(call gb_Library_get_runtime_filename,$(1))) \
+)
+endif
+
$$(eval $$(call gb_Module_register_target,$(call
gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call
gb_Library__get_final_target,$(1)))
$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call
gb_LinkTarget_get_target,$(2)),$(1))
endef
+# gb_Library__Library_package library package filename
+define gb_Library__Library_package
+$(call gb_Package_Package,$(2),$(gb_Helper_OUTDIRLIBDIR))
+$(call gb_Package_set_outdir,$(2),$(INSTDIR))
+$(call gb_Package_add_file,$(2),$(call gb_Library__get_instdir,$(1))/$(3),$(3))
+
+$(call gb_Library__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))
+$(call gb_Package_get_target,$(2)) : $(call gb_Library_get_target,$(1))
+$(call gb_Library_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target,$(2))
+
+endef
+
# Custom definition that does not simply forward to LinkTarget,
# because there are cases where the auxtargets are not delivered to solver...
# The auxtarget is delivered via the rule in Package.mk.
@@ -95,10 +123,19 @@ $(foreach aux,$(2),$(call
gb_Library_add_auxtarget,$(1),$(aux)))
endef
+# gb_Library__add_soversion_link library package linkname
+define gb_Library__add_soversion_link
+$(call gb_Library_add_auxtarget,$(1),$(3))
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(call gb_Package_add_file,$(2),$(call gb_Library__get_instdir,$(1))/$(notdir
$(3)),$(notdir $(3)))
+endif
+
+endef
+
define gb_Library__set_soversion_script
$(call gb_LinkTarget_set_soversion_script,$(call
gb_Library_get_linktargetname,$(1)),$(2),$(3))
$(call gb_Library_get_target,$(1)) : SOVERSION := $(2)
-$(call gb_Library_add_auxtarget,$(1),$(call gb_Library_get_target,$(1)).$(2))
+$(call gb_Library__add_soversion_link,$(1),$(call
gb_Library_get_packagename,$(1)),$(call gb_Library_get_target,$(1)).$(2))
endef
commit 488d0de6f8b691ab7cb5a5b6bfa594b1aa999909
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 27 09:23:09 2013 +0200
gbuild: add var. for enabling runnable instdir
This is a part of my effort to get a runnable $(INSTDIR) as a more
convenient alternative to make dev-install. I plan to copy all necessary
shared libs, executables and other files to $(INSTDIR), which increases
the disk space demands for a build (there would be three copies of a
library/executable in the same build: one in $(WORKDIR), another in
$(OUTDIR) and one in $(INSTDIR)). Because the runnable instdir idea is
limited to Linux anyway (at least for now), it will be disabled by
default.
Change-Id: Ib61109b1a193c61c0236b50b64c34fea20f40297
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 5e06cbb..c71cb40 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -275,6 +275,8 @@ gb_GLOBALDEFS += \
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
+gb_RUNNABLE_INSTDIR :=
+
include $(GBUILDDIR)/Deliver.mk
$(eval $(call gb_Deliver_init))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
