liborcus/ExternalProject_liborcus.mk | 3 --- liborcus/Module_liborcus.mk | 1 + liborcus/Package_liborcus.mk | 20 ++++++++++++++++++++ solenv/gbuild/UnpackedTarball.mk | 10 ++++++---- 4 files changed, 27 insertions(+), 7 deletions(-)
New commits: commit e7d85cc078bd1d2757709789014233f4e9c1a23d Author: Michael Stahl <mst...@redhat.com> Date: Tue Sep 11 16:59:27 2012 +0200 orcus: use Package to deliver libraries Manually copied files aren't cleaned Change-Id: I35b08ed6f10b9405d569c06c624d0702f1f6e5fa diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 8cac314..f67b48c 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ - && cp Release/orcus.lib $(OUTDIR)/lib \ && touch $@ else @@ -40,8 +39,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(GNUMAKE) \ - && cp src/liborcus/.libs/liborcus-0.2.a $(OUTDIR)/lib \ - && ln -s liborcus-0.2.a $(OUTDIR)/lib/liborcus.a \ && touch $@ endif diff --git a/liborcus/Module_liborcus.mk b/liborcus/Module_liborcus.mk index f8c0ed0..440d1b5 100644 --- a/liborcus/Module_liborcus.mk +++ b/liborcus/Module_liborcus.mk @@ -13,6 +13,7 @@ ifeq ($(SYSTEM_LIBORCUS),NO) $(eval $(call gb_Module_add_targets,liborcus,\ ExternalProject_liborcus \ + Package_liborcus \ UnpackedTarball_orcus \ )) diff --git a/liborcus/Package_liborcus.mk b/liborcus/Package_liborcus.mk new file mode 100644 index 0000000..57e5ea9 --- /dev/null +++ b/liborcus/Package_liborcus.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,liborcus,$(call gb_UnpackedTarball_get_dir,orcus))) + +$(eval $(call gb_Package_use_external_project,liborcus,liborcus)) + +ifeq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_Package_add_file,liborcus,lib/orcus.lib,vsprojects/liborcus-static-nozip/Release/orcus.lib)) +else +$(eval $(call gb_Package_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.2.a)) +endif + +# vim: set noet sw=4 ts=4: commit e9e996ed233e4ce1bd043b4e80dec2660005006e Author: Michael Stahl <mst...@redhat.com> Date: Tue Sep 11 16:35:59 2012 +0200 gbuild: UnpackedTarball: don't need over-engineered 82 line ... perl script to convert line ends. Change-Id: Ia2f6f38b39876946ba4471f99a7622241ae72017 diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 72b7d4d..c69d5e6 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -102,8 +102,10 @@ endef # converted, it is better to be changed to 1. gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 3 -gb_UnpackedTarball_CONVERTTARGET := $(SRCDIR)/solenv/bin/leconvert.pl -gb_UnpackedTarball_CONVERTCOMMAND := $(PERL) -w $(gb_UnpackedTarball_CONVERTTARGET) +gb_UnpackedTarball_CONVERTTODOS = \ + $(gb_AWK) 'sub("$$","\r")' $(1) > $(1).TEMP && mv $(1).TEMP $(1) +gb_UnpackedTarball_CONVERTTOUNIX = \ + tr -d '\r' < $(1) > $(1).TEMP && mv $(1).TEMP $(1) define gb_UnpackedTarball__copy_files_impl $(if $(1),\ @@ -125,13 +127,13 @@ define gb_UnpackedTarball__command $(call gb_Output_announce,$(2),$(true),PAT,2) $(call gb_Helper_abbreviate_dirs,\ cd $(3) && \ - $(if $(UNPACKED_FIX_EOL),$(gb_UnpackedTarball_CONVERTCOMMAND) unix $(UNPACKED_FIX_EOL) &&) \ + $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTOUNIX,$(file)) && ) \ $(if $(UNPACKED_PATCHES),\ for p in $(UNPACKED_PATCHES); do \ $(GNUPATCH) -s -p$(UNPACKED_PATCHLEVEL) < "$$p" || exit 1;\ done && \ ) \ - $(if $(UNPACKED_FIX_EOL),$(gb_UnpackedTarball_CONVERTCOMMAND) dos $(UNPACKED_FIX_EOL) &&) \ + $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTODOS,$(file)) && ) \ $(if $(UNPACKED_FILES),\ mkdir -p $(sort $(dir $(UNPACKED_DESTFILES))) && \ $(call gb_UnpackedTarball__copy_files,$(UNPACKED_FILES),$(UNPACKED_DESTFILES)) && \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits