[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[5369] ipcop/trunk
From:       gespinasse () users ! sourceforge ! net
Date:       2011-01-25 19:20:55
Message-ID: E1PhoRj-0002LA-B7 () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 5369
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5369&view=rev
Author:   gespinasse
Date:     2011-01-25 19:20:55 +0000 (Tue, 25 Jan 2011)

Log Message:
-----------
Use long options for ccache

As ccache-stats.log is created per package :
- remove ./make.sh ccache option to output stats
- remove ccache stat output on toolchain and build end
- remove ccache reset on ./make.sh clean

Modified Paths:
--------------
    ipcop/trunk/doc/make.sh-usage
    ipcop/trunk/lfs/Config
    ipcop/trunk/make.sh

Modified: ipcop/trunk/doc/make.sh-usage
===================================================================
--- ipcop/trunk/doc/make.sh-usage	2011-01-25 18:59:06 UTC (rev 5368)
+++ ipcop/trunk/doc/make.sh-usage	2011-01-25 19:20:55 UTC (rev 5369)
@@ -11,7 +11,6 @@
 
 Maintainer / advanced commands
  prefetch all : preload all files (ignoring architecture) in cache
-       ccache : Display ccache statistics
  ccache_clean : Completely clear the ccache cache. This may take a long time.
     changelog : Update doc/Changelog from CVS messages log
     check_url : Test if packages files are still available for download

Modified: ipcop/trunk/lfs/Config
===================================================================
--- ipcop/trunk/lfs/Config	2011-01-25 18:59:06 UTC (rev 5368)
+++ ipcop/trunk/lfs/Config	2011-01-25 19:20:55 UTC (rev 5369)
@@ -65,12 +65,13 @@
 	echo "====================================== Installing $(THISAPP) ..."
 	@echo "Install started; saving file list to $(DIR_SRC)/lsalr ..."
 	@if [ ! -f $(DIR_SRC)/lsalr ]; then $(FIND_FILES) > $(DIR_SRC)/lsalr; fi
-	ccache -z 1>/dev/null
+	ccache --zero-stats 1>/dev/null
 endef
 else
 define PREBUILD
 	echo "====================================== Installing $(THISAPP) ..."
-	-[ -f /$(TOOLS_DIR)/usr/bin/ccache ] && ccache -z 1>/dev/null
+	# Allow tests to fail when ccache is compiled
+	-[ -f /$(TOOLS_DIR)/usr/bin/ccache ] && ccache --zero-stats 1>/dev/null
 endef
 endif
 
@@ -111,7 +112,7 @@
 		touch $(TARGET); \
 	fi
 	@rm -f $(TARGET)_diff $(TARGET)_rootfile
-	(echo $(TARGET) && ccache -s) \
>>$(LFS_BASEDIR)/log_$(MACHINE)/_build_ccache-stats.log +	(echo $(TARGET) && ccache \
> > --show-stats) >>$(LFS_BASEDIR)/log_$(MACHINE)/_build_ccache-stats.log
 	@echo "===================================== Install done for $(THISAPP)."
 endef
 else
@@ -119,7 +120,8 @@
 
 	@echo "===================================== Install done for $(THISAPP)."
 	touch $(TARGET)
-	[ -f /$(TOOLS_DIR)/usr/bin/ccache ] && (echo $(TARGET) && ccache -s) \
>>$(LFS_BASEDIR)/log_$(MACHINE)/_build_ccache-stats.log +	[ -f \
> > /$(TOOLS_DIR)/usr/bin/ccache ] && \
+		(echo $(TARGET) && ccache --show-stats) \
>>$(LFS_BASEDIR)/log_$(MACHINE)/_build_ccache-stats.log  endef
 endif
 

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2011-01-25 18:59:06 UTC (rev 5368)
+++ ipcop/trunk/make.sh	2011-01-25 19:20:55 UTC (rev 5369)
@@ -2221,8 +2221,6 @@
 
 	[ "${RUNNING_TEST}" == 'yes' ] && parse_tests
 
-	${CCACHE} -s > ${BASEDIR}/log_${MACHINE}/_build_ccache.log
-
 	#temporary comment while alpha stage:
 	echo ""
 	echo "Burn a CD, write ${SNAME}-${VERSION}-boot.img to floppy or use pxe to boot."
@@ -2352,9 +2350,6 @@
 	stdumount
 	[ ${?} -ne 0 ] && exiterror "Not safe to clean the tree with some mountpoint still \
there, retry when compilation has finished"  
-	# reset the stats (and hide the ccache message)
-	[ -f ${CCACHE} ] && ${CCACHE} -z >/dev/null
-
 	${SUDO} ${RM} ${BASEDIR}/build_${MACHINE}
 	${SUDO} ${RM} ${BASEDIR}/files_${MACHINE}
 	${SUDO} ${RM} ${BASEDIR}/log_${MACHINE}
@@ -2368,13 +2363,9 @@
 
 	beautify message DONE
 	;;
-ccache)
-	# read the stats
-	[ -f ${CCACHE} ] && ${CCACHE} -s
-	;;
 ccache_clean)
 	echo -ne "Cleaning ${BOLD}ccache cache${NORMAL} (patience) ... ${SET_RESULT_COL}"
-	[ -f ${CCACHE} ] && ${CCACHE} -C > /dev/null
+	[ -f ${CCACHE} ] && ${CCACHE} --clear > /dev/null
 	beautify message DONE
 	;;
 dist)
@@ -2505,8 +2496,6 @@
 	package_toolchain
 	[ "${RUNNING_TEST}" == 'yes' ] && parse_tests
 
-	${CCACHE} -s > ${BASEDIR}/log_${MACHINE}/_build_ccache.log
-
 	BUILDTIME=$[`date +"%s"` - ${BUILDSTART}]
 	BUILDMINUTES=$[${BUILDTIME} / 60]
 	BUILDSECONDS=$[${BUILDTIME} - ${BUILDMINUTES}*60]


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]