Changeset 444

Timestamp:

10/25/08 23:10:40 (5 years ago)

Author:

atorf

Message:

• Updated publishing script to finally work in Python under Windows!!!
• Minor linux-readme update

Location:

trunk

Files:

• publishing/scripts/publish_toolbox.py (modified) (11 diffs)
• tools/LinuxConnection/LinuxReadme.txt (modified) (1 diff)

trunk/publishing/scripts/publish_toolbox.py

@@ -1 +1 @@
 
-__author__ = "Alexander Behrens (behrens@lfb.rwth-aachen.de)"
-__version__ = "$Revision: 0.1 $"
-__date__ = "$Date: 2008/10/01$"
-__copyright__ = "Copyright (c) 2008 Alexander Behrens"
+__author__ = "Alexander Behrens (behrens@lfb.rwth-aachen.de), Linus Atorf"
+__version__ = "$Revision: 0.2 $"
+__date__ = "$Date: 2008/10/25$"
+__copyright__ = "Copyright (c) 2008 Alexander Behrens, Linus Atorf"
 
 
@@ -30 +30 @@
     #print message
     #os.system(message)
-    os.system(''.join(('matlab -automation -wait -r "cd(\'', sys.path[0], '\'); publish_mfiles(); exit;"')))
+    os.system(''.join(('matlab -automation -wait -r "cd(\'', os.getcwd(), '\'); publish_mfiles(); exit;"')))
 
 
@@ -372 +372 @@
     print "--------------------------------------------------------------"
     print "Create html files from /doc/m2html/*.m files..."
-    message = [];
-    message.append('matlab -nosplash -r')
-    message.append(' "publish_mfiles2html(')
-    message.append("'")
-    message.append(output_dir)
-    message.append("', '")
-    message.append(input_dir)
-    message.append("'")
-    for file in m_files:
-        message.append(", '")
-        message.append(file)
-        message.append("'")
-    message.append('); exit;"')
-    message = ''.join(message)
+    #message = ""
+    #message.append('matlab -automation -wait -r "cd(')
+    #message.append("'")
+    #message.append(os.getcwd())
+    #message.append("');")
+    #message.append(' publish_mfiles2html(')
+    #message.append("'")
+    #message.append(output_dir)
+    #message.append("', '")
+    #message.append(input_dir)
+    #message.append("'")
+    #for file in m_files:
+    #    message.append(", '")
+    #    message.append(file)
+    #    message.append("'")
+    #message.append('); exit;"')
+    #message = ''.join(message)
+    message = 'matlab -automation -wait -r "cd(' + "'" + "%s'); publish_mfiles2html('%s', '%s', '" % (os.getcwd(), output_dir, input_dir)
+    message = message + "', '".join(m_files) + "'); " + 'exit;"'
+        
     print message
     os.system(message)
+        #('matlab -automation -wait -r "cd(\'', os.getcwd(), '\')
     #os.sytem('matlab -nosplash -r "publish_mfile2html(%s, %s); exit;"' % test)
     
@@ -541 +548 @@
     out_private_dir            = os.path.join(output_dir, "private")
     out_demos_dir              = os.path.join(output_dir, "demos")
+    out_tools_dir              = os.path.join(output_dir, "tools")
     
     out_doc_dir                = os.path.join(output_dir, "doc")
@@ -556 +564 @@
     
     
-    dir_list = [out_private_dir, out_demos_dir, 
+    dir_list = [out_private_dir, out_demos_dir,  out_tools_dir,
                 out_doc_dir, out_doc_examples_dir, out_doc_programming_dir, out_doc_tools_dir,
                 out_doc_functions_dir, out_doc_functions_help_dir,
@@ -594 +602 @@
     
     # publish toolbox mfiles
-    # TODO: Funktionsübergabe nach MATLAB funktioniert nicht wirklich
+    # TODO: Funktionsuebergabe nach MATLAB funktioniert nicht wirklich
     publish_toolbox_mfiles(wg_publish_dir, mfiles_dir, out_tmp_mfileshtml)
     
@@ -632 +640 @@
         (filepath, filename) = os.path.split(in_file)
         filenames.append(filename) 
-    #publish_m2html_files(out_tmp_m2html, doc_m2html_dir, filenames)
+    publish_m2html_files(out_tmp_m2html, doc_m2html_dir, filenames)
     
     # remove styles
@@ -646 +654 @@
         (filepath, filename) = os.path.split(in_file)
         filenames.append(filename) 
-    #publish_m2html_files(out_tmp_examples, demos_dir, filenames)
+    publish_m2html_files(out_tmp_examples, demos_dir, filenames)
     
     # remove styles
@@ -657 +665 @@
     
     # copy demos directory
+    print
+    print "--------------------------------------------------------------"
+    print "Copy demo files..."
     files = glob.glob(os.path.join(demos_dir, "*.m"))
     for in_file in files:
@@ -669 +680 @@
         (filepath, filename) = os.path.split(in_file)
         filenames.append(filename) 
-    #publish_m2html_files(out_tmp_tools, tools_dir, filenames)
+    publish_m2html_files(out_tmp_tools, tools_dir, filenames)
     
     # remove styles
@@ -676 +687 @@
     
 
-   
+    # copy tools directory
+    print
+    print "--------------------------------------------------------------"
+    print "Copy tools files..."
+    files = []
+    files.extend(glob.glob(os.path.join(tools_dir, "*.m")))
+    files.extend(glob.glob(os.path.join(tools_dir, "*.fig")))
+    for in_file in files:
+        shutil.copy(in_file, out_tools_dir)
+                
+        # overwrite generated files with  html versions if existing...
+    files = []
+    files.extend(glob.glob(os.path.join(tools_dir, "*.png")))
+    files.extend(glob.glob(os.path.join(tools_dir, "*.html")))
+    for in_file in files:
+        shutil.copy(in_file, out_doc_tools_dir)    
+
+
+    # clean up: delete temp-dir!!!
+    print
+    print "--------------------------------------------------------------"
+    print "Clean up: Delete tmp-folder..."
+    shutil.rmtree(out_tmp, True) # True ignores errors!

trunk/tools/LinuxConnection/LinuxReadme.txt

@@ -49 +49 @@
 http://libusb.wiki.sourceforge.net/ or download it using your packet manager
 (e.g. Debian's apt-get). If the package "libusb" does not work, please try
-installing "libusb-dev".
+installing "libusb0", the latest version "libusb-0.xx", or "libusb-dev".
 
 This was just one step. The second thing to do is making connected NXT devices appear