Changeset 14477 for trunk/base

Timestamp:

Oct 8, 2005, 7:54:40 AM (19 years ago)

Author:

pguyot (Paul Guyot)

Message:

Commit IndexRegen as it is now executed twice a day on lamancha.

• Configuration changed
• Made the script more robust
• Fixed a bug with -with-tcl-package -> -with-tclpackage

File:

• trunk/base/src/portmgr/IndexRegen.sh (modified) (6 diffs)

trunk/base/src/portmgr/IndexRegen.sh

@@ -6 +6 @@
 # e-mail: jmpp@opendarwin.org
 # Updated by Paul Guyot, <pguyot@kallisys.net>
-# Date: 2005/10/4
+# $Id: IndexRegen.sh,v 1.5 2005/10/08 07:54:40 pguyot Exp $
 ####
 
 # Configuration
 # ROOT directory, where everything is. This must exist.
-ROOT=/Users/paul/darwinports-portindex
+ROOT=/Users/pguyot/dp-portindex
 # SSH key. This must exist.
 SSH_KEY=${ROOT}/id_dsa
 # DP user.
-DP_USER=paul
+DP_USER=pguyot
 # DP group.
-DP_GROUP=admin
+DP_GROUP=darwinports
 # CVS user.
 CVS_USER=pguyot
@@ -43 +43 @@
 # Something went wrong.
 FAILED=0
-# Output of portindex.
-PORTINDEX_LOG=${ROOT}/portindex.log
 # Commit message.
 COMMIT_MSG=${ROOT}/commit.msg
@@ -83 +81 @@
         ./configure \
                 --prefix=${PREFIX} \
-                --with-tcl-package=${TCLPKG} \
+                --with-tclpackage=${TCLPKG} \
                 --with-install-user=${DP_USER} \
                 --with-install-group=${DP_GROUP} > $FAILURE_LOG 2>&1 \
                 || { echo "./configure failed" >> $FAILURE_LOG ; FAILED=1 ; }
+fi
+
+# clean
+# (cleaning is useful because we don't want the indexing to fail because dependencies aren't properly computed).
+if [ $FAILED -eq 0 ]; then
+        { cd ${TREE}/${CVS_MODULE}/base/ && \
+        make clean > $FAILURE_LOG 2>&1 ; } \
+                || { echo "make clean failed" >> $FAILURE_LOG ; FAILED=1 ; }
 fi
 
@@ -106 +112 @@
 if [ $FAILED -eq 0 ]; then
         { cd ${TREE}/${CVS_MODULE}/dports/ && \
-        ${PREFIX}/bin/portindex | tee $PORTINDEX_LOG > $FAILURE_LOG 2>&1 ; } \
+        ${PREFIX}/bin/portindex > $FAILURE_LOG 2>&1 ; } \
                 || { echo "portindex failed" >> $FAILURE_LOG ; FAILED=1 ; }
 fi
@@ -119 +125 @@
 if [ $FAILED -eq 0 ]; then
         # Use the last 5 lines of the log for the commit message.
-        tail -n 5 $PORTINDEX_LOG > $COMMIT_MSG
+        tail -n 5 $FAILURE_LOG > $COMMIT_MSG
         
         # Actually commit the file.
@@ -132 +138 @@
 else
         # trash log files
-        rm -f $PORTINDEX_LOG $COMMIT_MSG $FAILURE_LOG
+        rm -f $COMMIT_MSG $FAILURE_LOG
 fi