[175772] JPA JUnits failing since non-sdk package not built

releng.wtpbuilder/components/dali-sdk/customTargets.xml

@@ -84,6 +84,7 @@
         <property
             name="mapVersionTag"
             value="HEAD" />
+            
         <property
             name="cvsPackage"
             value="releng.dali" />
@@ -95,6 +96,7 @@
             package="${cvsPackage}"
             dest="${buildDirectory}/maps"
             tag="${mapVersionTag}" />
+            
         <!--tag the map files project-->
         <antcall target="tagMapFiles">
             <param
@@ -103,6 +105,22 @@
         </antcall>
     </target>
 
+    <!-- ===================================================================== -->
+    <!-- Check out the cvsPackage -->
+    <!-- ===================================================================== -->
+    <target name="checkOutMaps">
+        <echo message="${mapCvsRoot} ${mapVersionTag} " />
+        <echo message="cvsPackage = ${cvsPackage} " />
+        <cvs
+            cvsRoot="${mapCvsRoot}"
+            package="${cvsPackage}"
+            dest="${buildDirectory}/maps"
+            tag="${mapVersionTag}" />
+    </target>
+
+    <!-- ===================================================================== -->
+    <!-- Tag Map Files mapCvsRoot -->
+    <!-- ===================================================================== -->
     <target
         name="tagMapFiles"
         if="tagMaps">
@@ -112,7 +130,6 @@
             command="tag v${buildType}${timestamp}" />
     </target>
 
-
     <!-- ===================================================================== -->
     <!-- Steps to do before setup -->
     <!-- ===================================================================== -->

releng.wtpbuilder/components/dali/customTargets.xml

@@ -87,20 +87,25 @@
         <property
             name="mapVersionTag"
             value="HEAD" />
-    	
+
+	<!-- get primary maps first, since if there happens to be 
+		duplicates, the first one "wins" (such as for dependancies.properties)
+	-->
+
         <!-- get releng/maps -->
         <antcall target="checkOutMaps">
             <param
                 name="cvsPackage"
                 value="releng" />
         </antcall>
-
+        
         <!-- get releng.dali/maps -->
         <antcall target="checkOutMaps">
             <param
                 name="cvsPackage"
                 value="releng.dali" />
         </antcall>
+            	
 
         <!-- tag the map files project -->
         <antcall target="tagMapFiles">
@@ -121,7 +126,6 @@
             package="${cvsPackage}"
             dest="${buildDirectory}/maps"
             tag="${mapVersionTag}" />
-
     </target>
     	
     <!-- ===================================================================== -->
@@ -150,26 +154,13 @@
             property="component.dir" />
         <echo message="ant.file: ${ant.file}" />
         <echo message="component.dir: ${component.dir}" />
-
-        <property
-            name="dependencies.combined"
-            value="dependencies.combined.properties" />
-    	
-    	<!-- Combine releng and releng.dali -->
-    	<delete file="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}" failonerror="false" />
-    	<concat destfile="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}">
-            <fileset dir="${buildDirectory}/maps">
-    	        <include name="releng/maps/dependencies.properties"/>
-    	        <include name="releng.dali/maps/dependencies.properties"/>
-            </fileset>
-        </concat>
 	
         <ant
             antfile="${component.dir}/dependency.xml"
             target="get">
             <property
                 name="dependency.properties"
-                value="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}" />
+                value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
             <property
                 name="base.install.dir"
                 value="${buildRoot}" />