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

List:       kde-commits
Subject:    quality/apidox/src
From:       Allen Winter <winter () kde ! org>
Date:       2010-12-08 21:07:51
Message-ID: 20101208210751.EE65FAC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204719 by winterz:

replace the "psql" command with "echo" (for now, until the database comes back)
remove *.md5 and *.map files after generation as those are not needed.


 M  +10 -6     gendox.sh  


--- trunk/quality/apidox/src/gendox.sh #1204718:1204719
@@ -24,6 +24,7 @@
 LIBSPATH=$SRCPREFIX/kde-4.x
 #DOXDATAPATH: where the doxygen.sh data lives
 DOXDATAPATH=$LIBSPATH/kdelibs/doc/common
+PSQL="echo" #replace with psql when/if the database is reborn
 PSQL_FLAGS="-t -h services.codeyard.net -U kde  kde"
 
 case "$VERSION" in
@@ -87,9 +88,9 @@
 timestamp=""
 
 # Find my flavor (dox for various versions have different flavors)
-component=`echo "SELECT id FROM components WHERE name = '$VERSION';" | psql \
$PSQL_FLAGS | sed 's+^\s*++'` +component=`echo "SELECT id FROM components WHERE name \
= '$VERSION';" | $PSQL $PSQL_FLAGS | sed 's+^\s*++'`  expr 0 + "$component" > \
                /dev/null 2>&1 || { echo "Could not get component."; exit 1 ; }
-flavor=`echo "SELECT id FROM tools WHERE name='dox' AND component = $component ;" | \
psql $PSQL_FLAGS | sed 's+^\s*++'` +flavor=`echo "SELECT id FROM tools WHERE \
name='dox' AND component = $component ;" | $PSQL $PSQL_FLAGS | sed 's+^\s*++'`  expr \
0 + "$flavor" > /dev/null 2>&1 || { echo "Could not get flavor." ; exit 1 ; }  
 
@@ -97,9 +98,9 @@
 if test -z "$1" ; then
 	timestamp=`date "+%B %d %Y %T"`
 	# Bump generation now
-	generation=`echo "SELECT * FROM nextval('generation') ;" | psql $PSQL_FLAGS | sed \
's+^\s*++'` ;  +	generation=`echo "SELECT * FROM nextval('generation') ;" | $PSQL \
$PSQL_FLAGS | sed 's+^\s*++'` ;   else
-	generation=`echo "SELECT generation FROM tools WHERE id = $flavor" | psql \
$PSQL_FLAGS | sed 's+^\s*++'` ; +	generation=`echo "SELECT generation FROM tools \
WHERE id = $flavor" | $PSQL $PSQL_FLAGS | sed 's+^\s*++'` ;  fi
 
 expr 0 + "$generation" > /dev/null 2>&1 || { echo "Bad generation." ; exit 1 ; }
@@ -176,8 +177,11 @@
 		$BINPATH/doxylog2html.pl --explain --export=ebn --cms="apidox-$VERSION/$i/$APP" \
--rev=$REV $TEMPPATH/$i-$APP.log | sed s+/tempdocs/+/apidocs/+g > \
$TEMPPATH/$i-$APP.html;  echo "INSERT INTO results_apidox VALUES ( $generation, '$i', \
'$APP', $COUNT, $component, '', 'apidox-$VERSION/$i-$APP.html' ); ";  done | \
-	psql $PSQL_FLAGS > /dev/null
+	$PSQL $PSQL_FLAGS > /dev/null
 
+        # clean-up unneeded files
+        ( cd $TEMPPATH; find . -name "*.map" -o -name "*.md5" | xargs rm -f )
+
 	# create one big tar file of all the goodies
 	( cd $TEMPPATH; tar czf $i.tar.gz $i-apidocs )
 
@@ -194,7 +198,7 @@
 	( 
 	echo "INSERT INTO generations VALUES ( $generation, '$timestamp', (SELECT \
SUM(issues) FROM results_apidox WHERE generation = $generation), $flavor, $REV ) ;"  \
                echo "UPDATE tools SET generation = $generation WHERE id = $flavor ;"
-	) | psql $PSQL_FLAGS | sed 's+^\s*++' > /dev/null
+	) | $PSQL $PSQL_FLAGS | sed 's+^\s*++' > /dev/null
 fi
 
 


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