1. binet
  2. mana-core-codecheck

Commits

alb...@4525493e-7705-40b1-a816-d608a930855b  committed 8c1a40b

version 2.5

  • Participants
  • Parent commits 3f1a9c8
  • Branches default

Comments (0)

Files changed (4)

File ChangeLog

View file
+2005-04-06 Solveig Albrand <solveig.albrand@lpsc.in2p3.fr>
+	* version 2.5 of rulechecker more parsing problems cured
+	* removed codewizard stuff I forgot last time
+	* corrected selection of rules subsets, which was no longer working
+	* since version 2.0
+	
 2005-03-10 Solveig Albrand <solveig.albrand@lpsc.in2p3.fr>
 	* version 2.4 of rulechecker (should cure problems of parsing Boost)
 	* removed codewizard stuff

File cmt/fragments/rulechecker_header

View file
  	 CODECHECK_OUTPUT_DIRECTORY = ${PACKAGE_ROOT}${RELATIVE_CODECHECK_OUTPUT_DIRECTORY}
 endif
 
-SELECTED_RULES_FILE = config_RULES
+SELECTED_RULES_FILE = all_RULES
+ACTUAL_CONFIG = ${IRST_CONFIG_DIR}
 ifeq ($(SELECTED_RULES), naming)
  	 SELECTED_RULES_FILE = naming_RULES
+	 ACTUAL_CONFIG = ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}
 endif
 ifeq ($(SELECTED_RULES), required)
  	 SELECTED_RULES_FILE = required_RULES
+	 ACTUAL_CONFIG = ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}
 endif
 ifeq ($(SELECTED_RULES), recommended)
  	 SELECTED_RULES_FILE = recommended_RULES
+	 ACTUAL_CONFIG = ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}
 endif
  
 ${CONSTITUENT}_output = ${CODECHECK_OUTPUT_DIRECTORY}${RULECHECKER}${RULECHECKER_SUFFIX}
 	$(cpp_echo) $@
 	$(cpp_silent) cd $(bin); 
 	$(cpp_silent) if test  -d ${PACKAGE_ROOT}/src/; then \
-	  /bin/ln -fs ${IRST_CONFIGPATH}/config_* ${PACKAGE_ROOT}/cmt ;\
-	  /bin/ln -fs ${IRST_CONFIGPATH}/${SELECTED_RULES_FILE} ${PACKAGE_ROOT}/cmt/config_RULES; \
+	  /bin/ln -fs ${ACTUAL_CONFIG} ${IRST_DIR}/config; \
+	  /bin/cp ${IRST_CONFIG_DIR}/config* ${ACTUAL_CONFIG}; \
+	  /bin/cp ${IRST_CONFIG_DIR}/${SELECTED_RULES_FILE} ${ACTUAL_CONFIG}/config_RULES; \
 	  if test ! -d $(CODECHECK_OUTPUT_DIRECTORY) ; then ${mkdir} $(CODECHECK_OUTPUT_DIRECTORY); fi;\
 	  if test ! -d $(CODECHECK_OUTPUT_DIRECTORY)${RULECHECKER} ; then ${mkdir} $(CODECHECK_OUTPUT_DIRECTORY)${RULECHECKER}; fi;\
 	  if test ! -d $(${CONSTITUENT}_output) ; then ${mkdir} $(${CONSTITUENT}_output); fi;\
 	
 	
 
+	
+	
+

File cmt/fragments/rulechecker_trailer

View file
 finish::
 	$(cpp_silent) if test  -d ${PACKAGE_ROOT}/src/; then \
 	  echo cleaning up ;\
-	  /bin/rm -f ${PACKAGE_ROOT}/cmt/config_*;\
 	  /bin/rm -f ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/*.i;\
 	  /bin/rm -f ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/*.ii;\
 	  /usr/bin/find ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP} -type l -name '*.h' -exec /bin/rm -f {} \;;\

File cmt/requirements

View file
 ## August 2002 add rulechecker
 ## November - December 2002 - get rulechecker  and codewizard working for release.
 ## Christian Arnault December 2004 - see below - macro use_JavaSDK added
+## April 2005 removed codewizard, and corrected the selection of rule sets
 
-# This package is called CodeCheck and not "codewizard" or "rulechecker" because
-# it provides the two tools and maybe could use others in the future.
+# This package is called CodeCheck and not  "rulechecker" because
+# it maybe could use othertools.
 
-## usage : gmake [CODECHECK_STRATEGY="release"] rulechecker | codewizard
+## usage : gmake [CODECHECK_STRATEGY="release"] rulechecker
+##         gmake [SELECTED_RULES="naming"] rulechecker
 ##
 
 
 #  All settings defined by this package should be selectively valued 
 # only when the CodeCheck tag is active
 #
-#  This tag is activated only when gmake codewizard or rulechecker is run. 
+#  This tag is activated only when gmake rulechecker is run. 
 # And this is actually triggered by the special target_xxx tag associated with the constituents.
 #
 #  This specific tag is therefore automatically associated with the generic CodeCheck tag so as
   
   macro RULECHECKER "" CodeCheck "/rulechecker" 
 
-  
-# The directory for grouping all the output together  
- macro CODECHECK_RELEASE_OUTPUT_DIRECTORY "" CodeCheck  "/afs/cern.ch/user/a/albrand/www/CodeCheck" 
-
-# If this macro is put to "release" then the following 3 macros will be changed
-#  by the make file, but any other value will be leave them untouched.	   
+# If CODECHECK_STRATEGY is put to "release" then output directory will be changed
+# by the make file, but any other value will be leave them untouched.
+# The value "release" puts them all in the same place, 
+# under a subdirectory with the package version tag
+	   
  macro CODECHECK_STRATEGY "" CodeCheck "package"
  
+# It does this by changing the value of the following macro 
+
+ macro RULECHECKER_SUFFIX "" CodeCheck "/"  
+ 
+# and then calculating the value of the output directory, either from the
+# package root, or from the value of the CODECHECK_RELEASE_OUTPUT_DIRECTORY
+# The directory for grouping all the output together 
+ 
+ macro CODECHECK_RELEASE_OUTPUT_DIRECTORY "" CodeCheck  "/afs/cern.ch/user/a/albrand/www/CodeCheck" 
+ 
+# Other possible values of SELECTED_RULES are "naming", "required", "recommended"
+# The make file fragment makes a symbolic link between the selected rules file
+# and the file "config_RULES" which is used by rulechecker
+ 
  macro SELECTED_RULES "" CodeCheck "all"
- 
- 
- macro RULECHECKER_SUFFIX "" CodeCheck "/"  
+
  macro CCTMP "" CodeCheck "/CCTMP"
 
  
 
 
 
-##### For Rule Checker
+##### For Rule Checker (do not override the next two unless you know what you are doing!)
 ## This is the directory where the tool is installed
  macro IRST_DIR ""\
-    CERN&CodeCheck "/afs/cern.ch/user/a/albrand/public/IRST2.4"
+    CERN&CodeCheck "/afs/cern.ch/user/a/albrand/public/IRST2.5"
 
 ##       CERN "/afs/cern.ch/sw/lcg/contrib/rulechecker" 
+## IRST_CONFIG_DIR is the place where rulechecker looks to find its configuration files
 
  macro IRST_CONFIG_DIR "" CodeCheck "${IRST_DIR}/userConfig/ATLAS"