core.git: config_host.mk.in configure.ac Makefile.in net_ure/DotnetLibrary_net_basetypes.mk net_ure/Makefile net_ure/Module_net_ure.mk net_ure/README.md net_ure/source RepositoryModule_build.mk Reposi
Makefile.in |1
RepositoryModule_build.mk |1
RepositoryModule_host.mk |1
config_host.mk.in |1
configure.ac | 46 +
net_ure/DotnetLibrary_net_basetypes.mk| 27 +++
net_ure/Makefile | 13 +
net_ure/Module_net_ure.mk | 17 ++
net_ure/README.md |5
net_ure/source/basetypes/Any.cs | 47 ++
net_ure/source/basetypes/BoundAttribute.cs| 15 +
net_ure/source/basetypes/Exception.cs | 25 +++
net_ure/source/basetypes/IQueryInterface.cs | 17 ++
net_ure/source/basetypes/RaisesAttribute.cs | 19 ++
net_ure/source/basetypes/UnoGeneratedAttribute.cs | 16 ++
solenv/gbuild/DotnetLibrary.mk| 171 ++
solenv/gbuild/TargetLocations.mk |3
solenv/gbuild/gbuild.help.txt |1
solenv/gbuild/gbuild.mk |1
19 files changed, 426 insertions(+), 1 deletion(-)
New commits:
commit 6538b3b09cf5a3c8fc6d9882dc817afd59c3599c
Author: RMZeroFour
AuthorDate: Thu May 30 14:28:57 2024 +0530
Commit: Hossein
CommitDate: Wed Jun 12 18:48:07 2024 +0200
.NET Bindings: Add DotnetLibrary class to gbuild
This commit adds the DotnetLibrary gbuild class to build a .NET assembly
using the .NET SDK.
Also adds an option to enable or disable building .NET components with
--enable-dotnet (default) and --disable-dotnet to the autogen script.
Also adds a net_ure/ directory for the updated .NET bindings, currently
consisting of the net_basetypes library.
Change-Id: I9256387a2463ff8476deee85d886c6b3dce8257b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166380
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/Makefile.in b/Makefile.in
index 977e70da615e..b2d59e3075ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,6 +137,7 @@ gbuild_TARGETS := AllLangHelp \
CppunitTest \
CustomTarget \
Dictionary \
+ DotnetLibrary \
Executable \
Extension \
ExtensionPackage \
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 3efcb3cad705..587e0454d9fd 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
jvmaccess \
jvmfwk \
l10ntools \
+ net_ure \
o3tl \
offapi \
officecfg \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 0679096de9e8..429df464023f 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
linguistic \
lotuswordpro \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
+ net_ure \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
o3tl \
$(call gb_Helper_optional,ODK,odk) \
diff --git a/config_host.mk.in b/config_host.mk.in
index a3a965364750..787a1e629c43 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -165,6 +165,7 @@ export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
export ENABLE_DBUS=@ENABLE_DBUS@
export ENABLE_DCONF=@ENABLE_DCONF@
export ENABLE_DEBUG=@ENABLE_DEBUG@
+export ENABLE_DOTNET=@ENABLE_DOTNET@
SYSTEM_DRAGONBOX=@SYSTEM_DRAGONBOX@
SYSTEM_FROZEN=@SYSTEM_FROZEN@
export ENABLE_EPOXY=@ENABLE_EPOXY@
diff --git a/configure.ac b/configure.ac
index 7f77b8f2149a..190e6a9b2510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1532,7 +1532,7 @@ libo_FUZZ_ARG_ENABLE(extensions,
AC_ARG_ENABLE(scripting,
AS_HELP_STRING([--disable-scripting],
-[Disable BASIC, Java and Python. Work in progress, use only if you are
hacking on it.]),
+[Disable BASIC, Java, Python and .NET. Work in progress, use only if
you are hacking on it.]),
,test "${enable_scripting+set}" = set || enable_scripting=yes)
# This is mainly for Android and iOS, but could potentially be used in some
@@ -2158,6 +2158,10 @@ AC_ARG_ENABLE(customtarget-components,
AS_HELP_STRING([--enable-customtarget-components],
[Generates the static UNO object constructor mapping from the build.]))
+AC_ARG_ENABLE(dotnet,
+AS_HELP_STRING([--enable-dotnet],
+[Enables or disables .NET 8.0 support and bindings generation.]))
+
dnl ===
dnl Optional Packages (--with/without-)
dnl ===
@@ -3561,6 +3565,46 @@ if test "$COMPATH" = "."; then
fi
COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\$@@"`
+dnl ===
+dnl .NET support
+dnl
core.git: config_host.mk.in configure.ac Makefile.in
Makefile.in | 16 config_host.mk.in |2 ++ configure.ac | 41 + 3 files changed, 51 insertions(+), 8 deletions(-) New commits: commit f5c3ec505b83a20d272a66305bca565e9ff38b04 Author: Christian Lohmaier AuthorDate: Fri Apr 26 14:49:59 2024 +0200 Commit: Christian Lohmaier CommitDate: Fri Apr 26 23:10:22 2024 +0200 add --with-keep-awake switch to prevent going into sleep/suspend if used defaults to Awake for Windows and caffeinate for macOS Change-Id: I35f41bf1fb63af05ce2ec1a7f4d7b50b310536a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166743 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/Makefile.in b/Makefile.in index f55e92c94405..ac3e8aafb529 100644 --- a/Makefile.in +++ b/Makefile.in @@ -91,19 +91,19 @@ define gb_Top_GbuildModuleRules .PHONY: $(1).allbuild $(1).buildall $(1).allcheck $(1).checkall $(1): bootstrap fetch - cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) + $(KEEP_AWAKE_CMD) cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $(1).build $(1).check $(1).coverage $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)): bootstrap fetch - cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) + $(KEEP_AWAKE_CMD) cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) $(1).clean $(1).showdeliverables: cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) $(1).allbuild $(1).buildall: bootstrap fetch - $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) + $(KEEP_AWAKE_CMD) $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(1).allcheck $(1).checkall: bootstrap fetch - $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) + $(KEEP_AWAKE_CMD) $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) $(1).all: @echo "'make $(1).all' was renamed to 'make $(1).allcheck' (or use 'make $(1).allbuild' to build without unit tests)" @@ -170,10 +170,10 @@ gbuild_TARGETS := AllLangHelp \ # build a generic gbuild target $(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach module,$(gbuild_modules),$(target)_$(module)/%)) UIConfig_modules/% %.genpatch: bootstrap fetch - $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ + $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ $(gbuild_TARGETS): - $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ + $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ # # Clean @@ -291,9 +291,9 @@ bootstrap: check-if-root compilerplugins # build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset,install-gdb-printers) \ $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) - $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal) + $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal) ifeq ($(OS),iOS) - $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios + $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios endif build-non-l10n-only build-l10n-only check debugrun translations packageinfo coverage $(gb_Top_MODULE_CHECK_TARGETS): build diff --git a/config_host.mk.in b/config_host.mk.in index 1d5480bacf61..70d73f0a32f5 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -790,6 +790,8 @@ include $(BUILDDIR)/config_$(gb_Side)_lang.mk # does use some of the variables defined above include @SRC_ROOT@/download.lst +KEEP_AWAKE_CMD=@KEEP_AWAKE_CMD@ + # prep for WSL-as-helper-builds where build runs from within git-bash/MSYS that would otherwise # messes with anything that looks like a path (starts with /) but it cannot resolve export MSYS_NO_PATHCONV=1 diff --git a/configure.ac b/configure.ac index 4263116f894b..1650686382ef 100644 --- a/configure.ac +++ b/configure.ac @@ -2810,6 +2810,13 @@ AC_ARG_WITH(gtk3-build, [(Windows-only) In order to build GtkTiledViewer on Windows, pass the path to a GTK3 build, like '--with-gtk3-build=C:/gtk-build/gtk/x64/release'.])) +AC_ARG_WITH(keep-awake, +AS_HELP_STRING([--with-keep-awake], +[command to prefix make with in order to prevent the system from going to sleep/suspend + while
[Libreoffice-commits] core.git: config_host.mk.in configure.ac Makefile.in
Makefile.in |8 +--- config_host.mk.in |1 + configure.ac |8 3 files changed, 14 insertions(+), 3 deletions(-) New commits: commit c716b3888e7e8150d1c1053ee6550afb56438b1f Author: Riccardo Magliocchetti Date: Tue Nov 4 16:26:45 2014 +0100 Add build support for iwyu include-what-you-use is a tool to help removing unneeded includes. Homepage: https://code.google.com/p/include-what-you-use/ So to use it pass its path to configure like: ./configure --with-iwyu=/usr/bin/include-what-you-use May be helpful for fdo#42949 Change-Id: Idc185c5181d754b9dfd82fcf6a5ad05953b3cd03 Reviewed-on: https://gerrit.libreoffice.org/12255 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/Makefile.in b/Makefile.in index c13deb4..a051625 100644 --- a/Makefile.in +++ b/Makefile.in @@ -60,6 +60,8 @@ export GMAKE_OPTIONS?=-r$(if $(verbose)$(VERBOSE),,s)$(value $(MAKEFLAGS)) PARALLELISM_OPTION := $(if $(filter-out 0,$(PARALLELISM)),-j $(PARALLELISM),) +IWYU_OPTION := $(if $(IWYU_PATH),-k CXX=$(IWYU_PATH),) + # # Partial Build # @@ -67,13 +69,13 @@ define gb_Top_GbuildModuleRules .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)) $(1): bootstrap fetch - cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) + cd $(SRCDIR)/$(2) && $$(MAKE) $(IWYU_OPTION) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $(1).build $(1).check $(1).clean $(1).showdeliverables $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)): cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) $(1).all: bootstrap fetch - $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)) + $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)) endef @@ -230,7 +232,7 @@ build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),) mkdir -p $(INSTDIR) && install-gdb-printers -a $(INSTDIR) -c endif - $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal) + $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal) ifeq ($(OS),IOS) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios endif diff --git a/config_host.mk.in b/config_host.mk.in index 19bee1a..98dad1d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -283,6 +283,7 @@ export INSTDIR=@INSTDIR@ export INSTDIR_FOR_BUILD=@INSTDIR_FOR_BUILD@ export INSTROOT=@INSTROOT@ export INSTROOT_FOR_BUILD=@INSTROOT_FOR_BUILD@ +export IWYU_PATH=@IWYU_PATH@ export JAVACISGCJ=@JAVACISGCJ@ export JAVACOMPILER=@JAVACOMPILER@ export JAVADOC=@JAVADOC@ diff --git a/configure.ac b/configure.ac index 84505ba..26f7b79 100644 --- a/configure.ac +++ b/configure.ac @@ -2093,6 +2093,12 @@ AC_ARG_WITH(gssapi, where a good system GSSAPI is available.]), ,) +AC_ARG_WITH(iwyu, +AS_HELP_STRING([--with-iwyu], +[Provide IWYU binary path to check unneeded includes instead of building. + Use only if you are hacking on it.]), +,) + dnl === dnl Branding dnl === @@ -12503,6 +12509,8 @@ else fi AC_SUBST(PARALLELISM) +IWYU_PATH="$with_iwyu" +AC_SUBST(IWYU_PATH) # # Set up ILIB for MSVC build # ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac Makefile.in
Makefile.in |9 +
config_host.mk.in |1 +
configure.ac | 38 +-
3 files changed, 47 insertions(+), 1 deletion(-)
New commits:
commit 8ff6bfb75de0fb073a7e38941fd8f10c855d3825
Author: Tor Lillqvist
Date: Fri Jun 6 18:51:48 2014 +0300
Add --enable-macosx-package-signing
Change-Id: I355158f6cb584d252a21dfbce6e7cea6c70bba99
diff --git a/Makefile.in b/Makefile.in
index 7d2de76..8379be5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -299,6 +299,15 @@ endif
endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
+mac-app-store-package: test-install
+ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+ mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app"
+ productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign
$(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' '
'-').pkg
+else
+ @echo You did not provide an installer signing identity with
--enable-macosx-package-signing
+ @exit 1
+endif
+
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration
diff --git a/config_host.mk.in b/config_host.mk.in
index 1bc0da0..b7e5b6c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -362,6 +362,7 @@ export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
export MACOSX_APP_NAME=@MACOSX_APP_NAME@
export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
+export MACOSX_PACKAGE_SIGNING_IDENTITY=@MACOSX_PACKAGE_SIGNING_IDENTITY@
export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@
export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@
diff --git a/configure.ac b/configure.ac
index 3ef3ce2..63e9667 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1280,12 +1280,19 @@ AC_ARG_ENABLE(macosx-retina,
,)
AC_ARG_ENABLE(macosx-code-signing,
-AS_HELP_STRING([--enable-macosx-code-signing<=identity>],
+AS_HELP_STRING([--enable-macosx-code-signing=],
[Sign executables, dylibs, frameworks and the app bundle. If you
don't provide an identity the first suitable certificate
in your keychain is used.]),
,)
+AC_ARG_ENABLE(macosx-package-signing,
+AS_HELP_STRING([--enable-macosx-package-signing=],
+[Create a .pkg suitable for uploading to the Mac App Store and sign
+ it. If you don't provide an identity the first suitable certificate
+ in your keychain is used.]),
+,)
+
AC_ARG_ENABLE(macosx-sandbox,
AS_HELP_STRING([--enable-macosx-sandbox],
[Make the app bundle run in a sandbox. Requires code signing.
@@ -2984,6 +2991,34 @@ if test $_os = Darwin; then
AC_MSG_RESULT([no])
fi
+AC_MSG_CHECKING([whether to create a Mac App Store package])
+
+if test -n "$enable_macosx_package_signing" -a -z
"$MACOSX_CODESIGNING_IDENTITY"; then
+AC_MSG_ERROR([You forgot --enable-macosx-code-signing])
+elif test "$enable_macosx_package_signing" = yes; then
+# By default use the first suitable certificate.
+# It should be a "3rd Party Mac Developer Installer" one
+
+identity=`security find-identity -v 2>/dev/null | grep '3rd Party Mac
Developer Installer:' | awk '{print $2}' |head -1`
+if test -n "$identity"; then
+MACOSX_PACKAGE_SIGNING_IDENTITY=$identity
+pretty_name=`security find-identity -v | grep
"$MACOSX_PACKAGE_SIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'`
+AC_MSG_RESULT([yes, using the identity
$MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name])
+else
+AC_MSG_ERROR([Could not find any suitable '3rd Party Mac Developer
Installer' certificate])
+fi
+elif test -n "$enable_macosx_package_signing"; then
+MACOSX_PACKAGE_SIGNING_IDENTITY=$enable_macosx_package_signing
+pretty_name=`security find-identity -v | grep
"$MACOSX_PACKAGE_SIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'`
+AC_MSG_RESULT([yes, using the identity
$MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name])
+else
+AC_MSG_RESULT([no])
+fi
+
+if test -n "$MACOSX_CODESIGNING_IDENTITY" -a -n
"$MACOSX_PACKAGE_SIGNING_IDENTITY" -a "$MACOSX_CODESIGNING_IDENTITY" =
"$MACOSX_PACKAGE_SIGNING_IDENTITY"; then
+AC_MSG_ERROR([You should not use the same identity for code and
package signing])
+fi
+
AC_MSG_CHECKING([whether to sandbox the application])
if test -z "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" =
yes; then
@@ -3022,6 +3057,7 @@ AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
AC_SUBST(INSTALL_NAME_TOOL)
AC_SUBST(LIBTOOL) # Note that the OS X libtool command is unrelated to GNU
libtool
AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
+AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY)
AC_SUBST(ENABLE_MACOSX_SANDBOX)
AC_SUBST(MACOSX_
[Libreoffice-commits] core.git: config_host.mk.in configure.ac Makefile.in
Makefile.in | 29 -
config_host.mk.in |1 -
configure.ac | 11 ---
3 files changed, 8 insertions(+), 33 deletions(-)
New commits:
commit 4eebd65858655eef3f39e40ecbe74c505f6b4688
Author: Bjoern Michaelsen
Date: Tue Nov 19 14:25:45 2013 +0100
fix Makefile.in
- unify ~all gbuild targets to one gbuild call
- kill CHECK_PARALLELISM as we dont respect it consistently anyway
- ${MODULE}.subsequentcheck needs no specialcasing now anymore too
- should fix e.g. "make unitcheck slowcheck subsequentcheck" calls
Change-Id: I4238d7de599cb9fbaf09f60539d6655b85b87c29
Reviewed-on: https://gerrit.libreoffice.org/6722
Reviewed-by: Michael Stahl
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/Makefile.in b/Makefile.in
index 443f758..76d4abf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-.PHONY : all bootstrap build build-non-l10n-only build-l10n-only check clean
clean-build clean-host test-install distclean distro-pack-install docs download
fetch findunusedcode get-submodules id install install-strip subsequentcheck
tags
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check
clean clean-build clean-host test-install distclean distro-pack-install docs
download fetch findunusedcode get-submodules id install install-strip
subsequentcheck tags debugrun help slowcheck translations unitcheck
ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS:=all
@@ -79,12 +79,9 @@ define gbuild_module_rules
$(1): bootstrap fetch
cd $(SRCDIR)/$(2) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
-$(1).build $(1).check $(1).clean $(1).showdeliverables:
+$(1).build $(1).check $(1).clean $(1).showdeliverables $(1).subsequentcheck:
cd $(SRCDIR)/$(2) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
$$(patsubst $(1).%,%,$$@)
-$(1).subsequentcheck:
- cd $(SRCDIR)/$(2) && $(GNUMAKE) -j $(CHECK_PARALLELISM)
$(GMAKE_OPTIONS) subsequentcheck
-
$(1).all: bootstrap fetch
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if
$(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1)
$(WORKDIR)/Module/slowcheck/$(1))
@@ -231,23 +228,22 @@ bootstrap: compilerplugins
#
# Build
#
-# Note: if invoked as "make check" this will also run subsequentcheck!
+# Note: this will pipe through all gbuild targets to ... gbuild
+# with some translations like "build"->"all" for historic reasons
#
build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
mkdir -p $(INSTDIR) && install-gdb-printers -a $(INSTDIR) -c
endif
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild \
- all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)
+ $(if $(filter build,$(MAKECMDGOALS)),all) \
+ $(if $(filter build-nocheck,$(MAKECMDGOALS)),build) \
+ $(filter all build-l10n-only build-non-l10n-only debugrun help
slowcheck translations unitcheck subsequentcheck,$(MAKECMDGOALS))
ifeq ($(OS),IOS)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
endif
-build-nocheck: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild build
-
-build-l10n-only build-non-l10n-only: bootstrap fetch $(if
$(CROSS_COMPILING),cross-toolset)
- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild $@
+build-nocheck check debugrun help slowcheck translations unitcheck
subsequentcheck : build
cross-toolset: bootstrap fetch
$(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild build-tools
@@ -384,8 +380,6 @@ findunusedcode:
findunusedheaders:
$(SRCDIR)/bin/find-unusedheaders.pl
-# the actual running of subsequentcheck is now done in "build" target => faster
-check: build
dump-deps:
@$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild
@@ -393,13 +387,6 @@ dump-deps:
dump-deps-png:
@$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild |
dot -Tpng -o lo.png
-subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),build)
- $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild $@
-
-.PHONY : debugrun help slowcheck translations unitcheck
-debugrun help slowcheck translations unitcheck :
- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild $@
-
define GbuildToIdeIntegration
$(1)-ide-integration:
cd $(SRCDIR) && (make cmd -npf Makefile.gbuild all || true) |
$(SRCDIR)/bin/gbuild-to-ide --ide $(1)
diff --git a/config_host.mk.in b/config_host.mk.in
index dc1b454..92c6d51 100755
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -50,7 +50,6 @@
[Libreoffice-commits] core.git: config_host.mk.in configure.ac Makefile.in solenv/gbuild
Makefile.in |1 +
config_host.mk.in|1 +
configure.ac |4
solenv/gbuild/Package.mk | 24 +++-
solenv/gbuild/TargetLocations.mk |1 +
5 files changed, 26 insertions(+), 5 deletions(-)
New commits:
commit bba6e9ebeb67235ee77e723af354474d5a3e9b85
Author: David Tardon
Date: Wed Apr 3 17:13:32 2013 +0200
allow Package to install to other dir than $OUTDIR
This is preparatory work for creating installation directly by gbuild.
Change-Id: I1b11db37c76ff781731845650169f39cb78fe820
Reviewed-on: https://gerrit.libreoffice.org/3189
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/Makefile.in b/Makefile.in
index ecfbc1c..fd4cba6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -138,6 +138,7 @@ clean: clean-host clean-build
clean-host:
rm -fr $(DEVINSTALLDIR)
+ rm -fr $(INSTDIR)
rm -fr $(OUTDIR)
rm -fr $(WORKDIR)
rm -fr install
diff --git a/config_host.mk.in b/config_host.mk.in
index e7c1a0e..66a5c68 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -247,6 +247,7 @@ export
ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
export ILIB=@ILIB@
export INPATH=@INPATH@
export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
+export INSTDIR=@INSTDIR@
export INSTALLDIR=@INSTALLDIR@
export INSTALLDIRNAME=@INSTALLDIRNAME@
export INTRO_BITMAP=@INTRO_BITMAP@
diff --git a/configure.ac b/configure.ac
index c460f73..912c111 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3896,11 +3896,14 @@ if test -n "${with_solver_and_workdir_root}"; then
# IsValidFilePath in /sal/osl/w32/file_url.cxx rejects "X:\\" breaking idlc
if echo ${formatted_path} | $GREP -q '/$'; then
WORKDIR=${formatted_path}workdir/${INPATH}
+INSTDIR=${formatted_path}instdir/${INPATH}
else
WORKDIR=${formatted_path}/workdir/${INPATH}
+INSTDIR=${formatted_path}/instdir/${INPATH}
fi
else
WORKDIR=${BUILDDIR}/workdir/${INPATH}
+INSTDIR=${BUILDDIR}/instdir/${INPATH}
fi
OUTDIR="${SOLARVER}/${INPATH}"
SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc
-I$SRC_ROOT/solenv/inc $SOLARINC"
@@ -3913,6 +3916,7 @@ AC_SUBST(EPM_FLAGS)
AC_SUBST(GUI)
AC_SUBST(GUIBASE)
AC_SUBST(INPATH)
+AC_SUBST([INSTDIR])
AC_SUBST(OS)
AC_SUBST(OUTDIR)
AC_SUBST(OUTPATH)
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 6642a89..c239897 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -44,10 +44,13 @@ endef
$(foreach destination,$(call gb_PackagePart_get_destinations),$(eval \
$(call gb_PackagePart__rule,$(destination
+# Deliver one file to the output dir.
+#
+# gb_PackagePart_PackagePart destfile source prep-target outdir
define gb_PackagePart_PackagePart
-$(OUTDIR)/$(1) : $(2) | $(dir $(OUTDIR)/$(1)).dir
+$(4)/$(1) : $(2) | $(dir $(4)/$(1)).dir
$(2) :| $(3)
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2),$(3))
+$(call gb_Deliver_add_deliverable,$(4)/$(1),$(2),$(3))
endef
@@ -70,6 +73,7 @@ $(call gb_Package_get_target,%) :
# for other targets that want to create Packages, does not register at Module
define gb_Package_Package_internal
gb_Package_SOURCEDIR_$(1) := $(2)
+gb_Package_OUTDIR_$(1) := $(OUTDIR)
$(call gb_Package_get_clean_target,$(1)) : FILES := $(call
gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1))
$(call gb_Package_get_target,$(1)) : $(call
gb_Package_get_preparation_target,$(1))
@@ -83,10 +87,20 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Package)
endef
+# Set output dir for the package files.
+#
+# Default is $(OUTDIR).
+#
+# gb_Package_set_outdir package outdir
+define gb_Package_set_outdir
+gb_Package_OUTDIR_$(1) := $(2)
+
+endef
+
define gb_Package_add_file
-$(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2)
-$(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2)
-$(call
gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call
gb_Package_get_preparation_target,$(1)))
+$(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
+$(call gb_Package_get_clean_target,$(1)) : FILES +=
$$(gb_Package_OUTDIR_$(1))/$(2)
+$(call
gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call
gb_Package_get_preparation_target,$(1)),$$(gb_Package_OUTDIR_$(1)))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b738b65..a8cf8a4 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -39,6 +39,7 @@ gb_Extension_get_target = $(OUTDIR)/bin/$(1).oxt
gb_HelpTarget_get_outdir_target = $(OUTDIR)/pck/$(1).zip
gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
gb_PackagePart_get_destinations = \
+ $(INSTDIR) \
$(OUTDIR)/bin \
$(OUTDIR)/inc \
$(OUTDIR)/lib \
___
Libre
[Libreoffice-commits] core.git: config_host.mk.in configure.ac Makefile.in
Makefile.in |8
config_host.mk.in |1 -
configure.ac | 19 ---
3 files changed, 28 deletions(-)
New commits:
commit f6251134c94c5424dac633a107e07a2403e3a56d
Author: Miklos Vajna
Date: Fri Feb 15 11:42:59 2013 +0100
configure: drop no longer working --with-linked-git option
--with-referenced-git works with submodules, --with-linked-git does not.
And I don't see a way to fix it, either.
Change-Id: Ib6cdb065a022665cd62e9fdc7fc37a9e916e50ad
Reviewed-on: https://gerrit.libreoffice.org/2165
Reviewed-by: Matúš Kukan
Reviewed-by: Björn Michaelsen
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/Makefile.in b/Makefile.in
index 445daa0..8f87840 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -222,15 +222,7 @@ fetch: get-submodules
ifneq (,$(wildcard $(SRCDIR)/.git))
get-submodules:
ifneq ($(foreach i,$(GIT_NEEDED_SUBMODULES),$(i)/.git),$(wildcard $(foreach
i,$(GIT_NEEDED_SUBMODULES),$(i)/.git)))
-ifeq (,$(GIT_LINK_SRC))
cd $(SRCDIR) && ./g -f clone
-else # space-saving clone from another local workdir
- @echo "FIXME: GIT_LINK_SRC method is not yet implemented with
submodules" 1>&2
- true $(foreach i,$(GIT_NEEDED_SUBMODULES),\
- && rm -r $(i) && cp -R $(GIT_LINK_SRC)/$(i) $(i))
-# bin/git-new-workdir $GIT_LINK_SRC/$i $i
- git submodule update $(GIT_NEEDED_SUBMODULES)
-endif
endif
@cd $(SRCDIR) && ./g -z # make sure the git hooks are in place enen if
no submodules are needed
diff --git a/config_host.mk.in b/config_host.mk.in
index 803be08..b24ea7b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -188,7 +188,6 @@ export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
-export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 1061507..e5a7e5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1194,14 +1194,6 @@ AC_ARG_WITH(solver-and-workdir-root,
[Specify path that contains SOLARVER and WORKDIR directories
manually.])
)
-AC_ARG_WITH(linked-git,
-AS_HELP_STRING([--with-linked-git=],
-[Specify another checkout's clonedir to re-use. This makes use of
- git-new-workdir, and saves a lot of diskspace when having
multiple
- trees side-by-side.]),
-GIT_LINK_SRC=$withval ,
-)
-
AC_ARG_WITH(referenced-git,
AS_HELP_STRING([--with-referenced-git=],
[Specify another checkout directory to reference. This makes use of
@@ -11945,17 +11937,6 @@ fi
AC_SUBST(L10N_MODULE)
AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
-dnl git-new-workdir
-dnl ===
-if test -n "${GIT_LINK_SRC}"; then
-for repo in ${GIT_NEEDED_SUBMODULES}; do
-if ! test -d "${GIT_LINK_SRC}"/${repo}; then
-AC_MSG_ERROR([linked git: required repository does not exist:
${GIT_LINK_SRC}/${repo}])
-fi
-done
-fi
-AC_SUBST(GIT_LINK_SRC)
-
dnl git submodule update --reference
dnl ===
if test -n "${GIT_REFERENCE_SRC}"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
