mirror of
https://github.com/abapGit/abapGit.git
synced 2025-04-30 11:46:38 +08:00
move version definition to separate interface
moved version from DEFINITIONS interface to new VERSION interface, to avoid possible future merge conflicts, see #960
This commit is contained in:
parent
5ee467b401
commit
d7e90aae60
|
@ -206,7 +206,7 @@ CLASS ZCL_ABAPGIT_HTTP IMPLEMENTATION.
|
||||||
|
|
||||||
* bitbucket require agent prefix = "git/"
|
* bitbucket require agent prefix = "git/"
|
||||||
* also see https://github.com/larshp/abapGit/issues/1432
|
* also see https://github.com/larshp/abapGit/issues/1432
|
||||||
rv_agent = |git/2.0 (abapGit { zif_abapgit_definitions=>gc_abap_version })|.
|
rv_agent = |git/2.0 (abapGit { zif_abapgit_version=>gc_abap_version })|.
|
||||||
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE IMPLEMENTATION.
|
||||||
ro_html->add( '<table class="w100"><tr>' ). "#EC NOTEXT
|
ro_html->add( '<table class="w100"><tr>' ). "#EC NOTEXT
|
||||||
|
|
||||||
ro_html->add( '<td class="w40"></td>' ). "#EC NOTEXT
|
ro_html->add( '<td class="w40"></td>' ). "#EC NOTEXT
|
||||||
ro_html->add( |<td><span class="version">{ zif_abapgit_definitions=>gc_abap_version }</span></td>| ). "#EC NOTEXT
|
ro_html->add( |<td><span class="version">{ zif_abapgit_version=>gc_abap_version }</span></td>| ). "#EC NOTEXT
|
||||||
ro_html->add( '<td id="debug-output" class="w40"></td>' ). "#EC NOTEXT
|
ro_html->add( '<td id="debug-output" class="w40"></td>' ). "#EC NOTEXT
|
||||||
|
|
||||||
ro_html->add( '</tr></table>' ). "#EC NOTEXT
|
ro_html->add( '</tr></table>' ). "#EC NOTEXT
|
||||||
|
|
|
@ -61,8 +61,8 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DEBUGINFO IMPLEMENTATION.
|
||||||
|
|
||||||
CREATE OBJECT ro_html.
|
CREATE OBJECT ro_html.
|
||||||
|
|
||||||
ro_html->add( |<p>abapGit version: { zif_abapgit_definitions=>gc_abap_version }</p>| ).
|
ro_html->add( |<p>abapGit version: { zif_abapgit_version=>gc_abap_version }</p>| ).
|
||||||
ro_html->add( |<p>XML version: { zif_abapgit_definitions=>gc_xml_version }</p>| ).
|
ro_html->add( |<p>XML version: { zif_abapgit_version=>gc_xml_version }</p>| ).
|
||||||
ro_html->add( |<p>GUI version: { lv_gui_version }</p>| ).
|
ro_html->add( |<p>GUI version: { lv_gui_version }</p>| ).
|
||||||
ro_html->add( |<p>LCL_TIME: { zcl_abapgit_time=>get( ) }</p>| ).
|
ro_html->add( |<p>LCL_TIME: { zcl_abapgit_time=>get( ) }</p>| ).
|
||||||
ro_html->add( |<p>SY time: { sy-datum } { sy-uzeit } { sy-tzone }</p>| ).
|
ro_html->add( |<p>SY time: { sy-datum } { sy-uzeit } { sy-tzone }</p>| ).
|
||||||
|
|
|
@ -52,7 +52,7 @@ CLASS ZCL_ABAPGIT_XML IMPLEMENTATION.
|
||||||
DATA: lv_version TYPE string.
|
DATA: lv_version TYPE string.
|
||||||
|
|
||||||
|
|
||||||
lv_version = |abapGit version: { zif_abapgit_definitions=>gc_abap_version }|.
|
lv_version = |abapGit version: { zif_abapgit_version=>gc_abap_version }|.
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_TO_INFORM'
|
CALL FUNCTION 'POPUP_TO_INFORM'
|
||||||
EXPORTING
|
EXPORTING
|
||||||
|
@ -128,7 +128,7 @@ CLASS ZCL_ABAPGIT_XML IMPLEMENTATION.
|
||||||
li_element = mi_xml_doc->find_from_name_ns( depth = 0 name = c_abapgit_tag ).
|
li_element = mi_xml_doc->find_from_name_ns( depth = 0 name = c_abapgit_tag ).
|
||||||
li_version = li_element->if_ixml_node~get_attributes(
|
li_version = li_element->if_ixml_node~get_attributes(
|
||||||
)->get_named_item_ns( c_attr_version ) ##no_text.
|
)->get_named_item_ns( c_attr_version ) ##no_text.
|
||||||
IF li_version->get_value( ) <> zif_abapgit_definitions=>gc_xml_version.
|
IF li_version->get_value( ) <> zif_abapgit_version=>gc_xml_version.
|
||||||
display_xml_error( ).
|
display_xml_error( ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,7 @@ CLASS ZCL_ABAPGIT_XML_OUTPUT IMPLEMENTATION.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
li_git = mi_xml_doc->create_element( c_abapgit_tag ).
|
li_git = mi_xml_doc->create_element( c_abapgit_tag ).
|
||||||
li_git->set_attribute( name = c_attr_version value = zif_abapgit_definitions=>gc_xml_version ).
|
li_git->set_attribute( name = c_attr_version value = zif_abapgit_version=>gc_xml_version ).
|
||||||
IF NOT is_metadata IS INITIAL.
|
IF NOT is_metadata IS INITIAL.
|
||||||
li_git->set_attribute( name = c_attr_serializer
|
li_git->set_attribute( name = c_attr_serializer
|
||||||
value = is_metadata-class ).
|
value = is_metadata-class ).
|
||||||
|
|
|
@ -180,7 +180,7 @@ CLASS ZCL_ABAPGIT_NEWS IMPLEMENTATION.
|
||||||
CREATE OBJECT ro_instance
|
CREATE OBJECT ro_instance
|
||||||
EXPORTING
|
EXPORTING
|
||||||
iv_rawdata = <ls_file>-data
|
iv_rawdata = <ls_file>-data
|
||||||
iv_current_version = zif_abapgit_definitions=>gc_abap_version " TODO refactor
|
iv_current_version = zif_abapgit_version=>gc_abap_version " TODO refactor
|
||||||
iv_lastseen_version = normalize_version( lv_last_seen ).
|
iv_lastseen_version = normalize_version( lv_last_seen ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
|
|
|
@ -329,8 +329,6 @@ INTERFACE zif_abapgit_definitions PUBLIC.
|
||||||
show_default_repo TYPE abap_bool,
|
show_default_repo TYPE abap_bool,
|
||||||
END OF ty_s_user_settings.
|
END OF ty_s_user_settings.
|
||||||
|
|
||||||
CONSTANTS gc_xml_version TYPE string VALUE 'v1.0.0' ##NO_TEXT.
|
|
||||||
CONSTANTS gc_abap_version TYPE string VALUE '1.72.1' ##NO_TEXT.
|
|
||||||
CONSTANTS:
|
CONSTANTS:
|
||||||
BEGIN OF gc_type,
|
BEGIN OF gc_type,
|
||||||
commit TYPE zif_abapgit_definitions=>ty_type VALUE 'commit', "#EC NOTEXT
|
commit TYPE zif_abapgit_definitions=>ty_type VALUE 'commit', "#EC NOTEXT
|
||||||
|
|
|
@ -12,12 +12,6 @@
|
||||||
<UNICODE>X</UNICODE>
|
<UNICODE>X</UNICODE>
|
||||||
</VSEOINTERF>
|
</VSEOINTERF>
|
||||||
<DESCRIPTIONS>
|
<DESCRIPTIONS>
|
||||||
<SEOCOMPOTX>
|
|
||||||
<CLSNAME>ZIF_ABAPGIT_DEFINITIONS</CLSNAME>
|
|
||||||
<CMPNAME>GC_ABAP_VERSION</CMPNAME>
|
|
||||||
<LANGU>E</LANGU>
|
|
||||||
<DESCRIPT>GC_ABAP_VERSION</DESCRIPT>
|
|
||||||
</SEOCOMPOTX>
|
|
||||||
<SEOCOMPOTX>
|
<SEOCOMPOTX>
|
||||||
<CLSNAME>ZIF_ABAPGIT_DEFINITIONS</CLSNAME>
|
<CLSNAME>ZIF_ABAPGIT_DEFINITIONS</CLSNAME>
|
||||||
<CMPNAME>GC_ACTION</CMPNAME>
|
<CMPNAME>GC_ACTION</CMPNAME>
|
||||||
|
@ -96,12 +90,6 @@
|
||||||
<LANGU>E</LANGU>
|
<LANGU>E</LANGU>
|
||||||
<DESCRIPT>GC_TYPE</DESCRIPT>
|
<DESCRIPT>GC_TYPE</DESCRIPT>
|
||||||
</SEOCOMPOTX>
|
</SEOCOMPOTX>
|
||||||
<SEOCOMPOTX>
|
|
||||||
<CLSNAME>ZIF_ABAPGIT_DEFINITIONS</CLSNAME>
|
|
||||||
<CMPNAME>GC_XML_VERSION</CMPNAME>
|
|
||||||
<LANGU>E</LANGU>
|
|
||||||
<DESCRIPT>GC_XML_VERSION</DESCRIPT>
|
|
||||||
</SEOCOMPOTX>
|
|
||||||
<SEOCOMPOTX>
|
<SEOCOMPOTX>
|
||||||
<CLSNAME>ZIF_ABAPGIT_DEFINITIONS</CLSNAME>
|
<CLSNAME>ZIF_ABAPGIT_DEFINITIONS</CLSNAME>
|
||||||
<CMPNAME>TT_REPO_FILES</CMPNAME>
|
<CMPNAME>TT_REPO_FILES</CMPNAME>
|
||||||
|
|
7
src/zif_abapgit_version.intf.abap
Normal file
7
src/zif_abapgit_version.intf.abap
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
INTERFACE zif_abapgit_version
|
||||||
|
PUBLIC .
|
||||||
|
|
||||||
|
CONSTANTS gc_xml_version TYPE string VALUE 'v1.0.0' ##NO_TEXT.
|
||||||
|
CONSTANTS gc_abap_version TYPE string VALUE '1.72.1' ##NO_TEXT.
|
||||||
|
|
||||||
|
ENDINTERFACE.
|
16
src/zif_abapgit_version.intf.xml
Normal file
16
src/zif_abapgit_version.intf.xml
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<abapGit version="v1.0.0" serializer="LCL_OBJECT_INTF" serializer_version="v1.0.0">
|
||||||
|
<asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
|
||||||
|
<asx:values>
|
||||||
|
<VSEOINTERF>
|
||||||
|
<CLSNAME>ZIF_ABAPGIT_VERSION</CLSNAME>
|
||||||
|
<VERSION>1</VERSION>
|
||||||
|
<LANGU>E</LANGU>
|
||||||
|
<DESCRIPT>abapGit Version</DESCRIPT>
|
||||||
|
<EXPOSURE>2</EXPOSURE>
|
||||||
|
<STATE>1</STATE>
|
||||||
|
<UNICODE>X</UNICODE>
|
||||||
|
</VSEOINTERF>
|
||||||
|
</asx:values>
|
||||||
|
</asx:abap>
|
||||||
|
</abapGit>
|
Loading…
Reference in New Issue
Block a user