diff options
| author | Arjun <pikabell70@gmail.com> | 2022-01-23 16:14:07 +0530 |
|---|---|---|
| committer | Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> | 2022-01-23 17:54:44 +0100 |
| commit | 1cc2690fe2f87e8acce4e9b4e0cb533fda26e295 (patch) | |
| tree | 1003854a6bbe2acde4e0d9590768df24668eea42 /solenv/gbuild | |
| parent | fb1e658bbdc2e6f9d316fdf9a1d08b414d72c9a7 (diff) | |
tdf#97046 prefix gb_ to system variables
Change-Id: I8be2f55e3306d7ac34ea5819ab93fd537315b281
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128804
Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Output.mk | 14 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk index 4e3b5b92ef22..c4b992df4443 100644 --- a/solenv/gbuild/Output.mk +++ b/solenv/gbuild/Output.mk @@ -61,13 +61,13 @@ endif # only enable colorized output if # - gb_COLOR is set # - we have a known term -KNOWN_TERM:=Eterm aterm gnome kterm linux putty rxvt rxvt-unicode screen xterm xterm xtermc cygwin -KNOWN_TERM+=$(patsubst %,%-color,$(KNOWN_TERM)) -KNOWN_TERM+=$(patsubst %-color,%-256color,$(KNOWN_TERM)) -KNOWN_TERM+=$(patsubst %-color,%+256color,$(KNOWN_TERM)) -KNOWN_TERM+=$(patsubst %,screen.%,$(KNOWN_TERM)) +gb_KNOWN_TERM:=Eterm aterm gnome kterm linux putty rxvt rxvt-unicode screen xterm xterm xtermc cygwin +gb_KNOWN_TERM+=$(patsubst %,%-color,$(gb_KNOWN_TERM)) +gb_KNOWN_TERM+=$(patsubst %-color,%-256color,$(gb_KNOWN_TERM)) +gb_KNOWN_TERM+=$(patsubst %-color,%+256color,$(gb_KNOWN_TERM)) +gb_KNOWN_TERM+=$(patsubst %,screen.%,$(gb_KNOWN_TERM)) ifneq ($(strip $(gb_COLOR)),) -ifneq ($(filter $(TERM),$(KNOWN_TERM)),) +ifneq ($(filter $(TERM),$(gb_KNOWN_TERM)),) gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE) @@ -127,7 +127,7 @@ endif # - gb_TITLES is set # - we have a known term ifneq ($(strip $(gb_TITLES)),) -ifneq ($(filter $(TERM),$(KNOWN_TERM)),) +ifneq ($(filter $(TERM),$(gb_KNOWN_TERM)),) define gb_Output_announce_title $(info $(gb_Output_ESCAPE)]2;gbuild: $(1)$(gb_Output_BELL)$(gb_Output_ESCAPE)[A) endef diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index d5bf6f9c0862..693d3bde824d 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -8,7 +8,7 @@ # # we link all object files from these libraries into one, merged library -MERGE_LIBRARY_LIST := \ +gb_MERGE_LIBRARY_LIST := \ avmedia \ $(if $(filter WNT,$(OS)),avmediawin) \ $(call gb_Helper_optional,SCRIPTING, \ @@ -112,13 +112,13 @@ MERGE_LIBRARY_LIST := \ # allow module-deps.pl to color based on this. ifneq ($(ENABLE_PRINT_DEPS),) -$(info MergeLibContents: $(MERGE_LIBRARY_LIST)) +$(info MergeLibContents: $(gb_MERGE_LIBRARY_LIST)) endif ifneq ($(MERGELIBS),) -gb_MERGEDLIBS := $(MERGE_LIBRARY_LIST) +gb_MERGEDLIBS := $(gb_MERGE_LIBRARY_LIST) endif diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 28657adb6aae..e82e73dd8aaa 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -241,7 +241,7 @@ cat $${RESPONSEFILE} | sed 's/ /\n/g' | grep -v '^$$' > $${RESPONSEFILE}.1 && \ mv $${RESPONSEFILE}.1 $${RESPONSEFILE} && endef -MSC_SUBSYSTEM_VERSION=$(COMMA)$(if $(filter AARCH64,$(CPUNAME)),6.02,6.01) +gb_MSC_SUBSYSTEM_VERSION=$(COMMA)$(if $(filter AARCH64,$(CPUNAME)),6.02,6.01) # the sort on the libraries is used to filter out duplicates to keep commandline # length in check - otherwise the dupes easily hit the limit when linking mergedlib @@ -268,7 +268,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter StaticLibrary,$(TARGETTYPE)),-LIB) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(T_SYMBOLS),$(if $(filter Executable Library CppunitTest,$(TARGETTYPE)),$(gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO)),) \ - $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), -SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION)) \ + $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(gb_MSC_SUBSYSTEM_VERSION), -SUBSYSTEM:CONSOLE$(gb_MSC_SUBSYSTEM_VERSION)) \ $(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \ $(if $(filter YES,$(PE_X86)), -MACHINE:X86) \ $(if $(filter YES,$(LIBRARY_X64)), \ |