[PATCH] handle missing dep files in concat-deps

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4302

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/4302/1

handle missing dep files in concat-deps

Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165
---
M solenv/bin/concat-deps.c
M solenv/gbuild/AllLangResTarget.mk
M solenv/gbuild/LinkTarget.mk
M solenv/gbuild/UnoApiTarget.mk
4 files changed, 29 insertions(+), 6 deletions(-)



diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 3613946..1d803f6 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -118,6 +118,7 @@
 int internal_boost = 0;
 static char* base_dir;
 static char* work_dir;
+int work_dir_len;
 
 #ifdef __GNUC__
 #define clz __builtin_clz
@@ -985,6 +986,30 @@
             }
         }
     }
+    else
+    {
+        if(strncmp(fn, work_dir, work_dir_len) == 0)
+        {
+            if(strncmp(fn+work_dir_len, "Dep/CxxObject/", 14) == 0)
+            {
+                *(fn+strlen(fn)-1)='o';
+                printf("%s/%s: $(gb_Helper_PHONY)\n", base_dir, fn+work_dir_len+14);
+                rc = 0;
+            }
+            else if(strncmp(fn+work_dir_len, "Dep/UnoApiPartTarget/", 21) == 0)
+            {
+                *(fn+strlen(fn)-2)=0;
+                printf("%s/%s.urd: $(gb_Helper_PHONY)\n", base_dir, fn+work_dir_len+21);
+                rc = 0;
+            }
+            else if(strncmp(fn+work_dir_len, "Dep/SrsPartTarget/", 18) == 0)
+            {
+                *(fn+strlen(fn)-2)=0;
+                printf("%s/%s: $(gb_Helper_PHONY)\n", base_dir, fn+work_dir_len+18);
+                rc = 0;
+            }
+        }
+    }
     return rc;
 }
 
@@ -1023,6 +1048,7 @@
     }
     if(get_var(&base_dir, "SRCDIR") || get_var(&work_dir, "WORKDIR"))
         return 1;
+    work_dir_len = strlen(work_dir);
 
     env_str = getenv("SYSTEM_BOOST");
     internal_boost = !env_str || strcmp(env_str,"TRUE");
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 9b7afbf..0791f01 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -102,8 +102,7 @@
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_SrsPartTarget_get_dep_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)
        $(call gb_Helper_abbreviate_dirs,\
-               mkdir -p $(dir $@) && \
-               echo "$(call gb_SrsPartTarget_get_target,$*) : $(gb_Helper_PHONY)" > $@)
+               mkdir -p $(dir $@))
 endif
 
 
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 63f0f11..517c5bd 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -191,8 +191,7 @@
 
 $(call gb_CxxObject_get_dep_target,%) :
        $(if $(wildcard $@),touch $@,\
-         $(eval $(gb_CxxObject__set_pchflags))\
-         $(call gb_Object__command_dep,$@,$(call gb_CxxObject_get_target,$*)))
+         $(eval $(gb_CxxObject__set_pchflags)))
 
 endif
 
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 45096b3..59a2fc2 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -72,8 +72,7 @@
        $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_UnoApiPartTarget_get_dep_target,%) :
-       $(if $(wildcard $@),touch $@,\
-         $(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd)))
+       $(if $(wildcard $@),touch $@)
 
 endif
 

-- 
To view, visit https://gerrit.libreoffice.org/4302
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen <bjoern.michaelsen@canonical.com>