[Blends-commit] [SCM] blends-gsoc branch, master, updated. beabc2d1f3474cac377a5a8a4260912f16ccb087

[Emmanouil Kiagias]

The following commit has been merged in the master branch:
commit beabc2d1f3474cac377a5a8a4260912f16ccb087
Author: Emmanouil Kiagias <e.kiagias at gmail.com>
Date:   Mon Jul 29 18:41:12 2013 +0200

    restructured project's directories. moved old scripts into the multiple/ directory and created devtools directory

diff --git a/single/blend-gen-control b/devtools/blend-gen-control
similarity index 100%
rename from single/blend-gen-control
rename to devtools/blend-gen-control
diff --git a/single/sec-blend-gen-control b/devtools/sec-blend-gen-control
similarity index 100%
rename from single/sec-blend-gen-control
rename to devtools/sec-blend-gen-control
diff --git a/single/tester b/devtools/tester
similarity index 52%
rename from single/tester
rename to devtools/tester
index 7e6439c..0baa948 100755
--- a/single/tester
+++ b/devtools/tester
@@ -6,17 +6,17 @@
 
 for blend in `psql -t udd -c 'SELECT blend FROM blends_metadata ORDER BY blend;'`
 do  
-    echo "Generating control files for $blend."
-    ./blend-gen-control -S -D -c -b $blend 
-    ./sec-blend-gen-control -S -D -c -b $blend 
+    #echo "Generating control files for $blend."
+    #./blend-gen-control -S -D -c -b $blend 
+    #./sec-blend-gen-control -S -D -c -b $blend 
     
-    diff control control-sec
+    #diff control control-sec
 
     #no need to generate and compare task-description files(they have exact the same data
     #with the control files)
-    #echo "Generating task-description files for $blend."
-    #./blend-gen-control -S -t -b $blend 
-    #./sec-blend-gen-control -S -t -b $blend 
+    echo "Generating task-description files for $blend."
+    ./blend-gen-control -S -t -b $blend 
+    ./sec-blend-gen-control -S -t -b $blend 
 
-    #diff taskdesc.template taskdesc-sec.template
+    diff taskdesc.template taskdesc-sec.template
 done
diff --git a/blend-gen-control b/multiple/blend-gen-control
similarity index 100%
rename from blend-gen-control
rename to multiple/blend-gen-control
diff --git a/multiple/cleaner b/multiple/cleaner
new file mode 100755
index 0000000..d2598ec
--- /dev/null
+++ b/multiple/cleaner
@@ -0,0 +1,7 @@
+#!/bin/bash
+#clean up the directories
+
+ls control/* | grep -v "readme" | xargs rm
+ls control-sec/* | grep -v "readme" | xargs rm
+ls taskdesc/* | grep -v "readme" | xargs rm
+ls taskdesc-sec/* | grep -v "readme" | xargs rm
\ No newline at end of file
diff --git a/control-sec/readme b/multiple/control-sec/readme
similarity index 100%
rename from control-sec/readme
rename to multiple/control-sec/readme
diff --git a/control/readme b/multiple/control/readme
similarity index 100%
rename from control/readme
rename to multiple/control/readme
diff --git a/multiple/readme b/multiple/readme
new file mode 100644
index 0000000..5444e54
--- /dev/null
+++ b/multiple/readme
@@ -0,0 +1 @@
+in this directory reside the {sec-}blend-gen-control scripts which generate multiple control.<arch>/taskdesc.<arch> files
\ No newline at end of file
diff --git a/sec-blend-gen-control b/multiple/sec-blend-gen-control
similarity index 100%
rename from sec-blend-gen-control
rename to multiple/sec-blend-gen-control
diff --git a/taskdesc-sec/readme b/multiple/taskdesc-sec/readme
similarity index 100%
rename from taskdesc-sec/readme
rename to multiple/taskdesc-sec/readme
diff --git a/taskdesc/readme b/multiple/taskdesc/readme
similarity index 100%
rename from taskdesc/readme
rename to multiple/taskdesc/readme
diff --git a/tester b/multiple/tester
similarity index 100%
rename from tester
rename to multiple/tester
diff --git a/single/readme b/single/readme
deleted file mode 100644
index 2b66585..0000000
--- a/single/readme
+++ /dev/null
@@ -1 +0,0 @@
-here the {sec-}blend-gen-control scripts will generate a single control file rather than multiple control.<arch> files
\ No newline at end of file
diff --git a/test_taskdesc b/test_taskdesc
index f0633cc..ecff412 100755
--- a/test_taskdesc
+++ b/test_taskdesc
@@ -10,11 +10,11 @@ architectures=`psql -t udd -c "SELECT DISTINCT architecture FROM packages WHERE
 
 for blend in `psql -t udd -c 'SELECT blend FROM blends_metadata ORDER BY blend;'`
 do      
-    echo "Generating taskdesc files for $blend"
-    ./sec-blend-gen-control -S -t -b $blend
+    echo "Generating multiple taskdesc.<arch> files for $blend"
+    (cd multiple/; ./sec-blend-gen-control -S -t -b $blend)
 
     echo "Generating taskdesc.template files for $blend"
-    single/sec-blend-gen-control -S -t -b $blend
+    devtools/sec-blend-gen-control -S -t -b $blend
 
     for arch in $architectures
     do
@@ -23,12 +23,12 @@ do
         #for example match only !s390 and not !s390x and in sed also remove the trailing spaces of the end of each line to avoid trailing spaces diffs 
         grep -vE "\[\!$arch\]|\[\!$arch | \!$arch | \!$arch\]" | sed -e 's/\[.*\]//;s/[ \t]*$//' > taskdesc-sec.temp
         #also remove trailing spaces from this file to make sure we avoid trailing spaces diffs
-        sed 's/[ \t]*$//' taskdesc-sec/${blend}-tasks.desc.$arch > taskdesc-sec.temp2
+        sed 's/[ \t]*$//' multiple/taskdesc-sec/${blend}-tasks.desc.$arch > taskdesc-sec.temp2
         if [ $DEBUG != 0 ] ; then
-            echo "diff taskdesc-sec.temp taskdesc-sec/${blend}-tasks.desc.$arch"
+            echo "diff taskdesc-sec.temp multiple/taskdesc-sec/${blend}-tasks.desc.$arch"
         fi
         diff taskdesc-sec.temp taskdesc-sec.temp2
     done
 done
 
-rm taskdesc-sec.temp taskdesc-sec.temp2
\ No newline at end of file
+rm taskdesc-sec.temp taskdesc-sec.temp2 taskdesc-sec.template
\ No newline at end of file

-- 
Git repository for blends-gsoc code