Changeset 2990


Ignore:
Timestamp:
Apr 19, 2018 7:24:14 AM (4 years ago)
Author:
raasch
Message:

bugfix: temporary SOURCES_FOR_RUN_CATALOG now created in base_directory and not in the working directory from where palmrun is called

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palmrun

    r2957 r2990  
    2727# -----------------
    2828# $Id: palmrun 2718 2018-01-02 08:49:38Z maronga $
     29# bugfix: temporary SOURCES_FOR_RUN_CATALOG now created in base_directory and
     30#         not in the working directory from where palmrun is called
     31#
     32# 2718 2018-01-02 08:49:38Z maronga
    2933# svfout in the activation string will be replaced now by svfin in case of
    3034# automatic restarts
     
    794798       fi
    795799
    796        rm -rf   $sources_for_run_catalog
    797        mkdir -p $sources_for_run_catalog
     800       rm -rf   ${base_directory}/${sources_for_run_catalog}
     801       mkdir -p ${base_directory}/${sources_for_run_catalog}
    798802
    799803       if [[ "$source_list" = LM ]]
     
    837841          for  filename  in  $Filenames
    838842          do
    839              cp  $filename  ${working_directory}/${sources_for_run_catalog}
     843             cp  $filename  ${base_directory}/${sources_for_run_catalog}
    840844             source_list=$source_list"$filename "
    841845          done
     
    867871                locat=source; exit
    868872             else
    869                 cp  $filename  ${working_directory}/${sources_for_run_catalog}
     873                cp  $filename  ${base_directory}/${sources_for_run_catalog}
    870874             fi
    871875
     
    883887          locat=make; exit
    884888       else
    885           cp  $makefile  ${sources_for_run_catalog}/Makefile
     889          cp  $makefile  ${base_directory}/${sources_for_run_catalog}/Makefile
    886890       fi
    887891
     
    922926
    923927             cd -  > /dev/null
    924              cd  $sources_for_run_catalog
     928             cd  ${base_directory}/${sources_for_run_catalog}
    925929
    926930                # COPY MAKEFILE IF EXISTING
     
    978982
    979983          # COPY CONFIGURATION FILES
    980        cp  $config_file  $sources_for_run_catalog
    981        cp  $fileconnection_file  $sources_for_run_catalog
     984       cp  $config_file  ${base_directory}/${sources_for_run_catalog}
     985       cp  $fileconnection_file  ${base_directory}/${sources_for_run_catalog}
    982986
    983987          # COPY SHELLSCRIPTS
    984        cp  ${source_path}/../SCRIPTS/palmrun    $sources_for_run_catalog
    985        cp  ${source_path}/../SCRIPTS/batch_scp  $sources_for_run_catalog
     988       cp  ${source_path}/../SCRIPTS/palmrun    ${base_directory}/${sources_for_run_catalog}
     989       cp  ${source_path}/../SCRIPTS/batch_scp  ${base_directory}/${sources_for_run_catalog}
    986990
    987991    fi
     
    18211825
    18221826       # NOW CREATE THE SOURCES_FOR_RUN FOLDER
    1823     palmbuild  -v  $use_existing_sources_folder  -h $host_configuration  -d $jobname
     1827#    palmbuild  -v  $use_existing_sources_folder  -h $host_configuration  -d $jobname
     1828    palmbuild    $use_existing_sources_folder  -h $host_configuration  -d $jobname
    18241829
    18251830    if [[ $? != 0 ]]
     
    18291834       printf "\n  +++ error while creating executable and/or other sources"
    18301835       locat=execution
    1831        rm -rf  $sources_for_run_catalog
     1836       rm -rf  ${base_directory}/${sources_for_run_catalog}
    18321837       exit
    18331838
     
    18351840
    18361841       printf "  *** executable and other sources created\n"
    1837        rm -rf  $sources_for_run_catalog
     1842       rm -rf  ${base_directory}/${sources_for_run_catalog}
    18381843
    18391844    fi
Note: See TracChangeset for help on using the changeset viewer.