solenv/gbuild/AllLangResTarget.mk | 2 solenv/gbuild/Helper.mk | 10 +-- solenv/gbuild/Library.mk | 1 solenv/gbuild/StaticLibrary.mk | 1 solenv/gbuild/TargetLocations.mk | 4 - solenv/gbuild/gbuild.mk | 101 ++++++++------------------------ solenv/gbuild/platform/WNT_INTEL_MSC.mk | 3 solenv/gbuild/platform/com_GCC_defs.mk | 4 + solenv/gbuild/platform/solaris.mk | 2 solenv/gbuild/platform/unxgcc.mk | 2 soltools/Executable_makedepend.mk | 4 - 11 files changed, 41 insertions(+), 93 deletions(-)
New commits: commit 898f54e72fc71d04c5090f3c7380e3bfce750adf Author: Matúš Kukan <[email protected]> Date: Sat Sep 29 19:54:00 2012 +0200 Revert "gb_PYTHON_PRECOMMAND is only defined after gb_PYTHON" This reverts commit 34061bf6d4fe8b80f46a97b8fbeddc18247e8bf7. gb_PYTHON was moved again in dec68c6684298cbcb793651f1221f842efd794e3. diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b50faa0..a83bd30 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -216,7 +216,7 @@ else ifeq ($(DISABLE_PYTHON),TRUE) gb_PYTHON := python else gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) -gb_PYTHON = $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) +gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) endif ifneq (,$(SYSTEM_UCPP)) commit 7cafe7ee9c0fe52c2b93fde59b35475a5b208f0b Author: Matúš Kukan <[email protected]> Date: Sat Sep 29 19:21:05 2012 +0200 vertical space savings Change-Id: I8f73a804e2005108f4a47d9fe4f9cd4425787cb1 diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 9817ef2..e1e5119 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -176,6 +176,10 @@ gb_Jar_$(1) += $(2) endef +define gb_Helper_define_if_set +$(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def))) +endef + define gb_Helper_execute $(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 395c966..b50faa0 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -245,12 +245,10 @@ gb_GLOBALDEFS := \ ifeq ($(gb_PRODUCT),$(false)) -gb_GLOBALDEFS += \ - -DDBG_UTIL \ +gb_GLOBALDEFS += -DDBG_UTIL \ ifneq ($(COM),MSC) -gb_GLOBALDEFS += \ - -D_DEBUG \ +gb_GLOBALDEFS += -D_DEBUG \ endif endif @@ -260,80 +258,47 @@ gb_GLOBALDEFS += -DSOLAR_JAVA endif ifeq ($(gb_TIMELOG),1) -gb_GLOBALDEFS += \ - -DTIMELOG \ +gb_GLOBALDEFS += -DTIMELOG \ endif ifeq ($(gb_DEBUGLEVEL),0) -gb_GLOBALDEFS += \ - -DOPTIMIZE \ +gb_GLOBALDEFS += -DOPTIMIZE \ ifeq ($(strip $(ASSERT_ALWAYS_ABORT)),FALSE) -gb_GLOBALDEFS += \ - -DNDEBUG \ +gb_GLOBALDEFS += -DNDEBUG \ endif else -gb_GLOBALDEFS += \ - -DSAL_LOG_INFO \ - -DSAL_LOG_WARN \ +gb_GLOBALDEFS += -DSAL_LOG_INFO \ + -DSAL_LOG_WARN \ ifneq ($(gb_DEBUGLEVEL),1) # 2 or more -gb_GLOBALDEFS += \ - -DDEBUG \ - -endif -endif - -ifneq ($(strip $(ENABLE_GTK)),) -gb_GLOBALDEFS += -DENABLE_GTK -endif - -ifneq ($(strip $(ENABLE_TDE)),) -gb_GLOBALDEFS += -DENABLE_TDE -endif +gb_GLOBALDEFS += -DDEBUG \ -ifneq ($(strip $(ENABLE_KDE)),) -gb_GLOBALDEFS += -DENABLE_KDE endif - -ifneq ($(strip $(ENABLE_KDE4)),) -gb_GLOBALDEFS += -DENABLE_KDE4 -endif - -ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE) -gb_GLOBALDEFS += -DENABLE_GRAPHITE -endif - -ifeq ($(strip $(ENABLE_HEADLESS)),TRUE) -gb_GLOBALDEFS += -DLIBO_HEADLESS -endif - -ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE) -gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY endif -ifeq ($(strip $(DISABLE_EXTENSIONS)),TRUE) -gb_GLOBALDEFS += -DDISABLE_EXTENSIONS -endif - -ifeq ($(strip $(DISABLE_SCRIPTING)),TRUE) -gb_GLOBALDEFS += -DDISABLE_SCRIPTING -endif +ifeq ($(ENABLE_HEADLESS),TRUE) +gb_GLOBALDEFS += -DLIBO_HEADLESS \ -ifeq ($(strip $(DISABLE_DYNLOADING)),TRUE) -gb_GLOBALDEFS += -DDISABLE_DYNLOADING endif -ifeq ($(HAVE_THREADSAFE_STATICS),TRUE) -gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS -endif - -ifeq ($(ENABLE_TELEPATHY),TRUE) -gb_GLOBALDEFS += -DENABLE_TELEPATHY -endif +gb_GLOBALDEFS += \ + $(call gb_Helper_define_if_set,\ + DISABLE_DBCONNECTIVITY \ + DISABLE_DYNLOADING \ + DISABLE_EXTENSIONS \ + DISABLE_SCRIPTING \ + ENABLE_GRAPHITE \ + ENABLE_GTK \ + ENABLE_KDE \ + ENABLE_KDE4 \ + ENABLE_TDE \ + ENABLE_TELEPATHY \ + HAVE_THREADSAFE_STATICS \ + ) gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) commit 5753241d8869e7a3f64c535e4d23f125a7aed683 Author: Matúš Kukan <[email protected]> Date: Sat Sep 29 18:47:40 2012 +0200 move gb_Executable_EXT_for_build to platform/ Change-Id: Ica30efee4fcd030dcc063321ba678a00bec726cd diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index a82f98f..866593d 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -73,7 +73,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) # defined by platform # gb_SrsPartTarget__command_dep -gb_ResTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc$(gb_Executable_EXT_for_build) +gb_ResTarget_RSCTARGET := $(call gb_Executable_get_target_for_build,rsc) gb_ResTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_ResTarget_RSCTARGET) define gb_SrsPartTarget__command diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9d521c7..395c966 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -179,13 +179,6 @@ include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk include $(SRCDIR)/RepositoryFixes.mk -ifeq ($(CROSS_COMPILING),YES) -# We can safely Assume all cross-compilation is from Unix systems. -gb_Executable_EXT_for_build := -else -gb_Executable_EXT_for_build := $(gb_Executable_EXT) -endif - # Set up build tools that can be either internal or system. It is # necessary to do it before we start including gbuild class makefiles, # so the classes can add dependencies on them. diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index f6cae6a..a232b66 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -521,6 +521,7 @@ endef # Executable class gb_Executable_EXT := .exe +gb_Executable_EXT_for_build := .exe gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS) gb_Executable_get_rpath := diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index e03aa88..0cc86e3 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -149,6 +149,10 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) +# Executable class + +gb_Executable_EXT_for_build := + # Helper class ifeq ($(OS_FOR_BUILD),MACOSX) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 4b26f02..47c12d2 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -26,8 +26,6 @@ # #************************************************************************* -gb_Executable_EXT:= - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_MKTEMP := mktemp -t gbuild.XXXXXX diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0957e4a..d996bd4 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -26,8 +26,6 @@ # #************************************************************************* -gb_Executable_EXT:= - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }') commit d3f8bf8334bcc701aca2f4687530bde8f2c2c018 Author: Matúš Kukan <[email protected]> Date: Fri Sep 28 22:18:07 2012 +0200 gbuild: gb_Library_TARGETS should really not be needed now Change-Id: I1a5f2fda44da782b43076eee67e292affe1bad1a diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index c210cd7..9817ef2 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -108,12 +108,6 @@ $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(eval gb_Jar_$$(group) :=)) endef -define gb_Helper_collect_libtargets -gb_Library_TARGETS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) -gb_StaticLibrary_TARGETS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) - -endef - define gb_Helper_collect_knownlibs gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 5182111..d07fe24 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -37,7 +37,6 @@ # gb_Library_DLLFILENAMES # gb_Library_FILENAMES # gb_Library_Library_platform -# gb_Library_TARGETS # doesn't do anything, just used for hooking up component target .PHONY: $(call gb_Library__get_final_target,%) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 124b009..a09f720 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -33,7 +33,6 @@ # gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib # defined by platform # gb_StaticLibrary_FILENAMES -# gb_StaticLibrary_TARGETS # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 28c7dd4..f3b92a3 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -67,11 +67,11 @@ gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1) define gb_Library_get_target -$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES))) +$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_Library_FILENAMES))) endef define gb_StaticLibrary_get_target -$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES))) +$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index a8f76bf..9d521c7 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -165,17 +165,20 @@ endif include $(GBUILDDIR)/Helper.mk include $(GBUILDDIR)/TargetLocations.mk +include $(GBUILDDIR)/Tempfile.mk $(eval $(call gb_Helper_init_registries)) include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk -$(eval $(call gb_Helper_collect_libtargets)) +$(eval $(call gb_Helper_collect_knownlibs)) gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk +include $(SRCDIR)/RepositoryFixes.mk + ifeq ($(CROSS_COMPILING),YES) # We can safely Assume all cross-compilation is from Unix systems. gb_Executable_EXT_for_build := @@ -229,12 +232,6 @@ else gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) endif -include $(GBUILDDIR)/Tempfile.mk - -include $(SRCDIR)/RepositoryFixes.mk - -$(eval $(call gb_Helper_collect_knownlibs)) - # add user-supplied flags ifneq ($(strip gb__ENV_CFLAGS),) gb_LinkTarget_CFLAGS += $(gb__ENV_CFLAGS) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 600fa43..f6cae6a 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -417,7 +417,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ gb_Library_FILENAMES :=\ - $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ + $(foreach lib,$(gb_Library_KNOWNLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ gb_Library_DLLEXT := .dll gb_Library_MAJORVER := 3 commit 0473dbefb23c10b4f801b9449462c87dd0ebad55 Author: Matúš Kukan <[email protected]> Date: Sat Sep 29 19:46:34 2012 +0200 soltools: fix windows build Change-Id: Iac8321655a18826f9adcf8aed8075cce1aa24652 diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk index e6e7ac6..e301a09 100644 --- a/soltools/Executable_makedepend.mk +++ b/soltools/Executable_makedepend.mk @@ -25,10 +25,6 @@ $(eval $(call gb_Executable_add_defs,makedepend,\ -wd4131 \ -wd4706 \ )) - -$(eval $(call gb_Executable_use_libraries,makedepend,\ - msvcprt \ -)) endif $(eval $(call gb_Executable_add_cobjects,makedepend,\
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
