mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapt ucpp for UnpackedTarball

Browse Source 
Change-Id: I0871baf8a6c72ea0c7b44a7abfc8d5152b331db5
This commit is contained in:
David Tardon
2012-08-20 11:16:21 +02:00
parent df4ff35470
commit ee0a39c52e
4 changed files with 30 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ucpp/CustomTarget_source.mk
View File

@@ -1,35 +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_CustomTarget_CustomTarget,ucpp/source))
$(call gb_CustomTarget_get_target,ucpp/source) : $(call gb_CustomTarget_get_workdir,ucpp/source)/done
# FIXME: do not hardcode the path here
ifeq ($(OS_FOR_BUILD),WNT)
ucpp_FIXED_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION))/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
else
ucpp_FIXED_TARFILE_LOCATION := $(TARFILE_LOCATION)/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
endif
$(call gb_CustomTarget_get_workdir,ucpp/source)/done : \
$(ucpp_FIXED_TARFILE_LOCATION) \
$(SRCDIR)/ucpp/ucpp.patch \
| $(call gb_CustomTarget_get_workdir,ucpp/source)/.dir
$(call gb_CustomTarget_get_workdir,ucpp/source)/done :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TAR,1)
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $@) && \
$(GNUTAR) -x -z $(STRIP_COMPONENTS)=1 -f $< && \
$(GNUPATCH) -p0 < $(SRCDIR)/ucpp/ucpp.patch && \
touch $@ \
)
# vim: set noet sw=4 ts=4:

20
ucpp/Executable_ucpp.mk
View File

@@ -11,9 +11,7 @@ $(eval $(call gb_Executable_Executable,ucpp))
$(eval $(call gb_Executable_set_warnings_not_errors,ucpp))
$(eval $(call gb_Executable_use_custom_headers,ucpp,\
ucpp/source \
))
$(eval $(call gb_Executable_use_unpacked,ucpp,ucpp))
$(eval $(call gb_Executable_add_defs,ucpp,\
-DNO_UCPP_BUF \
@@ -22,14 +20,14 @@ $(eval $(call gb_Executable_add_defs,ucpp,\
))
$(eval $(call gb_Executable_add_generated_cobjects,ucpp,\
CustomTarget/ucpp/source/assert \
CustomTarget/ucpp/source/cpp \
CustomTarget/ucpp/source/eval \
CustomTarget/ucpp/source/hash \
CustomTarget/ucpp/source/lexer \
CustomTarget/ucpp/source/macro \
CustomTarget/ucpp/source/mem \
CustomTarget/ucpp/source/nhash \
UnpackedTarball/ucpp/assert \
UnpackedTarball/ucpp/cpp \
UnpackedTarball/ucpp/eval \
UnpackedTarball/ucpp/hash \
UnpackedTarball/ucpp/lexer \
UnpackedTarball/ucpp/macro \
UnpackedTarball/ucpp/mem \
UnpackedTarball/ucpp/nhash \
))
# vim: set noet sw=4 ts=4:

5
ucpp/Module_ucpp.mk
View File

@@ -9,13 +9,10 @@
$(eval $(call gb_Module_Module,ucpp))
$(eval $(call gb_Module_add_targets,ucpp,\
CustomTarget_source \
))
ifneq ($(CROSS_COMPILING),YES)
$(eval $(call gb_Module_add_targets,ucpp,\
Executable_ucpp \
UnpackedTarball_ucpp \
))
endif

20
ucpp/UnpackedTarball_ucpp.mk Normal file
View File

@@ -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_UnpackedTarball_UnpackedTarball,ucpp))
$(eval $(call gb_UnpackedTarball_set_tarball,ucpp,0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz))
$(eval $(call gb_UnpackedTarball_set_patchlevel,ucpp,0))
$(eval $(call gb_UnpackedTarball_add_patches,ucpp,\
ucpp/ucpp.patch \
))
# vim: set noet sw=4 ts=4: