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

List:       kde-commits
Subject:    kdeextragear-1/scripts
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2003-11-05 21:37:22
[Download RAW message or body]

CVS commit by trueg: 

remove all .cvsignore files
remove the automake cache dir at the end. There is no need to include it 
in a package.
added an option to force the usage of the configure.in.in from the application
instead of merging in the module's version.


  M +17 -6     cvsExtract.sh   1.20


--- kdeextragear-1/scripts/cvsExtract.sh  #1.19:1.20
@@ -38,4 +38,5 @@
 GETDOC="yes"
 GETI18N="yes"
+PLAINCONFIGURE="no"
 
 # CVS settings
@@ -107,4 +108,6 @@
                                The tag will only be used for the application files
                                and not for the admin and the module data.
+   --plainconfigure            Use the configure.in.in from the application without 
+                               any changes like merging in the modules configure.in.in.
     -h|--help                  This Help"
 }
@@ -173,4 +176,7 @@
         USETAGFORADMIN=="no"
       ;;
+    --plainconfigure)
+        PLAINCONFIGURE="yes"
+      ;;
     --listtags)
         # we do not call lisstags and exit here,
@@ -359,4 +365,5 @@
 function cleanUpFiles {
     find . -name "CVS" -type d -exec rm -rf \{\} \; 2>/dev/null
+    find . -name ".cvsignore" -exec rm -f \{\} \; 2>/dev/null
 }
 
@@ -423,10 +430,12 @@
     # merge some files
     # configure.in.in
-    cat $1/configure.in.in > $2/configure.in.in.in
-    if [ -f "$2/configure.in.in" ] ; then
-        cat $2/configure.in.in >> $2/configure.in.in.in
-        rm -f $2/configure.in.in
+    if [ $PLAINCONFIGURE = "no" ]; then
+        cat $1/configure.in.in > $2/configure.in.in.in
+        if [ -f "$2/configure.in.in" ] ; then
+            cat $2/configure.in.in >> $2/configure.in.in.in
+            rm -f $2/configure.in.in
+        fi
+        mv -f $2/configure.in.in.in $2/configure.in.in
     fi
-    mv -f $2/configure.in.in.in $2/configure.in.in
     
     # Makefile.am and Makefile.am.in
@@ -560,5 +569,5 @@
 fi
 
-# remove all "CVS/*" files
+# remove all "CVS/*" and .cvsignore files
 cd "$BUILDDIR"
 cleanUpFiles
@@ -609,2 +618,4 @@
 
 
+# remove autoconfig temp dir, there is no need to package it
+rm -rf autom4te.cache 2>/dev/null


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