abbreviate repository dir

solenv/gbuild/gbuild.mk

@@ -60,19 +60,23 @@ SOLARINC += $(JDKINCS)
 SRCDIR := $(SOLARSRC)
 OUTDIR := $(SOLARVERSION)/$(INPATH)
 WORKDIR := $(SOLARVERSION)/$(INPATH)/workdir
+ifeq ($(strip $(gb_REPOS)),)
+gb_REPOS := $(SOLARSRC)
+endif
 
 # HACK
 ifeq ($(OS),WNT)
 SRCDIR := $(shell cygpath -u $(SRCDIR))
 WORKDIR := $(shell cygpath -u $(WORKDIR))
 OUTDIR := $(shell cygpath -u $(OUTDIR))
+gb_REPOS := $(shell cygpath -u $(gb_REPOS))
 endif
+
+REPODIR := $(patsubst %/,%,$(dir $(firstword $(gb_REPOS))))
+
 true := T
 false :=
 
-ifeq ($(strip $(gb_REPOS)),)
-gb_REPOS := $(SRCDIR)
-endif
 
 ifneq ($(strip $(PRODUCT)$(product)),)
 gb_PRODUCT := $(true)

solenv/gbuild/helper.mk

@@ -48,9 +48,10 @@ $(info $(1))
 endef
 
 define gb_Helper_abbreviate_dirs
-S=$(SRCDIR) && \
+R=$(REPODIR) && \
+$(subst $(REPODIR)/,$$R/,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_make_clean_target

solenv/gbuild/platform/windows.mk

@@ -179,11 +179,13 @@ endif
 gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
 gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR))
 gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR))
+gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR))
 
 define gb_Helper_abbreviate_dirs_native
-S=$(gb_Helper_SRCDIR_NATIVE) && \
+R=$(gb_Helper_REPODIR_NATIVE) && \
+$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,S=$(gb_Helper_SRCDIR_NATIVE) && \
 $(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,O=$(gb_Helper_OUTDIR_NATIVE)) && \
-$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(SRCDIR)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(OUTDIR)/,$$O/,W=$(gb_Helper_WORKDIR_NATIVE) && $(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(subst $(WORKDIR)/,$$W/,$(1)))))))
+$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(SRCDIR)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(OUTDIR)/,$$O/,W=$(gb_Helper_WORKDIR_NATIVE) && $(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(subst $(WORKDIR)/,$$W/,$(1))))))))
 endef
 
 # CObject class
@@ -215,6 +217,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
 	> $(call gb_CObject_get_dep_target,$(2)))
 endef
 
@@ -253,6 +256,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
 	> $(call gb_CxxObject_get_dep_target,$(2)))
 endef
 
@@ -289,6 +293,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
 	> $(call gb_PrecompiledHeader_get_dep_target,$(2)))
 endef
 
@@ -319,6 +324,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
+		-v REPODIR=$(REPODIR)/ \
 	> $(call gb_NoexPrecompiledHeader_get_dep_target,$(2)))
 endef
 
@@ -533,6 +539,7 @@ $(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
 

solenv/gbuild/processdeps.awk

@@ -46,23 +46,20 @@ function mangle_path(path) {
     gsub("\\\\", "/", path);
     if( path ~ /^[a-zA-Z]:/ )
         path = toupper(substr(path,0,1)) substr(path,2);
-#    gsub("//", "/", 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);
-#   gsub("//", "/", path);
     return path;
 }
 
 BEGIN {
-#   WORKDIR = tolower(WORKDIR);
-#   OUTDIR = tolower(OUTDIR);
-#   SRCDIR = tolower(SRCDIR);
 #   print "# WORKDIR=" WORKDIR;
 #   print "# OUTDIR=" OUTDIR;
 #   print "# SRCDIR=" SRCDIR;
+#   print "# REPODIR=" REPODIR;
     print mangle_path(OBJECTFILE) ": \\";
 }