Changeset 111d25a
- Timestamp:
- 09/27/2007 07:26:14 PM (17 years ago)
- Branches:
- experimental
- Children:
- aafcfa9
- Parents:
- f9bfa72
- Location:
- common/libs
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
common/libs/func_compare.sh
rf9bfa72 r111d25a 58 58 local ROOT_DIR=/ 59 59 local DEST_TOPDIR=/${SCRIPT_ROOT} 60 local ICALOGDIR=/${SCRIPT_ROOT}/ logs/ICA61 local FARCELOGDIR=/${SCRIPT_ROOT}/ logs/farce60 local ICALOGDIR=/${SCRIPT_ROOT}/${LOGDIRBASE}/ICA 61 local FARCELOGDIR=/${SCRIPT_ROOT}/${LOGDIRBASE}/farce 62 62 63 63 if [[ "$RUN_ICA" = "y" ]] ; then … … 65 65 ( 66 66 cat << EOF 67 @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION >> logs/\$@ 2>&1 && \\68 extras/do_ica_prep $DEST_ICA/$ITERATION >> logs/\$@ 2>&167 @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION >> ${LOGDIRBASE}/\$@ 2>&1 && \\ 68 extras/do_ica_prep $DEST_ICA/$ITERATION >> ${LOGDIRBASE}/\$@ 2>&1 69 69 EOF 70 70 ) >> $MKFILE.tmp … … 78 78 ( 79 79 cat << EOF 80 @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION >> logs/\$@ 2>&1 && \\81 extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/filelist-$ITERATION >> logs/\$@ 2>&180 @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION >> ${LOGDIRBASE}/\$@ 2>&1 && \\ 81 extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/filelist-$ITERATION >> ${LOGDIRBASE}/\$@ 2>&1 82 82 EOF 83 83 ) >> $MKFILE.tmp … … 91 91 wrt_do_ica_work() { # 92 92 #----------------------------------# 93 echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >> logs/\$@ 2>&1" >> $MKFILE.tmp93 echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >> ${LOGDIRBASE}/\$@ 2>&1" >> $MKFILE.tmp 94 94 } 95 95 … … 102 102 local ITEDIR=$3/$2 103 103 local ITEFILE=$3/filelist-$2 104 echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >> logs/\$@ 2>&1" >> $MKFILE.tmp104 echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >> ${LOGDIRBASE}/\$@ 2>&1" >> $MKFILE.tmp 105 105 } 106 106 … … 110 110 local build=build_$1 111 111 local file 112 local ch_order=${PREV%%_*} 112 113 114 echo -e "\t@cd /\$(SCRIPT_ROOT)/${LOGDIRBASE} && mkdir $build && mv -f ${ch_order}_* $build" >> $MKFILE.tmp 115 116 if [ ! "${1}" = "1" ] ; then 113 117 ( 114 118 cat << EOF 115 @cd logs && \\ 116 mkdir $build && \\ 117 mv -f ${system_build} $build && \\ 118 if [ ! $build = build_1 ] ; then \\ 119 cd $build && \\ 120 for file in \`ls .\` ; do \\ 121 mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\ 122 done ; \\ 123 fi ; 124 @cd /\$(SCRIPT_ROOT) 125 @if [ -d test-logs ] ; then \\ 126 cd test-logs && \\ 127 mkdir $build && \\ 128 mv -f ${system_build} $build && \\ 129 if [ ! $build = build_1 ] ; then \\ 130 cd $build && \\ 131 for file in \`ls .\` ; do \\ 132 mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\ 133 done ; \\ 134 fi ; \\ 135 cd /\$(SCRIPT_ROOT) ; \\ 136 fi ; 119 @cd $build && \\ 120 for file in \`ls .\` ; do \\ 121 mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\ 122 done ; 137 123 EOF 138 124 ) >> $MKFILE.tmp 125 fi 126 127 if [ ${CONFIG_TESTS} = "y" ] ; then 128 echo -e "\t@cd /\$(SCRIPT_ROOT)/${TESTLOGDIRBASE} && mkdir $build && mv -f ${ch_order}_* $build" >> $MKFILE.tmp 129 fi 130 131 echo -e "\t@cd /\$(SCRIPT_ROOT)" >> $MKFILE.tmp 139 132 } -
common/libs/func_wrt_Makefile
rf9bfa72 r111d25a 109 109 ( 110 110 cat << EOF 111 @export ${MOUNT_ENV}=\$(MOUNT_PT) && ${PROGNAME}-commands/`dirname $file`/\$@ > logs/\$@ 2>&1111 @export ${MOUNT_ENV}=\$(MOUNT_PT) && ${PROGNAME}-commands/`dirname $file`/\$@ > $LOGDIRBASE/\$@ 2>&1 112 112 EOF 113 113 ) >> $MKFILE.tmp … … 121 121 ( 122 122 cat << EOF 123 @\$(CMDSDIR)/`dirname $file`/\$@ > logs/\$@ 2>&1123 @\$(CMDSDIR)/`dirname $file`/\$@ > $LOGDIRBASE/\$@ 2>&1 124 124 EOF 125 125 ) >> $MKFILE.tmp … … 132 132 ( 133 133 cat << EOF 134 @\$(crCMDSDIR)/`dirname $file`/\$@ > logs/\$@ 2>&1134 @\$(crCMDSDIR)/`dirname $file`/\$@ > $LOGDIRBASE/\$@ 2>&1 135 135 EOF 136 136 ) >> $MKFILE.tmp … … 148 148 ( 149 149 cat << EOF 150 @cp -v \$(MOUNT_PT)/sources/fstab \$(MOUNT_PT)/etc/fstab > logs/\$@ 2>&1150 @cp -v \$(MOUNT_PT)/sources/fstab \$(MOUNT_PT)/etc/fstab > $LOGDIRBASE/\$@ 2>&1 151 151 EOF 152 152 ) >> $MKFILE.tmp … … 158 158 ( 159 159 cat << EOF 160 @cp -v /sources/fstab /etc/fstab > logs/\$@ 2>&1160 @cp -v /sources/fstab /etc/fstab > $LOGDIRBASE/\$@ 2>&1 161 161 EOF 162 162 ) >> $MKFILE.tmp
Note:
See TracChangeset
for help on using the changeset viewer.