WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/_release_notes.asp

    OraDatabase.Parameters.Remove "PV_ID"
 End Sub
 '---------------------------------------------------------------
 ' Returns the jats extraction commands
-Sub Jats_Extract_Command (ByRef ajats_cmd, ByRef ajats_cmd_test)
+Sub Jats_Extract_Command (ByRef sjats_cmds(), ByRef ajats_cmd_test, ByRef sjats_cmds_qh)
    Dim dlocked: dlocked = pkgInfoHash.Item("dlocked")
    Dim pkg_vcs_tag: pkg_vcs_tag = Get_Pkg_Vcs_Tag(Request("pv_id"))
+   Dim ii: ii = -1
+   Dim baseCmd
    ' if not released then use last package version vcs tag and branch else use current vcs tag
    If dlocked <> "Y" Then
      ' not released, so get last package version id
      Dim last_pv_id: last_pv_id = pkgInfoHash.Item("last_pv_id")
      Dim last_pkg_vcs_tag: last_pkg_vcs_tag = Get_Pkg_Vcs_Tag(last_pv_id)
+     Dim VcsType
+     If (last_pkg_vcs_tag <> "") Then
+         VcsType = Mid(last_pkg_vcs_tag, 1, InStr(1, last_pkg_vcs_tag, "::") - 1 )
+         sjats_cmds_qh = VcsType
+         baseCmd =  "jats vcsrelease -extract -label """ & last_pkg_vcs_tag & """"
+         ii = ii+1 : sjats_cmds(ii) = baseCmd
+         ' ClearCase extraction may get a project specific branch appended
+         ' This will be used to automatically branch the files in the package
+         '
+         If (VcsType = "CC") Then
-     Call Query_Config_Spec (Request("rtag_id"), last_pv_id)
+             Call Query_Config_Spec (Request("rtag_id"), last_pv_id)
-     Dim config_branch: config_branch = rsQry("config_spec_branch")
+             Dim config_branch: config_branch = rsQry("config_spec_branch")
+             If NOT IsNull(config_branch) AND (config_branch <> "") Then
+                 ii = ii+1 : sjats_cmds(ii) = baseCmd & " -branch " & config_branch
+             End If
+         End If
+         If (VcsType = "SVN") Then
+            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Tag"
-     If NOT IsNull(config_branch) AND (config_branch <> "") Then
+            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Tip"
+            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Work"
-       ajats_cmd =   "jats vcsrelease -extract -label """ & last_pkg_vcs_tag & """ -branch " & config_branch
+            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Exact"
+         End If
      Else
-       ajats_cmd =   "jats vcsrelease -extract -label """ & last_pkg_vcs_tag & """"
+         ii = ii+1 : sjats_cmds(ii) = "No Previous version to extract"
      End If
+     baseCmd =  "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
+     ii = ii+1 : sjats_cmds(ii) = baseCmd
    Else
      ' released
-     ajats_cmd =   "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
+     baseCmd =  "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
+     ii = ii+1 : sjats_cmds(ii) = baseCmd
+     sjats_cmds_qh = vcsInfoCollector.Item("vcs_tag")
    End If
+   ' Test Command
    ajats_cmd_test = "jats vcsrelease -test -label """ & pkg_vcs_tag & """"
+   ReDim Preserve sjats_cmds(ii)
    rsQry.Close()
    Set rsQry = nothing
 End Sub
 '---------------------------------------------------------------
 ' Returns the VCS tag for the specified package version
 Function Get_Pkg_Vcs_Tag(apv_id)
    OraDatabase.Parameters.Add "PV_ID", apv_id, ORAPARM_INPUT, ORATYPE_NUMBER
    OraDatabase.Parameters.Add "RETURN_CODE","", ORAPARM_OUTPUT, ORATYPE_VARCHAR2
+   On Error Resume Next
-   OraDatabase.ExecuteSQL ("BEGIN   :RETURN_CODE := PK_RMAPI.RETURN_VCS_TAG( :PV_ID );   END;")
+        OraDatabase.ExecuteSQL ("BEGIN   :RETURN_CODE := PK_RMAPI.RETURN_VCS_TAG( :PV_ID );   END;")
-   Get_Pkg_Vcs_Tag = OraDatabase.Parameters("RETURN_CODE").Value
+        Get_Pkg_Vcs_Tag = OraDatabase.Parameters("RETURN_CODE").Value
+   On Error Goto 0
    OraDatabase.Parameters.Remove "PV_ID"
    OraDatabase.Parameters.Remove "RETURN_CODE"
 End Function
 '----------------------------------------------------------------------------------------------------------------------------------------
             <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Version Control System:</b></td>
             <td bgcolor=#f5f5f5 class="sublbox_txt">
                <%=NewLine_To_BR ( To_HTML( vcsInfoCollector.Item("vcs_name") ) )%>
             </td>
          </tr>
          <tr>
-            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Label:</b></td>
+            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Source Path:</b> </td>
             <td bgcolor=#f5f5f5 class="sublbox_txt">
-               <%If IsNull( rsQry("pkg_label") ) Then%>
+               <%If IsNull( rsQry("src_path") ) Then%>
-                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("pkg_label") ) )%>
+                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("src_path") ) )%>
                <%End If%>
             </td>
          </tr>
          <tr>
-            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Source Path:</b> </td>
+            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Label:</b></td>
             <td bgcolor=#f5f5f5 class="sublbox_txt">
-               <%If IsNull( rsQry("src_path") ) Then%>
+               <%If IsNull( rsQry("pkg_label") ) Then%>
-                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("src_path") ) )%>
+                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("pkg_label") ) )%>
                <%End If%>
             </td>
          </tr>
       <%ElseIf vcsInfoCollector.Item("vcs_tag") = enum_VCS_SUBVERSION_TAG Then%>
          <tr>
             <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Version Control System:</b></td>
             <td bgcolor=#f5f5f5 class="sublbox_txt">
                <%=NewLine_To_BR ( To_HTML( vcsInfoCollector.Item("vcs_name") ) )%>
             </td>
          </tr>
          <tr>
-            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>SubVersion Tag:</b> </td>
+            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Source Path:</b> </td>
             <td bgcolor=#f5f5f5 class="sublbox_txt">
                <%If IsNull( rsQry("src_path") ) Then%>
                   <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("src_path") ) )%>
                <%End If%>
             </td>
          </tr>
-         <%If PackageExists(parRtag_id,parPv_id,"work_in_progress") Then%>
          <tr>
-            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>WIP Tag:</b> </td>
+            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Tag:</b></td>
             <td bgcolor=#f5f5f5 class="sublbox_txt">
                <%If IsNull( rsQry("pkg_label") ) Then%>
                   <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("pkg_label") ) )%>
                <%End If%>
             </td>
          </tr>
-         <%End If%>
       <%ElseIf vcsInfoCollector.Item("vcs_tag") = enum_VCS_UNCONTROLLED_TAG Then%>
          <tr>
             <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Version Control System:</b></td>
             <td bgcolor=#f5f5f5 class="sublbox_txt">
                <%=NewLine_To_BR ( To_HTML( vcsInfoCollector.Item("vcs_name") ) )%>
                   <%If (IsNull( rsQry("is_build_env_required") ) AND (rsQry("comments") <> "Rippled Build.")) Then%>
                      <span class='err_alert'>Required!</span>
                   <%ElseIf rsQry("is_build_env_required") = enumDB_NO Then%>
                      Not Required.
                   <%Else%>
-                     <table width="40%"  border="0" cellspacing="3" cellpadding="2">
+                     <table width="40%"  border="0" cellspacing="0" cellpadding="1">
                         <%
                         currG1 = 0
                         While (NOT rsTemp.BOF) AND (NOT rsTemp.EOF)
                            'retVal = Lookup_Document ( rsQry("doc_num"), sDocTitle, NULL, NULL, NULL  )
                         %>
                            <%If currG1 <> CInt(rsTemp("bm_id")) Then%>
                               <tr>
-                                 <td colspan="2" nowrap class="sublbox_txt" bgcolor=#e4e9ec>
+                                 <td colspan="2" nowrap class="sublbox_txt">
                                     <%=rsTemp("bm_name")%>&nbsp;<%=GetBuildType( rsTemp("bsa_id") )%>
                                  </td>
                               </tr>
                               <%currG1 = CInt(rsTemp("bm_id"))
                            End If
       <%End If%>
       <tr>
          <%
          ' Get JATS extraction commands
-         Dim sjats_cmd,sjats_cmd_test
+         Dim  sjats_cmd_test, sjats_cmds_qh
+         ReDim sjats_cmds(6)
-         call Jats_Extract_Command(sjats_cmd,sjats_cmd_test)
+         call Jats_Extract_Command(sjats_cmds, sjats_cmd_test, sjats_cmds_qh)
          %>
-         <td width="20%" bgcolor=#e4e9ec class="sublbox_txt">
+         <td width="20%" bgcolor=#e4e9ec class="sublbox_txt" valign="top">
-           <strong>JATS extraction command:</strong>
+           <strong>JATS extraction commands:</strong>
+                <%=Quick_Help ( "JatsExtraction_" & sjats_cmds_qh )%>
          </td>
+         <td>
+         <table class="embedded_table">
+         <% Dim ii : For ii = 0 to UBound(sjats_cmds) %>
-         <td bgcolor=#f5f5f5 class="sublbox_txt">
+             <tr><td bgcolor=#f5f5f5 class="sublbox_txt">
-           <%=NewLine_To_BR ( To_HTML(sjats_cmd) )%>
+               <%=NewLine_To_BR ( To_HTML(sjats_cmds(ii)) )%>
+             </td>
+         <% Next %>
          </td>
+         </tr>
+         </table>
       </tr>
       <tr>
          <td width="20%" bgcolor=#e4e9ec class="sublbox_txt">
-           <strong>JATS Test:</strong>
+           <strong>JATS Test:</strong><%=Quick_Help ( "JatsTest" )%>
          </td>
          <td bgcolor=#f5f5f5 class="sublbox_txt">
            <%=NewLine_To_BR ( To_HTML(sjats_cmd_test) )%>
          </td>
       </tr>
       <%
-      ' Codestriker and Beyond Compare differencing commands
+      ' Beyond Compare difference command
-      Dim oldLabel
-      Dim old_vcs_tag
+      Dim prevVcsTag
-      Dim sCsCmd
+      Dim curVcsTag
       Dim sBcCmd
+      prevVcsTag = Get_Pkg_Vcs_Tag(iLastSignificantPVID)
-      sCsCmd = ""
+      curVcsTag = Get_Pkg_Vcs_Tag(parPv_id)
       sBcCmd = ""
+      If (IsNull(prevVcsTag) OR prevVcsTag = "" ) Then
+            sBcCmd = "No prior label to compare against"
+      ElseIf (IsNull(curVcsTag) OR curVcsTag = "" ) Then
+            sBcCmd = "Current VCS tag not yet specified"
+      Else
+            sBcCmd = "jats vcsdiff -old=" & prevVcsTag & " -new=" & curVcsTag
+      End If
+      sBcCmd = NewLine_To_BR( To_HTML (sBcCmd) )
+      ' Codestriker commands - Only for ClearCase
+      Dim sCsCmd
+      sCsCmd = ""
       If vcsInfoCollector.Item("vcs_tag") = enum_VCS_CLEARCASE_TAG Then
+         Dim oldLabel
+         Dim old_vcs_tag
          If (pv_id_exists(iLastSignificantPVID) = TRUE) Then
             old_vcs_tag = get_vcs_tag(iLastSignificantPVID)
             If (old_vcs_tag = enum_VCS_CLEARCASE_TAG) Then
                oldLabel = get_Pkg_Label(iLastSignificantPVID)
-               sCsCmd = NewLine_To_BR ( To_HTML( Codestriker_Command   (oldLabel, pkgInfoHash.Item("pkg_label")) ) )
+               sCsCmd = NewLine_To_BR ( To_HTML( Codestriker_Command (oldLabel, pkgInfoHash.Item("pkg_label")) ) )
-               sBcCmd = NewLine_To_BR ( To_HTML( BeyondCompare_Command (oldLabel, pkgInfoHash.Item("pkg_label")) ) )
            End If
          End If
       End If%>
       <tr>
       End If
       %>
    </table>
    </fieldset>
    <br>
 <!-- PACKAGE METRICS -------------------------------------------------------------------------------------------------------------------->
    <%If Request("rtag_id") <> "" Then%>
       <%
       Call GetPackageMetrics( parPv_id, rsPkgMetrics )
       %>
                                  </td>
                               <%Else%>
                                  <td align="center" nowrap bgcolor=#e4e9ec></td>
                               <%End If%>
                               <td bgcolor=#f5f5f5 nowrap class="form_item">
-                                 <a href="http://auperajir02:8080/browse/<%=rsCQ("iss_num")%>" target="_blank" class="txt_linked">
+                                 <a href="<%=JIRA_URL%>/browse/<%=rsCQ("iss_num")%>" target="_blank" class="txt_linked">
                                     <%=rsCQ("iss_num")%>
                                  </a>
                               </td>
                               <td bgcolor=#f5f5f5 class="form_item">JIRA</td>
                               <td bgcolor=#f5f5f5 class="form_item"><%=NewLine_To_BR ( To_HTML ( rsCQ("summary") ) )%></td>

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/_release_notes.asp @ 1385 – Rev 1277 → 1376