SF.net SVN: morphix: [2174] trunk/morph-scripts/debian

Revision: 2174
Author:   bmsleight
Date:     2006-03-27 11:32:44 -0800 (Mon, 27 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2174&view=rev

Log Message:
-----------
Learnt xml

Modified Paths:
--------------
    trunk/mmaker/utils/auto-testing/AutoTestingMini.xml
    trunk/mmaker/utils/auto-testing/run_testing.sh
    trunk/morph-scripts/debian/control
    trunk/morph-scripts/morphmini/morphimini
Modified: trunk/mmaker/utils/auto-testing/AutoTestingMini.xml
===================================================================
--- trunk/mmaker/utils/auto-testing/AutoTestingMini.xml	2006-03-26 22:21:18 UTC (rev 2173)
+++ trunk/mmaker/utils/auto-testing/AutoTestingMini.xml	2006-03-27 19:32:44 UTC (rev 2174)
@@ -13,7 +13,7 @@
      <command>echo " * Using AutoTesting Mini Module"</command>
     </preX>
     <X>         <!-- Commands to run in X windows -->
-     <command>firefox http://www.google.com &</command>
+     <command>firefox http://www.google.com &amp; </command>
 <!--     <command>sleep 60</command> --> <!-- As xmessage runs and terminates quickly, wait until x is settled until running next command -->
      <command>/bin/bash $1/morphix/files/cat_file.sh</command>
     </X>

Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh	2006-03-26 22:21:18 UTC (rev 2173)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh	2006-03-27 19:32:44 UTC (rev 2174)
@@ -70,8 +70,9 @@
 fi
 
 #Build minimod
-/home/morph/morphix/trunk/mmaker/utils/auto-testing/build_auto_test_mini.sh
+#/home/morph/morphix/trunk/mmaker/utils/auto-testing/build_auto_test_mini.sh
 #morphmini /home/morph/morphix/trunk/mmaker/utils/auto-testing/AutoTestingMini.xml $DEBUG_MINI
+sudo /home/morph/morphix/trunk/morph-scripts/morphmini/morphimini /home/morph/morphix/trunk/mmaker/utils/auto-testing/AutoTestingMini.xml $DEBUG_MINI
 
 TODAY=$(date +"%F")
 MAINMODS=$(find /home/morph/autobuilds/mainmod/ /home/morph/alextreme/mainmod/ /home/morph/local_autobuilds/builds/ -type f  -name "*$TODAY*.mod"  )

Modified: trunk/morph-scripts/debian/control
===================================================================
--- trunk/morph-scripts/debian/control	2006-03-26 22:21:18 UTC (rev 2173)
+++ trunk/morph-scripts/debian/control	2006-03-27 19:32:44 UTC (rev 2174)
@@ -111,5 +111,5 @@
 
 Package: morphing-morphmini
 Architecture: any
-Depends: xmlstarlet
+Depends: xmlstarlet, morphix-modulebuilder
 Description: Creates a morphix mini module, using a template file.

Modified: trunk/morph-scripts/morphmini/morphimini
===================================================================
--- trunk/morph-scripts/morphmini/morphimini	2006-03-26 22:21:18 UTC (rev 2173)
+++ trunk/morph-scripts/morphmini/morphimini	2006-03-27 19:32:44 UTC (rev 2174)
@@ -13,6 +13,7 @@
 {
  TMP_DIR=/tmp/morphixmini.$$
  TMP_FILE=/tmp/morphixmini.$$.tmp
+ TMP_FILE_2=/tmp/morphixmini.$$.2.tmp
  RETURN_VALUE=""
 }
 
@@ -38,6 +39,7 @@
 xml_get_tmp ()
 {
  xmlstarlet sel -t -m "$1" -v "$2" -v "@$3" -n $4 |  sed 's/^[ \t]*//' | sed  /^$/d >$TMP_FILE
+ convert_quoted_chars
 }
 
 
@@ -55,7 +57,8 @@
 
 process_filelist ()
 {
-xml_get //minimod filelist file $TEMPLATE
+xml_get_tmp //minimod filelist file $TEMPLATE
+RETURN_VALUE=$(cat $TMP_FILE)
 for CP_FILES in $RETURN_VALUE
 do 
  cp -p $CP_FILES $TMP_DIR/minimod/morphix/files/
@@ -107,10 +110,22 @@
 
 remove_minimodule_tmp ()
 {
-rm $TMP_DIR -r
-rm /tmp/morphixmini.$$.tmp
+rm $TMP_DIR -r	2>/dev/null
+rm $TMP_FILE	2>/dev/null
+rm $TMP_FILE_2	2>/dev/null
 }
 
+convert_quoted_chars ()
+{
+AMP="\&amp;/\&"
+sed -e s/$AMP/g $TMP_FILE >$TMP_FILE_2
+AMP="\&lt;/<"
+sed -e s/$AMP/g  $TMP_FILE_2 >$TMP_FILE
+AMP="\&gt;/>"
+sed -e s/$AMP/g  $TMP_FILE >$TMP_FILE_2
+AMP="\&quot;/\""
+sed -e s/$AMP/g  $TMP_FILE_2 >$TMP_FILE
+}
 
 
 #Main loop


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642