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

use GeneratedPackage to deliver uno loader classes

Browse source 
This is a workaround for problems with file names containing $ in
gbuild. And it does not matter much in this case, because the classes
are never used during build, so there is no need to have exact
dependencies.

Change-Id: Ibeb30257a62ed13744dc4fe987830d1e5a4102b0
This commit is contained in:
David Tardon 2013-06-19 16:14:19 +02:00
parent 1ae19c8e6a
commit 41efa15358
3 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
odk/GeneratedPackage_uno_loader_classes.mk Normal file
View file

@ -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_GeneratedPackage_GeneratedPackage,odk_uno_loader_classes,$(call gb_CustomTarget_get_workdir,odk/classes)))
$(eval $(call gb_GeneratedPackage_use_customtarget,odk_uno_loader_classes,odk/classes))
$(eval $(call gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader))
# vim: set noet sw=4 ts=4:

2
odk/Module_odk.mk
View file

@ -53,9 +53,9 @@ $(eval $(call gb_Module_add_targets,odk,\
$(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
CustomTarget_classes \
CustomTarget_javadoc \
GeneratedPackage_uno_loader_classes \
$(if $(filter WNT,$(OS)),Library_unowinreg) \
Package_javadoc \
Package_uno_loader_classes \
Package_unowinreg \
))
endif

25
odk/Package_uno_loader_classes.mk
View file

@ -1,25 +0,0 @@
# -*- 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,odk_uno_loader_classes,$(call gb_CustomTarget_get_workdir,odk/classes)))
$(eval $(call gb_Package_set_outdir,odk_uno_loader_classes,$(INSTDIR)))
$(eval $(call gb_Package_add_files_with_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes,\
com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class \
com/sun/star/lib/loader/InstallationFinder.class \
com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class \
com/sun/star/lib/loader/Loader$$Drain.class \
com/sun/star/lib/loader/Loader$$Drain.class \
com/sun/star/lib/loader/Loader.class \
com/sun/star/lib/loader/WinRegKey.class \
com/sun/star/lib/loader/WinRegKeyException.class \
))
# vim: set noet sw=4 ts=4: