Subversion Repositories DevTools

Rev

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

Rev 1370 Rev 2362
Line 471... Line 471...
471
 
471
 
472
   ' 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
473
   If dlocked <> "Y" Then
473
   If dlocked <> "Y" Then
474
     ' not released, so get last package version id
474
     ' not released, so get last package version id
475
 
475
 
-
 
476
     Dim last_version_valid: last_version_valid = NOT IsNull(pkgInfoHash.Item ("previous_version"))
476
     Dim last_pv_id: last_pv_id = pkgInfoHash.Item("last_pv_id")
477
     Dim last_pv_id: last_pv_id = pkgInfoHash.Item("last_pv_id")
477
     Dim last_pkg_vcs_tag: last_pkg_vcs_tag = Get_Pkg_Vcs_Tag(last_pv_id)
478
     Dim last_pkg_vcs_tag: last_pkg_vcs_tag = Get_Pkg_Vcs_Tag(last_pv_id)
478
     Dim VcsType
479
     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
 
480
 
-
 
481
     If (last_version_valid AND last_pkg_vcs_tag <> "") Then
-
 
482
        VcsType = Mid(last_pkg_vcs_tag, 1, InStr(1, last_pkg_vcs_tag, "::") - 1 )
-
 
483
        sjats_cmds_qh = VcsType
483
         baseCmd =  "jats vcsrelease -extract -label """ & last_pkg_vcs_tag & """"
484
        baseCmd =  "jats vcsrelease -extract -label """ & last_pkg_vcs_tag & """"
484
         ii = ii+1 : sjats_cmds(ii) = baseCmd
485
        ii = ii+1 : sjats_cmds(ii) = baseCmd
485
 
486
 
486
         ' ClearCase extraction may get a project specific branch appended
487
         ' ClearCase extraction may get a project specific branch appended
487
         ' This will be used to automatically branch the files in the package
488
         ' This will be used to automatically branch the files in the package
488
         '
489
         '
489
         If (VcsType = "CC") Then
490
         If (VcsType = "CC") Then
Line 524... Line 525...
524
 
525
 
525
End Sub
526
End Sub
526
 
527
 
527
'---------------------------------------------------------------
528
'---------------------------------------------------------------
528
' Returns the VCS tag for the specified package version
529
' Returns the VCS tag for the specified package version
-
 
530
' Note: ORAPARM_OUTPUT default size is 127 bytes. This is too short for some
-
 
531
'
529
Function Get_Pkg_Vcs_Tag(apv_id)
532
Function Get_Pkg_Vcs_Tag(apv_id)
530
   OraDatabase.Parameters.Add "PV_ID", apv_id, ORAPARM_INPUT, ORATYPE_NUMBER
533
   OraDatabase.Parameters.Add "PV_ID", apv_id, ORAPARM_INPUT, ORATYPE_NUMBER
531
   OraDatabase.Parameters.Add "RETURN_CODE","", ORAPARM_OUTPUT, ORATYPE_VARCHAR2
534
   OraDatabase.Parameters.Add "RETURN_CODE","xxxx", ORAPARM_OUTPUT, ORATYPE_VARCHAR2
-
 
535
   OraDatabase.Parameters("RETURN_CODE").MinimumSize = 150
532
   On Error Resume Next
536
   On Error Resume Next
533
        OraDatabase.ExecuteSQL ("BEGIN   :RETURN_CODE := PK_RMAPI.RETURN_VCS_TAG( :PV_ID );   END;")
537
        OraDatabase.ExecuteSQL ("BEGIN   :RETURN_CODE := PK_RMAPI.RETURN_VCS_TAG( :PV_ID );   END;")
534
        Get_Pkg_Vcs_Tag = OraDatabase.Parameters("RETURN_CODE").Value
538
        Get_Pkg_Vcs_Tag = OraDatabase.Parameters("RETURN_CODE").Value
535
   On Error Goto 0
539
   On Error Goto 0
536
   OraDatabase.Parameters.Remove "PV_ID"
540
   OraDatabase.Parameters.Remove "PV_ID"