Changeset 558 for trunk/src

Timestamp:

Sep 29, 2006, 6:14:09 PM (19 years ago)

Author:

bird

Message:

fixed kbuild_get_object_suffix bug wrt to generated sources.

File:

• trunk/src/gmake/kbuild.c (modified) (9 diffs)

trunk/src/gmake/kbuild.c

@@ -226 +226 @@
  */
 static struct variable *
-kbuild_first_prop(struct variable *pTarget, struct variable *pSource, 
+kbuild_first_prop(struct variable *pTarget, struct variable *pSource,
                   struct variable *pTool, struct variable *pType,
-                  struct variable *pBldTrg, struct variable *pBldTrgArch, 
+                  struct variable *pBldTrg, struct variable *pBldTrgArch,
                   const char *pszPropF1, const char *pszPropF2, const char *pszVarName)
 {
@@ -326 +326 @@
                        struct variable *pBldTrg, struct variable *pBldTrgArch, const char *pszVarName)
 {
-    struct variable *pVar = kbuild_first_prop(pTarget, pSource, NULL, pType, pBldTrg, pBldTrgArch, 
+    struct variable *pVar = kbuild_first_prop(pTarget, pSource, NULL, pType, pBldTrg, pBldTrgArch,
                                               "TOOL", "TOOL", pszVarName);
     if (!pVar)
@@ -366 +366 @@
 */
 static struct variable *
-kbuild_get_object_suffix(struct variable *pTarget, struct variable *pSource, 
-                         struct variable *pTool, struct variable *pType, 
+kbuild_get_object_suffix(struct variable *pTarget, struct variable *pSource,
+                         struct variable *pTool, struct variable *pType,
                          struct variable *pBldTrg, struct variable *pBldTrgArch, const char *pszVarName)
 {
@@ -412 +412 @@
     struct variable *pPathSubCur = kbuild_get_variable("PATH_SUB_CURRENT");
     const char *pszSrcPrefix = NULL;
+    size_t      cchSrcPrefix = 0;
     const char *pszSrcEnd;
     char *pszSrc;
@@ -427 +428 @@
         pszSrc = pSource->value + pPathTarget->value_length;
         pszSrcPrefix = "gen/";
+        cchSrcPrefix = sizeof("gen/") - 1;
+        if (    *pszSrc == '/'
+            &&  !strncmp(pszSrc + 1, pTarget->value, pTarget->value_length)
+            &&   (   pszSrc[pTarget->value_length + 1] == '/'
+                  || pszSrc[pTarget->value_length + 1] == '\0'))
+            pszSrc += 1 + pTarget->value_length;
     }
     else if (    pSource->value_length > pPathRoot->value_length
@@ -433 +440 @@
         pszSrc = pSource->value + pPathRoot->value_length;
         if (    *pszSrc == '/'
-            &&  !strncmp(pszSrc, pPathSubCur->value, pPathSubCur->value_length))
+            &&  !strncmp(pszSrc + 1, pPathSubCur->value, pPathSubCur->value_length)
+            &&   (   pszSrc[pPathSubCur->value_length + 1] == '/'
+                  || pszSrc[pPathSubCur->value_length + 1] == '\0'))
             pszSrc += 1 + pPathSubCur->value_length;
     }
@@ -479 +488 @@
         + pTarget->value_length
         + 1 /* slash */
+        + cchSrcPrefix
         + pszSrcEnd - pszSrc
         + 1;
@@ -487 +497 @@
     memcpy(psz, pTarget->value, pTarget->value_length); psz += pTarget->value_length;
     *psz++ = '/';
+    if (pszSrcPrefix)
+    {
+        memcpy(psz, pszSrcPrefix, cchSrcPrefix);
+        psz += cchSrcPrefix;
+    }
     memcpy(psz, pszSrc, pszSrcEnd - pszSrc); psz += pszSrcEnd - pszSrc;
     *psz = '\0';
@@ -591 +606 @@
     pSdks->cTargetSource = 0;
     sprintf(pszTmp, "$(%s_%s_SDKS) $(%s_%s_SDKS.%s) $(%s_%s_SDKS.%s) $(%s_%s_SDKS.%s.%s)",
-            pTarget->value, pSource->value, 
+            pTarget->value, pSource->value,
             pTarget->value, pSource->value, pBldType->value,
             pTarget->value, pSource->value, pBldTrg->value,