Merge pull request #336 from kjnh10/feature/muti-includepath_for_bundling_c++

Add multi include path feature for bundling c++ code

Author: kmyk

onlinejudge_bundle/main.py

@@ -22,12 +22,12 @@ def main(args: Optional[List[str]] = None) -> None:
     # parse command-line arguments
     parser = argparse.ArgumentParser()
     parser.add_argument('path', type=pathlib.Path)
-    parser.add_argument('-I', metavar='dir', type=pathlib.Path, dest='iquote', default=pathlib.Path.cwd(), help='add the directory dir to the list of directories to be searched for header files during preprocessing (default: ".")')
+    parser.add_argument('-I', metavar='dir', action='append', type=pathlib.Path, dest='iquote', default=[pathlib.Path.cwd()], help='add the directory dir to the list of directories to be searched for header files during preprocessing (default: ".")')
     parsed = parser.parse_args(args)
 
     language = onlinejudge_verify.languages.list.get(parsed.path)
     assert language is not None
-    sys.stdout.buffer.write(language.bundle(parsed.path, basedir=parsed.iquote))
+    sys.stdout.buffer.write(language.bundle(parsed.path, basedir=parsed.iquote[0], options={'include_paths': parsed.iquote}))
 
 
 if __name__ == "__main__":

onlinejudge_verify/documentation/build.py

@@ -68,7 +68,7 @@ def _render_source_code_stat(stat: SourceCodeStat, *, basedir: pathlib.Path) ->
     try:
         language = onlinejudge_verify.languages.list.get(stat.path)
         assert language is not None
-        bundled_code = language.bundle(stat.path, basedir=basedir).decode()
+        bundled_code = language.bundle(stat.path, basedir=basedir, options={'include_paths': [basedir]}).decode()
     except Exception:
         logger.warning("failed to bundle: %s", str(stat.path))
         bundled_code = traceback.format_exc()

onlinejudge_verify/languages/cplusplus.py

@@ -186,8 +186,10 @@ def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Lis
         joined_CXXFLAGS = ' '.join(map(shlex.quote, [*env.CXXFLAGS, '-I', str(basedir)]))
         return _cplusplus_list_depending_files(path.resolve(), CXX=env.CXX, joined_CXXFLAGS=joined_CXXFLAGS)
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
-        bundler = Bundler(iquotes=[basedir])
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path = pathlib.Path.cwd(), options: Dict[str, Any]) -> bytes:
+        include_paths: List[pathlib.Path] = options['include_paths']
+        assert isinstance(include_paths, list)
+        bundler = Bundler(iquotes=include_paths)
         bundler.update(path)
         return bundler.get()
 

onlinejudge_verify/languages/csharpscript.py

@@ -109,7 +109,7 @@ def list_attributes(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Dict[
     def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> List[pathlib.Path]:
         return list(_get_csx_dependencies(path.resolve()))
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any]) -> bytes:
         raise NotImplementedError
 
     def list_environments(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Sequence[CSharpScriptLanguageEnvironment]:

onlinejudge_verify/languages/models.py

@@ -40,7 +40,7 @@ def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Lis
         raise NotImplementedError
 
     @abc.abstractmethod
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any]) -> bytes:
         """
         :throws Exception:
         :throws NotImplementedError:

onlinejudge_verify/languages/nim.py

@@ -82,7 +82,7 @@ def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Lis
                 stk.append(child)
         return list(set(dependencies))
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any]) -> bytes:
         raise NotImplementedError
 
     def is_verification_file(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bool:

onlinejudge_verify/languages/python.py

@@ -4,7 +4,7 @@
 import sys
 import textwrap
 from logging import getLogger
-from typing import List, Sequence, Tuple
+from typing import Any, Dict, List, Sequence, Tuple
 
 import importlab.environment
 import importlab.fs
@@ -78,7 +78,7 @@ class PythonLanguage(Language):
     def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> List[pathlib.Path]:
         return _python_list_depending_files(path.resolve(), basedir)
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any]) -> bytes:
         """
         :throws NotImplementedError:
         """

onlinejudge_verify/languages/user_defined.py

@@ -63,7 +63,7 @@ def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Lis
             dependencies.append(pathlib.Path(line.decode()))
         return dependencies
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any]) -> bytes:
         assert 'bundle' in self.config
         command = self.config['bundle'].format(path=str(path), basedir=str(basedir))
         logger.info('$ %s', command)

tests/test_bundle.py

@@ -116,7 +116,7 @@ def test_smoke(self) -> None:
                 self.assertEqual(subprocess.check_output([str(pathlib.Path('a.out').resolve())]), ('Hello World' + os.linesep).encode())
 
     def test_complicated(self) -> None:
-        library_files = {
+        library_files_1 = {
             pathlib.Path('library', 'macro.hpp'): textwrap.dedent("""\
                 #pragma once
                 #define REP(i, n) for (int i = 0; (i) < (int)(n); ++ (i))
@@ -125,6 +125,8 @@ def test_complicated(self) -> None:
                 #define REP3R(i, m, n) for (int i = (int)(n) - 1; (i) >= (int)(m); -- (i))
                 #define ALL(x) std::begin(x), std::end(x)
                 """).encode(),
+        }
+        library_files_2 = {
             pathlib.Path('library', 'fibonacci.hpp'): textwrap.dedent("""\
                 #pragma once
                 #include <cstdint>
@@ -161,12 +163,13 @@ def test_complicated(self) -> None:
         with tempfile.TemporaryDirectory() as tempdir_dst_:
             tempdir_dst = pathlib.Path(tempdir_dst_)
 
-            with tests.utils.load_files_pathlib(library_files) as tempdir_src_library:
-                with tests.utils.load_files_pathlib(test_files) as tempdir_src_test:
-                    with open(tempdir_dst / 'main.bundled.cpp', 'w') as fh:
-                        with contextlib.redirect_stdout(fh):
-                            args = ['-I', str(tempdir_src_library), str(tempdir_src_test / 'test' / 'main.cpp')]
-                            onlinejudge_bundle.main.main(args=args)
+            with tests.utils.load_files_pathlib(library_files_1) as tempdir_src_library_1:
+                with tests.utils.load_files_pathlib(library_files_2) as tempdir_src_library_2:
+                    with tests.utils.load_files_pathlib(test_files) as tempdir_src_test:
+                        with open(tempdir_dst / 'main.bundled.cpp', 'w') as fh:
+                            with contextlib.redirect_stdout(fh):
+                                args = ['-I', str(tempdir_src_library_1), '-I', str(tempdir_src_library_2), str(tempdir_src_test / 'test' / 'main.cpp')]
+                                onlinejudge_bundle.main.main(args=args)
 
             # compile
             subprocess.check_call(['g++', '-o', str(tempdir_dst / 'a.out'), str(tempdir_dst / 'main.bundled.cpp')], stderr=sys.stderr)