Revision: 5191
http://ipcop.svn.sourceforge.net/ipcop/?rev=5191&view=rev
Author: gespinasse
Date: 2010-11-30 07:40:15 +0000 (Tue, 30 Nov 2010)
Log Message:
-----------
Make make.sh options more ordered
check become check_url
checkclean become check_url_clean
files_check become check_files
Modified Paths:
--------------
ipcop/trunk/doc/make.sh-usage
ipcop/trunk/make.sh
Modified: ipcop/trunk/doc/make.sh-usage
===================================================================
--- ipcop/trunk/doc/make.sh-usage 2010-11-29 21:36:36 UTC (rev 5190)
+++ ipcop/trunk/doc/make.sh-usage 2010-11-30 07:40:15 UTC (rev 5191)
@@ -12,15 +12,15 @@
Maintainer / advanced commands
prefetch all : preload all files (ignoring architecture) in cache
changelog : Update doc/Changelog from CVS messages log
- check : Test if packages files are still available for download
- This is faster on http URL with --spider,but still slow on ftp
+ check_url : Test if packages files are still available for download
+ This is faster on http URL with --spider,but may be slow on ftp
because of real load.
+check_url_clean : Erase all check_url tags on cache directory to be able to
check
+ another time
check_versions: Compare the versions of packages used in LFS and IPCop
- checkclean : Erase all check mark on cache directory to be able to check
- another time
dist : Mainly produce a diff from previous version to track wich
files have been updated. Export IPCop sources in a .tgz
- files_check : Calculate md5 of include files
+ check_files : Calculate md5 of include files
othersrc : Build a .tgz with all source packages necessary to compile
toolchain : Create our own toolchain package to speed next rebuild
language : Search for all lang entries in source, get translations from
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2010-11-29 21:36:36 UTC (rev 5190)
+++ ipcop/trunk/make.sh 2010-11-30 07:40:15 UTC (rev 5191)
@@ -2239,7 +2239,31 @@
echo
echo "Manually add a release 'marker' to doc/ChangeLog and commit
doc/ChangeLog to update SVN"
;;
-check)
+check_files)
+ # Check if we have yet build
+ if [ ! -f
${BASEDIR}/doc/${NAME}-${VERSION}-all-files-list.${MACHINE}.txt ]; then
+ beautify message FAIL
"${NAME}-${VERSION}-all-files-list.${MACHINE}.txt not found, you need to build
first"
+ exit 1
+ fi
+ if [ ! -d ${BASEDIR}/log_${MACHINE}/05_packages ]; then
+ beautify message FAIL "log_${MACHINE}/05_packages not found,
you need to build first"
+ exit 1
+ fi
+ prepareenv
+ export PATH=${PATH_CH6}
+ STAGE_ORDER=05; STAGE=packages # needed for logfile name
+ chroot_make files_check
+ if [ -f
${BASEDIR}/doc/${NAME}-${PREVIOUSVERSION}-all-files-list.${MACHINE}.txt.md5 ];
then
+ echo -ne "Running MD5 compare"
+ ${BASEDIR}/tools/comp_md5.pl ${BASEDIR} ${VERSION}
${PREVIOUSVERSION} ${MACHINE} ${KVER} ${PERLVER} ${VERSIONSTEP}
+ beautify message DONE
+ echo "See
${BASEDIR}/doc/${NAME}-${VERSION}-diff-list.${MACHINE}.txt for result"
+ else
+ beautify message INFO "No MD5 all-files-list for
${PREVIOUSVERSION} found, no comparison."
+ fi
+ stdumount
+ ;;
+check_url)
echo "Checking sources files availability on the web"
if [ ! -d ${DIR_CHK} ]; then
${MKDIR} ${DIR_CHK}
@@ -2270,6 +2294,10 @@
cd - > /dev/null
;;
+check_url_clean)
+ echo "Erasing sources files availability tags"
+ ${RM} ${DIR_CHK}/*
+ ;;
check_versions)
echo -ne "${BOLD}*** Comparing LFS-${LFS_BRANCH} &
${NAME}-${VERSION}"
echo -ne "${SET_REQUIRED_COL} LFS${SET_FOUND_COL} IPCOP"
@@ -2302,10 +2330,6 @@
beautify message INFO "Failures are not necessarily bad."
;;
-checkclean)
- echo "Erasing sources files availability tags"
- ${RM} ${DIR_CHK}/*
- ;;
clean)
echo -ne "Cleaning ${BOLD}${MACHINE}${NORMAL}
buildtree${SET_RESULT_COL}"
@@ -2386,30 +2410,6 @@
exit 1
fi
;;
-files_check)
- # Check if we have yet build
- if [ ! -f
${BASEDIR}/doc/${NAME}-${VERSION}-all-files-list.${MACHINE}.txt ]; then
- beautify message FAIL
"${NAME}-${VERSION}-all-files-list.${MACHINE}.txt not found, you need to build
first"
- exit 1
- fi
- if [ ! -d ${BASEDIR}/log_${MACHINE}/05_packages ]; then
- beautify message FAIL "log_${MACHINE}/05_packages not found,
you need to build first"
- exit 1
- fi
- prepareenv
- export PATH=${PATH_CH6}
- STAGE_ORDER=05; STAGE=packages # needed for logfile name
- chroot_make files_check
- if [ -f
${BASEDIR}/doc/${NAME}-${PREVIOUSVERSION}-all-files-list.${MACHINE}.txt.md5 ];
then
- echo -ne "Running MD5 compare"
- ${BASEDIR}/tools/comp_md5.pl ${BASEDIR} ${VERSION}
${PREVIOUSVERSION} ${MACHINE} ${KVER} ${PERLVER} ${VERSIONSTEP}
- beautify message DONE
- echo "See
${BASEDIR}/doc/${NAME}-${VERSION}-diff-list.${MACHINE}.txt for result"
- else
- beautify message INFO "No MD5 all-files-list for
${PREVIOUSVERSION} found, no comparison."
- fi
- stdumount
- ;;
prefetch)
# Create cache and cache/tmp
prepareenv
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
