Subversion Repositories DevTools

Rev

Rev 1339 | Rev 2362 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1339 Rev 1370
Line 461... Line 461...
461 
   OraDatabase.Parameters.Remove "PV_ID"
 461 
   OraDatabase.Parameters.Remove "PV_ID"
462 
End Sub
 462 
End Sub
463 
 
 463 
 
464 
'---------------------------------------------------------------
 464 
'---------------------------------------------------------------
465 
' Returns the jats extraction commands
 465 
' Returns the jats extraction commands
466 
Sub Jats_Extract_Command (ByRef ajats_cmd, ByRef ajats_cmd_test)
 466 
Sub Jats_Extract_Command (ByRef sjats_cmds(), ByRef ajats_cmd_test, ByRef sjats_cmds_qh)
467 
   Dim dlocked: dlocked = pkgInfoHash.Item("dlocked")
 467 
   Dim dlocked: dlocked = pkgInfoHash.Item("dlocked")
468
- 
 
469 
   Dim pkg_vcs_tag: pkg_vcs_tag = Get_Pkg_Vcs_Tag(Request("pv_id"))
 468 
   Dim pkg_vcs_tag: pkg_vcs_tag = Get_Pkg_Vcs_Tag(Request("pv_id"))
- 
 
 469 
   Dim ii: ii = -1
- 
 
 470 
   Dim baseCmd
470 
 
 471 
 
471 
   ' if not released then use last package version vcs tag and branch else use current vcs tag
 472 
   ' if not released then use last package version vcs tag and branch else use current vcs tag
472 
   If dlocked <> "Y" Then
 473 
   If dlocked <> "Y" Then
473 
     ' not released, so get last package version id
 474 
     ' not released, so get last package version id
- 
 
 475 
 
474 
     Dim last_pv_id: last_pv_id = pkgInfoHash.Item("last_pv_id")
 476 
     Dim last_pv_id: last_pv_id = pkgInfoHash.Item("last_pv_id")
475 
     Dim last_pkg_vcs_tag: last_pkg_vcs_tag = Get_Pkg_Vcs_Tag(last_pv_id)
 477 
     Dim last_pkg_vcs_tag: last_pkg_vcs_tag = Get_Pkg_Vcs_Tag(last_pv_id)
- 
 
 478 
     Dim VcsType
- 
 
 479 
     If (last_pkg_vcs_tag <> "") Then
- 
 
 480 
         VcsType = Mid(last_pkg_vcs_tag, 1, InStr(1, last_pkg_vcs_tag, "::") - 1 )
- 
 
 481 
         sjats_cmds_qh = VcsType
- 
 
 482 
 
- 
 
 483 
         baseCmd =  "jats vcsrelease -extract -label """ & last_pkg_vcs_tag & """"
- 
 
 484 
         ii = ii+1 : sjats_cmds(ii) = baseCmd
- 
 
 485 
 
- 
 
 486 
         ' ClearCase extraction may get a project specific branch appended
- 
 
 487 
         ' This will be used to automatically branch the files in the package
- 
 
 488 
         '
- 
 
 489 
         If (VcsType = "CC") Then
476 
     Call Query_Config_Spec (Request("rtag_id"), last_pv_id)
 490 
             Call Query_Config_Spec (Request("rtag_id"), last_pv_id)
477 
     Dim config_branch: config_branch = rsQry("config_spec_branch")
 491 
             Dim config_branch: config_branch = rsQry("config_spec_branch")
- 
 
 492 
             If NOT IsNull(config_branch) AND (config_branch <> "") Then
- 
 
 493 
                 ii = ii+1 : sjats_cmds(ii) = baseCmd & " -branch " & config_branch
- 
 
 494 
             End If
- 
 
 495 
         End If
478 
 
 496 
 
- 
 
 497 
         If (VcsType = "SVN") Then
- 
 
 498 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Tag"
479 
     If NOT IsNull(config_branch) AND (config_branch <> "") Then
 499 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Tip"
- 
 
 500 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Work"
480 
       ajats_cmd =   "jats vcsrelease -extract -label """ & last_pkg_vcs_tag & """ -branch " & config_branch
 501 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Exact"
- 
 
 502 
         End If
481 
     Else
 503 
     Else
482 
       ajats_cmd =   "jats vcsrelease -extract -label """ & last_pkg_vcs_tag & """"
 504 
         ii = ii+1 : sjats_cmds(ii) = "No Previous version to extract"
483 
     End If
 505 
     End If
- 
 
 506 
 
- 
 
 507 
     baseCmd =  "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
- 
 
 508 
     ii = ii+1 : sjats_cmds(ii) = baseCmd
- 
 
 509
484 
   Else
 510 
   Else
485 
     ' released
 511 
     ' released
486 
     ajats_cmd =   "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
 512 
     baseCmd =  "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
- 
 
 513 
     ii = ii+1 : sjats_cmds(ii) = baseCmd
- 
 
 514 
     sjats_cmds_qh = vcsInfoCollector.Item("vcs_tag")
- 
 
 515 
 
487 
   End If
 516 
   End If
488 
 
 517 
 
- 
 
 518 
   ' Test Command
489 
   ajats_cmd_test = "jats vcsrelease -test -label """ & pkg_vcs_tag & """"
 519 
   ajats_cmd_test = "jats vcsrelease -test -label """ & pkg_vcs_tag & """"
490 
 
 520 
 
- 
 
 521 
   ReDim Preserve sjats_cmds(ii)
491 
   rsQry.Close()
 522 
   rsQry.Close()
492 
   Set rsQry = nothing
 523 
   Set rsQry = nothing
493 
 
 524 
 
494 
End Sub
 525 
End Sub
495 
 
 526 
 
Line 807... Line 838...
807 
                  <%If (IsNull( rsQry("is_build_env_required") ) AND (rsQry("comments") <> "Rippled Build.")) Then%>
 838 
                  <%If (IsNull( rsQry("is_build_env_required") ) AND (rsQry("comments") <> "Rippled Build.")) Then%>
808 
                     <span class='err_alert'>Required!</span>
 839 
                     <span class='err_alert'>Required!</span>
809 
                  <%ElseIf rsQry("is_build_env_required") = enumDB_NO Then%>
 840 
                  <%ElseIf rsQry("is_build_env_required") = enumDB_NO Then%>
810 
                     Not Required.
 841 
                     Not Required.
811 
                  <%Else%>
 842 
                  <%Else%>
812 
                     <table width="40%"  border="0" cellspacing="3" cellpadding="2">
 843 
                     <table width="40%"  border="0" cellspacing="0" cellpadding="1">
813 
                        <%
 844 
                        <%
814 
                        currG1 = 0
 845 
                        currG1 = 0
815 
                        While (NOT rsTemp.BOF) AND (NOT rsTemp.EOF)
 846 
                        While (NOT rsTemp.BOF) AND (NOT rsTemp.EOF)
816 
                           'retVal = Lookup_Document ( rsQry("doc_num"), sDocTitle, NULL, NULL, NULL  )
 847 
                           'retVal = Lookup_Document ( rsQry("doc_num"), sDocTitle, NULL, NULL, NULL  )
817 
                        %>
 848 
                        %>
818 
                           <%If currG1 <> CInt(rsTemp("bm_id")) Then%>
 849 
                           <%If currG1 <> CInt(rsTemp("bm_id")) Then%>
819 
                              <tr>
 850 
                              <tr>
820 
                                 <td colspan="2" nowrap class="sublbox_txt" bgcolor=#e4e9ec>
 851 
                                 <td colspan="2" nowrap class="sublbox_txt">
821 
                                    <%=rsTemp("bm_name")%>&nbsp;<%=GetBuildType( rsTemp("bsa_id") )%>
 852 
                                    <%=rsTemp("bm_name")%>&nbsp;<%=GetBuildType( rsTemp("bsa_id") )%>
822 
                                 </td>
 853 
                                 </td>
823 
                              </tr>
 854 
                              </tr>
824 
                              <%currG1 = CInt(rsTemp("bm_id"))
 855 
                              <%currG1 = CInt(rsTemp("bm_id"))
825 
                           End If
 856 
                           End If
Line 916... Line 947...
916 
      <%End If%>
 947 
      <%End If%>
917 
 
 948 
 
918 
      <tr>
 949 
      <tr>
919 
         <%
 950 
         <%
920 
         ' Get JATS extraction commands
 951 
         ' Get JATS extraction commands
921 
         Dim sjats_cmd,sjats_cmd_test
 952 
         Dim  sjats_cmd_test, sjats_cmds_qh
- 
 
 953 
         ReDim sjats_cmds(6)
922 
         call Jats_Extract_Command(sjats_cmd,sjats_cmd_test)
954 
         call Jats_Extract_Command(sjats_cmds, sjats_cmd_test, sjats_cmds_qh)
923 
         %>
 955 
         %>
924 
         <td width="20%" bgcolor=#e4e9ec class="sublbox_txt">
 956 
         <td width="20%" bgcolor=#e4e9ec class="sublbox_txt" valign="top">
925 
           <strong>JATS extraction command:</strong>
 957 
           <strong>JATS extraction commands:</strong>
- 
 
 958 
                <%=Quick_Help ( "JatsExtraction_" & sjats_cmds_qh )%>
926 
         </td>
 959 
         </td>
- 
 
 960 
         <td>
- 
 
 961 
         <table class="embedded_table">
- 
 
 962 
         <% Dim ii : For ii = 0 to UBound(sjats_cmds) %>
927 
         <td bgcolor=#f5f5f5 class="sublbox_txt">
 963 
             <tr><td bgcolor=#f5f5f5 class="sublbox_txt">
928 
           <%=NewLine_To_BR ( To_HTML(sjats_cmd) )%>
 964 
               <%=NewLine_To_BR ( To_HTML(sjats_cmds(ii)) )%>
- 
 
 965 
             </td>
- 
 
 966 
         <% Next %>
929 
         </td>
 967 
         </td>
- 
 
 968 
         </tr>
- 
 
 969 
         </table>
930 
      </tr>
 970 
      </tr>
931 
      <tr>
 971 
      <tr>
932 
         <td width="20%" bgcolor=#e4e9ec class="sublbox_txt">
 972 
         <td width="20%" bgcolor=#e4e9ec class="sublbox_txt">
933 
           <strong>JATS Test:</strong>
 973 
           <strong>JATS Test:</strong><%=Quick_Help ( "JatsTest" )%>
934 
         </td>
 974 
         </td>
935 
         <td bgcolor=#f5f5f5 class="sublbox_txt">
 975 
         <td bgcolor=#f5f5f5 class="sublbox_txt">
936 
           <%=NewLine_To_BR ( To_HTML(sjats_cmd_test) )%>
 976 
           <%=NewLine_To_BR ( To_HTML(sjats_cmd_test) )%>
937 
         </td>
 977 
         </td>
938 
      </tr>
 978 
      </tr>
Line 1024... Line 1064...
1024 
      End If
 1064 
      End If
1025 
      %>
 1065 
      %>
1026 
   </table>
 1066 
   </table>
1027 
   </fieldset>
 1067 
   </fieldset>
1028 
   <br>
 1068 
   <br>
- 
 
 1069 
 
1029 
<!-- PACKAGE METRICS -------------------------------------------------------------------------------------------------------------------->
 1070 
<!-- PACKAGE METRICS -------------------------------------------------------------------------------------------------------------------->
1030 
   <%If Request("rtag_id") <> "" Then%>
 1071 
   <%If Request("rtag_id") <> "" Then%>
1031 
      <%
 1072 
      <%
1032 
      Call GetPackageMetrics( parPv_id, rsPkgMetrics )
 1073 
      Call GetPackageMetrics( parPv_id, rsPkgMetrics )
1033 
      %>
 1074 
      %>