[Libreoffice-commits] .: 3 commits - solenv/doc solenv/gbuild sw/source

Matus Kukan mkukan at kemper.freedesktop.org
Fri Feb 24 08:07:43 PST 2012 

 solenv/doc/gbuild/solenv/gbuild/gbuild.mk |    1 -
 solenv/gbuild/BuildDirs.mk                |   11 -----------
 solenv/gbuild/CustomTarget.mk             |    2 +-
 solenv/gbuild/Deliver.mk                  |    8 ++++----
 solenv/gbuild/Helper.mk                   |    5 ++---
 solenv/gbuild/gbuild.mk                   |   13 ++-----------
 solenv/gbuild/gbuild_simple.mk            |    6 +-----
 solenv/gbuild/platform/WNT_INTEL_GCC.mk   |    9 ---------
 solenv/gbuild/platform/WNT_INTEL_MSC.mk   |    6 +-----
 solenv/gbuild/platform/solaris.mk         |    1 -
 solenv/gbuild/processdeps.awk             |    5 -----
 sw/source/core/text/inftxt.cxx            |    2 +-
 12 files changed, 12 insertions(+), 57 deletions(-)

New commits:
commit b715e378aafc1015edcec797d938f72add993f25
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Feb 24 16:41:01 2012 +0100

    gbuild: little more cleaning

diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index 2b65f3f..6bb3a58 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -13,7 +13,6 @@ static Path WORKDIR;
 
 // Expected from configure/environment
 static const Integer OSL_DEBUG_LEVEL;
-static const List<Path> JDKINCS;
 static const List<Path> SOLARINC;
 static const List<Path> SOLARLIB;
 static const Path GBUILDDIR;
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 4005730..4aa7176 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -26,15 +26,6 @@
 #
 #*************************************************************************
 
-# extend for JDK include (seems only needed in setsolar env?)
-SOLARINC += $(JDKINCS)
-
-OUTDIR := $(SOLARVERSION)/$(INPATH)
-OUTDIR_FOR_BUILD := $(SOLARVERSION)/$(INPATH_FOR_BUILD)
-ifeq ($(strip $(SOLARENV)),)
-$(error SOLARENV variable is empty, no environment set, aborting)
-endif
-
 # The entire gbuild operates in unix paths, and then when calling the
 # native tools, converts them back to the Windows native paths.
 #
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 059b416..3eeff91 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -33,7 +33,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 # DEBUG
 # INPATH
 # JAVA_HOME
-# JDKINCS
 # LIBXML_CFLAGS
 # OS
 # PRODUCT
@@ -71,7 +70,7 @@ endif
 
 include $(GBUILDDIR)/Output.mk
 
-# BuildDirs uses the Output functions already
+# BuildDirs overrides *DIR variables for Windows
 include $(GBUILDDIR)/BuildDirs.mk
 
 
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index 8919d7e..3f7ba29 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -34,7 +34,7 @@ COMMA :=,
 
 include $(GBUILDDIR)/Output.mk
 
-# BuildDirs uses the Output functions already
+# BuildDirs overrides *DIR variables for Windows
 include $(GBUILDDIR)/BuildDirs.mk
 
 # Presumably the common parts in gbuild.mk and gbuild_simple.mk should
commit ea37d89410d8b1c3d23e7ed76ff2cecd9f44ee56
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Feb 24 14:55:20 2012 +0100

    gbuild: get rid of REPODIR

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 5955082..4005730 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -53,6 +53,4 @@ override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
 override SRCDIR := $(shell cygpath -u $(SRCDIR))
 endif
 
-REPODIR := $(patsubst %/,%,$(dir $(SRCDIR)))
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 2e60e7b..bcb4874 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -30,7 +30,7 @@
 define gb_CustomTarget__command
 +$(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
-	O='$(OUTDIR)' R='$(REPODIR)' S='$(SRCDIR)' W='$(WORKDIR)' gb_AWK='$(gb_AWK)' \
+	O='$(OUTDIR)' S='$(SRCDIR)' W='$(WORKDIR)' gb_AWK='$(gb_AWK)' \
 	gb_XSLTPROC='$(gb_XSLTPROC)' GBUILDDIR='$(GBUILDDIR)' SRCDIR='$(SRCDIR)' \
 	$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
 	touch $(1))
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 1387892..33ef182 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -40,7 +40,7 @@ gb_Deliver_DELIVERABLES_INDEX :=
 endef
 
 define gb_Deliver_register_deliverable
-gb_Deliver_DELIVERABLES_$(notdir $(3)) += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
+gb_Deliver_DELIVERABLES_$(notdir $(3)) += $(2):$(1)
 gb_Deliver_DELIVERABLES_INDEX := $(sort $(gb_Deliver_DELIVERABLES_INDEX) $(notdir $(3)))
 $(if $(gb_LOWRESTIME),.LOW_RESOLUTION_TIME : $(1),)
 
@@ -49,7 +49,7 @@ endef
 define gb_Deliver_add_deliverable
 $$(if $(3),,$$(error - missing third parameter for deliverable $(1)))
 ifeq ($(MAKECMDGOALS),showdeliverables)
-$(call gb_Deliver_register_deliverable,$(OUTDIR)/$(1),$(2),$(3))
+$(call gb_Deliver_register_deliverable,$(1),$(2),$(3))
 endif
 
 endef
@@ -71,13 +71,13 @@ $(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\
 endef
 
 define gb_Deliver_print_deliverable
-$(info $(1) $(patsubst $(OUTDIR)/%,%,$(2)))
+$(info $(1) $(2))
 endef
 
 showdeliverables :
 	$(eval MAKEFLAGS := s)
 	$(foreach deliverable,$(sort $(foreach list,$(gb_Deliver_DELIVERABLES_INDEX),$(gb_Deliver_DELIVERABLES_$(list)))),\
-			$(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
+			$(call gb_Deliver_print_deliverable,$(firstword $(subst :, ,$(deliverable))),$(lastword $(subst :, ,$(deliverable)))))
 	true
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 9655424..6700ef8 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -41,10 +41,9 @@ $(gb_Helper_MISCDUMMY) :
 	@mkdir -p $(dir $@) && touch $@
 
 define gb_Helper_abbreviate_dirs
-R=$(REPODIR) && \
-$(subst $(REPODIR)/,$$R/,S=$(SRCDIR) && \
+S=$(SRCDIR) && \
 $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \
-$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) && $(subst $(WORKDIR)/,$$W/,$(1)))))
+$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) && $(subst $(WORKDIR)/,$$W/,$(1))))
 endef
 
 define gb_Helper_abbreviate_dirs_native
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index bf6155b..4f19181 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -102,14 +102,6 @@ gb_STDLIBS := \
 
 # Helper class
 
-# For LibreOffice, MinGW is always cross-compilation, so the "native"
-# platform for the BUILD *is* Unix. No Cygwin/Win32 stuff needed.
-
-gb_Helper_SRCDIR_NATIVE := $(SRCDIR)
-gb_Helper_WORKDIR_NATIVE := $(WORKDIR)
-gb_Helper_OUTDIR_NATIVE := $(OUTDIR)
-gb_Helper_REPODIR_NATIVE := $(REPODIR)
-
 # Convert parameters filesystem root to native notation
 # does some real work only on Windows, and this file is for
 # cross-compilation.
@@ -440,7 +432,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
 	> $(call gb_WinResTarget_get_dep_target,$(1)))
 endef
 else
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 9780361..6402b42 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -244,7 +244,6 @@ endif
 gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }' | sed -e 's,\:/$$,:,')
 
 gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 
@@ -253,11 +252,10 @@ gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
 $(strip \
-$(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1))))))
+$(1)))))
 endef
 
 # YaccTarget class
@@ -657,7 +655,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
 	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 else
@@ -696,7 +693,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
 	> $(call gb_WinResTarget_get_dep_target,$(1)))
 endef
 else
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 0002102..d56ac2d 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -393,7 +393,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
 	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
diff --git a/solenv/gbuild/processdeps.awk b/solenv/gbuild/processdeps.awk
index 9014427..e564b0b 100644
--- a/solenv/gbuild/processdeps.awk
+++ b/solenv/gbuild/processdeps.awk
@@ -31,7 +31,6 @@
 #     -v OUTDIR=outdir \
 #     -v SRCDIR=srcdir \
 #     -v WORKDIR=workdir \
-#     -v REPODIR=repodir \
 #     -v OBJECTFILE=objectfile
 # called like this the script will read from stdin
 # and write to stdout. It will:
@@ -40,7 +39,6 @@
 #  - replace the string given as WORKDIR with $(WORKDIR)/
 #  - replace the string given as OUTDIR with $(OUTDIR)/
 #  - replace the string given as SRCDIR with $(SRCDIR)/
-#  - replace the string given as REPODIR with $(REPODIR)/
 #  - translates absolute mixed windows paths to cygwin paths by
 #    substituting a path starting with X:... to /cygdrive/X/...
 
@@ -51,7 +49,6 @@ function mangle_path(path) {
     gsub(WORKDIR, "$(WORKDIR)/", path);
     gsub(OUTDIR, "$(OUTDIR)/", path);
     gsub(SRCDIR, "$(SRCDIR)/", path);
-    gsub(REPODIR, "$(REPODIR)/", path);
     if( path ~ /^[a-zA-Z]:/ )
         path = "/cygdrive/" tolower(substr(path,0,1)) substr(path,3);
     return path;
@@ -61,11 +58,9 @@ BEGIN {
    WORKDIR = tolower(substr(WORKDIR,0,1)) substr(WORKDIR,2); 
    OUTDIR = tolower(substr(OUTDIR,0,1)) substr(OUTDIR,2); 
    SRCDIR = tolower(substr(SRCDIR,0,1)) substr(SRCDIR,2); 
-   REPODIR = tolower(substr(REPODIR,0,1)) substr(REPODIR,2); 
 #   print "# WORKDIR=" WORKDIR;
 #   print "# OUTDIR=" OUTDIR;
 #   print "# SRCDIR=" SRCDIR;
-#   print "# REPODIR=" REPODIR;
    print mangle_path(OBJECTFILE) ": \\";
 }
 
commit 4ee6123d0547b86eb42f193686eb50e0fd4da872
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Feb 24 13:57:49 2012 +0100

    Do not define PRUDUCT, we only use DBG_UTIL now

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0ae3a34..059b416 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -78,12 +78,8 @@ include $(GBUILDDIR)/BuildDirs.mk
 ifneq ($(strip $(PRODUCT)$(product)),)
 gb_PRODUCT := $(true)
 else
-ifneq ($(strip $(product)),)
-gb_PRODUCT := $(true)
-else
 gb_PRODUCT := $(false)
 endif
-endif
 
 ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
 gb_SYMBOL := $(true)
@@ -185,11 +181,7 @@ gb_GLOBALDEFS := \
 	$(gb_CPUDEFS) \
 
 
-ifeq ($(gb_PRODUCT),$(true))
-gb_GLOBALDEFS += \
-	-DPRODUCT \
-
-else
+ifeq ($(gb_PRODUCT),$(false))
 gb_GLOBALDEFS += \
 	-DDBG_UTIL \
 
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index a4cdb0d..8919d7e 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -49,12 +49,8 @@ include $(GBUILDDIR)/BuildDirs.mk
 ifneq ($(strip $(PRODUCT)$(product)),)
 gb_PRODUCT := $(true)
 else
-ifneq ($(strip $(product)),)
-gb_PRODUCT := $(true)
-else
 gb_PRODUCT := $(false)
 endif
-endif
 
 # These are useful, too, for stuff built in "custom" Makefiles
 ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 96d596c..e081de6 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -207,7 +207,7 @@ void ChkOutDev( const SwTxtSizeInfo &rInf )
     const OutputDevice* pRef = rInf.GetRefDev();
     OSL_ENSURE( pOut && pRef, "ChkOutDev: invalid output devices" );
 }
-#endif  // PRODUCT
+#endif
 
 
 inline xub_StrLen GetMinLen( const SwTxtSizeInfo &rInf )

More information about the Libreoffice-commits mailing list