[docgen] Cleanup folder structure

neo-sonar · Oct 20, 2023 · a8bd420 · a8bd420
1 parent 77a6d25
commit a8bd420
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 11 deletions.
diff --git a/tool/jml-docgen/Makefile b/tool/jml-docgen/Makefile
@@ -9,7 +9,7 @@ generate: out
 
 .PHONY: stubs
 stubs: out
-	@${JML_VIEWER} test -s main.lua
+	@${JML_VIEWER} test -s src/main.lua
 
 out:
 	@mkdir -p out

diff --git a/tool/jml-docgen/doxygen.lua → tool/jml-docgen/src/doxygen.lua b/tool/jml-docgen/doxygen.lua → tool/jml-docgen/src/doxygen.lua
@@ -74,12 +74,7 @@ local function parse_return_type(e)
         template_arg = captured
       end)
 
-      if not template_arg then
-        print(ret_type)
-        assert(false)
-      end
-
-      print(template_arg, ret_type)
+      assert(template_arg)
       return strings.trim(template_arg)
     end
   end
@@ -172,7 +167,7 @@ function doxygen.parse_xml(type_name)
     end
   end
 
-  local f = io.open(string.format("out/json/%s.json", type_name), "w")
+  local f = io.open(string.format("../out/json/%s.json", type_name), "w")
   f:write(json.encode(results))
   f:close()
 

diff --git a/tool/jml-docgen/json.lua → tool/jml-docgen/src/json.lua b/tool/jml-docgen/json.lua → tool/jml-docgen/src/json.lua
diff --git a/tool/jml-docgen/ldoc.lua → tool/jml-docgen/src/ldoc.lua b/tool/jml-docgen/ldoc.lua → tool/jml-docgen/src/ldoc.lua
diff --git a/tool/jml-docgen/main.lua → tool/jml-docgen/src/main.lua b/tool/jml-docgen/main.lua → tool/jml-docgen/src/main.lua
@@ -77,8 +77,8 @@ local classes = {
 
 }
 
-local readme = io.open("README.md", "w")
+local readme = io.open("../README.md", "w")
 markdown.write_usertype(readme, classes)
 readme:close()
 
-ldoc.write_usertype_stubs("out/lua", classes)
+ldoc.write_usertype_stubs("../out/lua", classes)
diff --git a/tool/jml-docgen/markdown.lua → tool/jml-docgen/src/markdown.lua b/tool/jml-docgen/markdown.lua → tool/jml-docgen/src/markdown.lua
diff --git a/tool/jml-docgen/sol2.lua → tool/jml-docgen/src/sol2.lua b/tool/jml-docgen/sol2.lua → tool/jml-docgen/src/sol2.lua
@@ -101,6 +101,6 @@ local function write_all_juce_types(file_path)
 end
 
 test()
-write_all_juce_types("out/types.txt")
+write_all_juce_types("../out/types.txt")
 
 return sol2
diff --git a/tool/jml-docgen/strings.lua → tool/jml-docgen/src/strings.lua b/tool/jml-docgen/strings.lua → tool/jml-docgen/src/strings.lua
diff --git a/tool/jml-docgen/tables.lua → tool/jml-docgen/src/tables.lua b/tool/jml-docgen/tables.lua → tool/jml-docgen/src/tables.lua
diff --git a/tool/jml-docgen/testing.lua → tool/jml-docgen/src/testing.lua b/tool/jml-docgen/testing.lua → tool/jml-docgen/src/testing.lua