openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1818099 - in /openoffice/trunk/main/solenv/gbuild: BuildDirs.mk Output.mk
Date Thu, 14 Dec 2017 09:48:54 GMT
Author: ydario
Date: Thu Dec 14 09:48:54 2017
New Revision: 1818099

URL: http://svn.apache.org/viewvc?rev=1818099&view=rev
Log:
#i126518# OS/2 environment vars are uppercase, breaks gnu make rules. Ignore escape sequence.

Modified:
    openoffice/trunk/main/solenv/gbuild/BuildDirs.mk
    openoffice/trunk/main/solenv/gbuild/Output.mk

Modified: openoffice/trunk/main/solenv/gbuild/BuildDirs.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/BuildDirs.mk?rev=1818099&r1=1818098&r2=1818099&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/BuildDirs.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/BuildDirs.mk Thu Dec 14 09:48:54 2017
@@ -32,6 +32,11 @@ ifneq ($(and $(gb_LOCALBUILDDIR),$(wildc
 include $(gb_LOCALBUILDDIR)/SetupLocal.mk
 endif
 
+# env variables names are uppercase only
+ifeq ($(OS),OS2)
+gb_REPOS = $(GB_REPOS)
+endif
+
 ifeq ($(strip $(gb_REPOS)),)
 gb_REPOS := $(SOLARSRC)
 endif

Modified: openoffice/trunk/main/solenv/gbuild/Output.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Output.mk?rev=1818099&r1=1818098&r2=1818099&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Output.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Output.mk Thu Dec 14 09:48:54 2017
@@ -49,8 +49,18 @@ define gb_Output_warn
 $(warning $(NEWLINE)[ WARN  $(2) ] !!!$(NEWLINE)[ WARN  $(2) ] !!! $(1)$(NEWLINE)[ WARN 
$(2) ] !!!)
 endef
 
-gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
+# env variables names are uppercase only
+ifeq ($(OS),OS2)
+gb_COLOR = $(GB_COLOR)
+gb_TITLES = $(GB_TITLES)
+endif
+
+# disable for OS/2
+ifneq ($(OS),OS2)
+gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 7 }' -)
+endif
+
 
 # only enable colorized output if
 # - gb_COLOR is set



Mime
View raw message