Changeset 23059


Ignore:
Timestamp:
08/06/18 14:38:28 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: reverting back to previous solution due to svn trust issues

Location:
issm/trunk-jpl
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/jenkins.sh

    r23058 r23059  
    5555
    5656        #Get changes from jenkins itself (svn requires credentials)
    57         svn --non-interactive --no-auth-cache --trust-server-cert diff -r $SVN_PREVIOUS:$SVN_CURRENT --summarize $ISSM_DIR | awk '{print $NF}' > $ISSM_DIR/changes
     57        #svn --non-interactive --no-auth-cache --trust-server-cert diff -r $SVN_PREVIOUS:$SVN_CURRENT --summarize $ISSM_DIR | awk '{print $NF}' > $ISSM_DIR/TEMP
     58        rm -rf changes
     59        wget $SERVER/job/$JOB_NAME/$BUILD_NUMBER/changes > /dev/null 2>&1
     60
     61        #Process html page and get the list of files that has changed (tricky...)
     62        #cat changes | grep '="The file was modified"' | sed -e 's/.*<\/td><td><a>\(.*\)<\/a><\/td><td>.*/\1/' > $ISSM_DIR/TEMP
     63        #cat changes | grep 'document_edit' |sed -e 's/document_edit.png/document_edit.png\
     64                #/g' | sed -e 's/.*<\/a><\/td><td>\(.*\)<\/td><\/tr>.*/\1/' | grep -v 'document_edit.png' > $ISSM_DIR/TEMP
     65        cat changes  | tr " " "\n" | grep trunk |  sed -e 's/.*<a>\(.*\)<\/a>.*/\1/' > $ISSM_DIR/TEMP
    5866
    5967        #Print list of files
    6068        echo "   "
    6169        echo "List of updated files"
    62         cat $ISSM_DIR/changes
     70        cat $ISSM_DIR/TEMP
    6371        echo "   "
    6472
    6573        #Do we need to reinstall externalpackages?
    6674        echo "Determining installation type"
    67         if [ ! -z "$(cat $ISSM_DIR/changes | grep externalpackages)" ] ; then
     75        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep externalpackages)" ] ; then
    6876                echo "  -- checking for changed externalpackages... yes";
    6977                ISSM_EXTERNALPACKAGES="yes"
    … …  
    7482
    7583        #Do we need to reconfigure
    76         if [ ! -z "$(cat $ISSM_DIR/changes | grep -e "Makefile.am" -e "m4" )" ] ||
     84        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep -e "Makefile.am" -e "m4" )" ] ||
    7785                [ ! -f "$ISSM_DIR/bin/issm.exe" ] ||
    7886                [ "$ISSM_EXTERNALPACKAGES" == "yes" ] ;
    … …  
    8694
    8795        #Do we need to recompile
    88         if [ ! -z "$(cat $ISSM_DIR/changes | grep -e "\.cpp" -e "\.h" )" ] ||
     96        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep -e "\.cpp" -e "\.h" )" ] ||
    8997                [ "$ISSM_RECONFIGURE" == "yes" ] ;
    9098        then

  • issm/trunk-jpl/src/c/classes/Elements/Element.cpp

    r23058 r23059  
    19611961void       Element::InputDuplicate(int original_enum,int new_enum){/*{{{*/
    19621962
    1963         if(!IsInput(original_enum)) _error_("Enum "<<EnumToStringx(original_enum)<<" is not in IsInput");
     1963        if(!IsInputEnum(original_enum)) _error_("Enum "<<EnumToStringx(original_enum)<<" is not in IsInput");
    19641964
    19651965        /*Call inputs method*/
    … …  
    19711971
    19721972        /*Check that name is an element input*/
    1973         if(!IsInput(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
     1973        if(!IsInputEnum(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
    19741974
    19751975        /*update input*/
    … …  
    19801980
    19811981        /*Check that name is an element input*/
    1982         if(!IsInput(name)) return;
     1982        if(!IsInputEnum(name)) return;
    19831983
    19841984        /*update input*/
    … …  
    19891989
    19901990        /*Check that name is an element input*/
    1991         if(!IsInput(name)) return;
     1991        if(!IsInputEnum(name)) return;
    19921992
    19931993        /*update input*/

  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r23035 r23059  
    11541154
    11551155        /*Get out if this is not an element input*/
    1156         if(!IsInput(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
     1156        if(!IsInputEnum(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
    11571157
    11581158        /*Prepare index list*/
    … …  
    11791179
    11801180        /*Get out if this is not an element input*/
    1181         if(!IsInput(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
     1181        if(!IsInputEnum(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
    11821182        Input* input=(Input*)this->inputs->GetInput(control_enum);   _assert_(input);
    11831183
    … …  
    16611661
    16621662        /*Check that name is an element input*/
    1663         if(!IsInput(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
     1663        if(!IsInputEnum(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
    16641664
    16651665        switch(type){
    … …  
    23072307
    23082308        /*Get out if this is not an element input*/
    2309         if(!IsInput(control_enum)) return;
     2309        if(!IsInputEnum(control_enum)) return;
    23102310
    23112311        /*Prepare index list*/
    … …  
    23492349
    23502350        /*Get out if this is not an element input*/
    2351         if(!IsInput(control_enum)) return;
     2351        if(!IsInputEnum(control_enum)) return;
    23522352
    23532353        /*Prepare index list*/
    … …  
    34203420
    34213421        /*Check that name is an element input*/
    3422         if(!IsInput(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
     3422        if(!IsInputEnum(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
    34233423
    34243424        switch(type){
    … …  
    34553455
    34563456        /*Check that name is an element input*/
    3457         if(!IsInput(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
     3457        if(!IsInputEnum(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
    34583458
    34593459        switch(type){

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r23053 r23059  
    16521652
    16531653        /*Get out if this is not an element input*/
    1654         if(!IsInput(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
     1654        if(!IsInputEnum(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
    16551655
    16561656        /*Prepare index list*/
    … …  
    16751675
    16761676        /*Get out if this is not an element input*/
    1677         if(!IsInput(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
     1677        if(!IsInputEnum(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
    16781678        Input* input=(Input*)this->inputs->GetInput(control_enum);   _assert_(input);
    16791679
    … …  
    21892189
    21902190        /*Check that name is an element input*/
    2191         if(!IsInput(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
     2191        if(!IsInputEnum(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
    21922192
    21932193        int         numnodes;
    … …  
    32973297
    32983298        /*Get out if this is not an element input*/
    3299         if(!IsInput(control_enum)) return;
     3299        if(!IsInputEnum(control_enum)) return;
    33003300       
    33013301        Input* input     = (Input*)this->inputs->GetInput(control_enum);   _assert_(input);
    … …  
    33503350
    33513351        /*Get out if this is not an element input*/
    3352         if(!IsInput(control_enum)) return;
     3352        if(!IsInputEnum(control_enum)) return;
    33533353
    33543354        /*hrepare index list*/
    … …  
    51275127
    51285128        /*Check that name is an element input*/
    5129         if(!IsInput(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
     5129        if(!IsInputEnum(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
    51305130
    51315131        switch(type){
    … …  
    51625162
    51635163        /*Check that name is an element input*/
    5164         if(!IsInput(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
     5164        if(!IsInputEnum(name)) _error_("Enum "<<EnumToStringx(name)<<" is not in IsInput");
    51655165
    51665166        switch(type){

  • issm/trunk-jpl/src/c/shared/Enum/Enum.h

    r23055 r23059  
    77void        EnumToStringx(char** string,int enum_in);
    88int         StringToEnumx(const char* string_in,bool notfounderror=true);
    9 bool        IsInput(int enum_in);
    10 bool        IsParam(int enum_in);
     9bool        IsInputEnum(int enum_in);
     10bool        IsParamEnum(int enum_in);
    1111
    1212#endif

  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r23057 r23059  
    11931193}
    11941194
    1195 bool IsInput(int enum_in){
     1195bool IsInputEnum(int enum_in){
    11961196        if(enum_in>InputsSTARTEnum && enum_in<InputsENDEnum) return true;
    11971197        return false;
    11981198}
    11991199
    1200 bool IsParam(int enum_in){
     1200bool IsParamEnum(int enum_in){
    12011201        if(enum_in>ParametersSTARTEnum && enum_in<ParametersENDEnum) return true;
    12021202        return false;

  • issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh

    r23055 r23059  
    131131}
    132132
    133 bool IsInput(int enum_in){
     133bool IsInputEnum(int enum_in){
    134134        if(enum_in>InputsSTARTEnum && enum_in<InputsENDEnum) return true;
    135135        return false;
    136136}
    137137
    138 bool IsParam(int enum_in){
     138bool IsParamEnum(int enum_in){
    139139        if(enum_in>ParametersSTARTEnum && enum_in<ParametersENDEnum) return true;
    140140        return false;
Note: See TracChangeset for help on using the changeset viewer.