Jan Borsodi avatar Jan Borsodi committed 007b56e Merge

Updated with new fixes from default.

Comments (0)

Files changed (2)

         generateXML(package, node)
         if out_dir:
             text = getattr(doc, xmlfunc)()
-            fname = os.path.join(out_dir, service.name + ".xml")
+            service_name = package.name
+            if package.services:
+                service_name = package.services[0].name
+            fname = os.path.join(out_dir, service_name + ".xml")
             outfile = open(fname, "w").write(text)
-            print "Wrote service %s to '%s'" % (service.name, fname)
+            print "Wrote service %s to '%s'" % (service_name, fname)
     if not out_dir:
         text = getattr(doc, xmlfunc)()
         f.write(text)
+[tox]
+envlist = py27
+
+[testenv]
+commands = 
+    rm -rf {envdir}/scope-services
+    hg clone https://bitbucket.org/scope/scope-services {envdir}/scope-services
+    rm -rf {envdir}/js-out
+    {envbindir}/hob --project {envdir}/scope-services js --test-framework --out-dir {envdir}/js-out
+    rm -rf {envdir}/rst-doc
+    {envbindir}/hob --project {envdir}/scope-services rst-doc --out-dir {envdir}/rst-doc
+    rm -rf {envdir}/proto
+    {envbindir}/hob --project {envdir}/scope-services rst-doc --out-dir {envdir}/proto
+    {envbindir}/hob --project {envdir}/scope-services proto --out-file {envdir}/proto-files1.txt
+    {envbindir}/hob --project {envdir}/scope-services proto
+    rm -rf {envdir}/xml
+    {envbindir}/hob --project {envdir}/scope-services xml --out-dir {envdir}/xml
+    {envbindir}/hob --project {envdir}/scope-services xml --out-file {envdir}/xml-out1.xml
+    {envbindir}/hob --project {envdir}/scope-services xml
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.