[Libreoffice-commits] .: cpputools/Module_cpputools.mk cpputools/Package_bin.mk solenv/gbuild

[David Tardon]

 cpputools/Module_cpputools.mk    |    6 ++++++
 cpputools/Package_bin.mk         |   34 ++++++++++++++++++++++++++++++++++
 solenv/gbuild/TargetLocations.mk |    1 +
 3 files changed, 41 insertions(+)

New commits:
commit dd9bbad2b19d7c8bbe68dd2cdcf3d90d763d747d
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 11 10:01:25 2012 +0200

    also deliver .bin variants of the tools

diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
index 17b41b3..3e5a063 100644
--- a/cpputools/Module_cpputools.mk
+++ b/cpputools/Module_cpputools.mk
@@ -40,6 +40,12 @@ $(eval $(call gb_Module_add_targets,cpputools,\
     Executable_regsingleton \
     Executable_uno \
 ))
+
+ifneq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,cpputools,\
+    Package_bin \
+))
+endif
 endif
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Package_bin.mk b/cpputools/Package_bin.mk
new file mode 100644
index 0000000..9a0b8d4
--- /dev/null
+++ b/cpputools/Package_bin.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# because the installation system is so incredibly inflexible...
+$(eval $(call gb_Package_Package,cpputools_bin,$(gb_Executable_BINDIR)))
+
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/regcomp.bin,regcomp))
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/uno.bin,uno))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 2fbd434..df694b7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -253,6 +253,7 @@ gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_
 
 # static members declared here because they are used globally
 
+gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable
 gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib
 gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
 gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest