cad/surelog: Unbundle libuhdm and libcapnp

cad/surelog/Makefile

@@ -1,6 +1,7 @@
 PORTNAME=	surelog
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.51
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -16,7 +17,9 @@ BROKEN_i386=	compilation fails: conversion function cannot be redeclared, see ht
 
 BUILD_DEPENDS=	utf8cpp>0:devel/utf8cpp \
 		${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR}
-LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
+LIB_DEPENDS=	libcapnp.so:devel/capnproto \
+		libtcmalloc.so:devel/google-perftools \
+		libuhdm.so:cad/uhdm
 
 USES=		cmake:testing compiler:c++17-lang localbase:ldflags tcl:86,build
 USE_JAVA=	17
@@ -26,12 +29,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	chipsalliance
 GH_PROJECT=	Surelog
 GH_TUPLE=	alainmarcel:antlr4:3143e88:antlr4/third_party/antlr4 \
-		chipsalliance:UHDM:1aaa156:UHDM/third_party/UHDM \
-			capnproto:capnproto:14f24a4:UHDM_capnproto/third_party/UHDM/third_party/capnproto \
 		google:googletest:e1ee0fa:googletest/third_party/googletest \
 		google:flatbuffers:32a6744:flatbuffers/third_party/flatbuffers
 
-CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_ON=	BUILD_SHARED_LIBS SURELOG_USE_HOST_UHDM
 CMAKE_OFF=	SURELOG_BUILD_TESTS
 CMAKE_ARGS=	-DFREEBSD_JAVA_VERSION=${USE_JAVA} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}

cad/surelog/pkg-plist

@@ -1,8 +1,5 @@
 bin/roundtrip
 bin/surelog
-bin/uhdm-cmp
-bin/uhdm-dump
-bin/uhdm-hier
 cmake/Surelog-%%CMAKE_BUILD_TYPE%%.cmake
 cmake/Surelog.cmake
 include/Surelog/API/PythonAPI.h
@@ -79,302 +76,8 @@ include/Surelog/Testbench/TaskMethod.h
 include/Surelog/Testbench/TypeDef.h
 include/Surelog/Testbench/Variable.h
 include/Surelog/surelog.h
-include/uhdm/BaseClass.h
-include/uhdm/ElaboratorListener.h
-include/uhdm/ExprEval.h
-include/uhdm/NumUtils.h
-include/uhdm/RTTI.h
-include/uhdm/Serializer.h
-include/uhdm/SymbolFactory.h
-include/uhdm/SymbolId.h
-include/uhdm/SynthSubset.h
-include/uhdm/UhdmAdjuster.h
-include/uhdm/UhdmLint.h
-include/uhdm/UhdmListener.h
-include/uhdm/VpiListener.h
-include/uhdm/VpiListenerTracer.h
-include/uhdm/actual_group.h
-include/uhdm/alias_stmt.h
-include/uhdm/always.h
-include/uhdm/any_pattern.h
-include/uhdm/array_expr.h
-include/uhdm/array_net.h
-include/uhdm/array_typespec.h
-include/uhdm/array_var.h
-include/uhdm/assert_stmt.h
-include/uhdm/assertion.h
-include/uhdm/assign_stmt.h
-include/uhdm/assignment.h
-include/uhdm/assume.h
-include/uhdm/atomic_stmt.h
-include/uhdm/attribute.h
-include/uhdm/begin.h
-include/uhdm/bit_select.h
-include/uhdm/bit_typespec.h
-include/uhdm/bit_var.h
-include/uhdm/break_stmt.h
-include/uhdm/byte_typespec.h
-include/uhdm/byte_var.h
-include/uhdm/case_item.h
-include/uhdm/case_property.h
-include/uhdm/case_property_item.h
-include/uhdm/case_stmt.h
-include/uhdm/chandle_typespec.h
-include/uhdm/chandle_var.h
-include/uhdm/checker_decl.h
-include/uhdm/checker_inst.h
-include/uhdm/checker_inst_port.h
-include/uhdm/checker_port.h
-include/uhdm/class_defn.h
-include/uhdm/class_hierarchy.txt
-include/uhdm/class_obj.h
-include/uhdm/class_typespec.h
-include/uhdm/class_var.h
-include/uhdm/clocked_property.h
-include/uhdm/clocked_seq.h
-include/uhdm/clocking_block.h
-include/uhdm/clocking_io_decl.h
-include/uhdm/clone_tree.h
-include/uhdm/concurrent_assertions.h
-include/uhdm/constant.h
-include/uhdm/constr_foreach.h
-include/uhdm/constr_if.h
-include/uhdm/constr_if_else.h
-include/uhdm/constraint.h
-include/uhdm/constraint_expr.h
-include/uhdm/constraint_item_group.h
-include/uhdm/constraint_ordering.h
-include/uhdm/cont_assign.h
-include/uhdm/cont_assign_bit.h
-include/uhdm/containers.h
-include/uhdm/continue_stmt.h
-include/uhdm/cover.h
-include/uhdm/deassign.h
-include/uhdm/def_param.h
-include/uhdm/delay_control.h
-include/uhdm/delay_term.h
-include/uhdm/design.h
-include/uhdm/disable.h
-include/uhdm/disable_fork.h
-include/uhdm/disables.h
-include/uhdm/dist_item.h
-include/uhdm/distribution.h
-include/uhdm/do_while.h
-include/uhdm/enum_const.h
-include/uhdm/enum_net.h
-include/uhdm/enum_struct_packed_net_group.h
-include/uhdm/enum_struct_union_packed_array_typespec_group.h
-include/uhdm/enum_struct_union_packed_var_group.h
-include/uhdm/enum_typespec.h
-include/uhdm/enum_var.h
-include/uhdm/event_control.h
-include/uhdm/event_stmt.h
-include/uhdm/event_typespec.h
-include/uhdm/expect_stmt.h
-include/uhdm/expr.h
-include/uhdm/expr_constr_group.h
-include/uhdm/expr_dist.h
-include/uhdm/expr_interf_expr_group.h
-include/uhdm/expr_range_group.h
-include/uhdm/expr_ref_obj_group.h
-include/uhdm/expr_sequence_inst_group.h
-include/uhdm/expr_sequence_inst_named_event_group.h
-include/uhdm/expr_tchk_term_group.h
-include/uhdm/expr_typespec_group.h
-include/uhdm/extends.h
-include/uhdm/final_stmt.h
-include/uhdm/for_stmt.h
-include/uhdm/force.h
-include/uhdm/foreach_stmt.h
-include/uhdm/forever_stmt.h
-include/uhdm/fork_stmt.h
-include/uhdm/func_call.h
-include/uhdm/function.h
-include/uhdm/gate.h
-include/uhdm/gate_array.h
-include/uhdm/gen_scope.h
-include/uhdm/gen_scope_array.h
-include/uhdm/gen_var.h
-include/uhdm/hier_path.h
-include/uhdm/if_else.h
-include/uhdm/if_stmt.h
-include/uhdm/immediate_assert.h
-include/uhdm/immediate_assume.h
-include/uhdm/immediate_cover.h
-include/uhdm/implication.h
-include/uhdm/import_typespec.h
-include/uhdm/include_file_info.h
-include/uhdm/indexed_part_select.h
-include/uhdm/initial.h
-include/uhdm/instance.h
-include/uhdm/instance_array.h
-include/uhdm/instance_item.h
-include/uhdm/int_typespec.h
-include/uhdm/int_var.h
-include/uhdm/integer_net.h
-include/uhdm/integer_typespec.h
-include/uhdm/integer_var.h
-include/uhdm/interf_prog_mod_group.h
-include/uhdm/interface_array.h
-include/uhdm/interface_expr.h
-include/uhdm/interface_inst.h
-include/uhdm/interface_tf_decl.h
-include/uhdm/interface_typespec.h
-include/uhdm/io_decl.h
-include/uhdm/let_decl.h
-include/uhdm/let_expr.h
-include/uhdm/logic_net.h
-include/uhdm/logic_typespec.h
-include/uhdm/logic_var.h
-include/uhdm/long_int_typespec.h
-include/uhdm/long_int_var.h
-include/uhdm/method_func_call.h
-include/uhdm/method_func_task_call_group.h
-include/uhdm/method_task_call.h
-include/uhdm/mod_path.h
-include/uhdm/modport.h
-include/uhdm/module_array.h
-include/uhdm/module_inst.h
-include/uhdm/module_typespec.h
-include/uhdm/multiclock_sequence_expr.h
-include/uhdm/named_begin.h
-include/uhdm/named_event.h
-include/uhdm/named_event_array.h
-include/uhdm/named_event_sequence_expr_group.h
-include/uhdm/named_fork.h
-include/uhdm/net.h
-include/uhdm/net_bit.h
-include/uhdm/net_drivers.h
-include/uhdm/net_loads.h
-include/uhdm/nets.h
-include/uhdm/nets_vars_ref_obj_group.h
-include/uhdm/null_stmt.h
-include/uhdm/operand_group.h
-include/uhdm/operation.h
-include/uhdm/ordered_wait.h
-include/uhdm/package.h
-include/uhdm/packed_array_net.h
-include/uhdm/packed_array_typespec.h
-include/uhdm/packed_array_var.h
-include/uhdm/param_assign.h
-include/uhdm/parameter.h
-include/uhdm/parameters.h
-include/uhdm/part_select.h
-include/uhdm/path_term.h
-include/uhdm/pattern.h
-include/uhdm/pattern_expr_group.h
-include/uhdm/port.h
-include/uhdm/port_bit.h
-include/uhdm/ports.h
-include/uhdm/prim_term.h
-include/uhdm/primitive.h
-include/uhdm/primitive_array.h
-include/uhdm/process_stmt.h
-include/uhdm/program.h
-include/uhdm/program_array.h
-include/uhdm/prop_formal_decl.h
-include/uhdm/property_decl.h
-include/uhdm/property_expr_group.h
-include/uhdm/property_expr_named_event_group.h
-include/uhdm/property_inst.h
-include/uhdm/property_inst_spec_group.h
-include/uhdm/property_spec.h
-include/uhdm/property_typespec.h
-include/uhdm/range.h
-include/uhdm/real_typespec.h
-include/uhdm/real_var.h
-include/uhdm/ref_obj.h
-include/uhdm/ref_obj_interf_net_var_group.h
-include/uhdm/ref_var.h
-include/uhdm/reg.h
-include/uhdm/reg_array.h
-include/uhdm/%%CMAKE_BUILD_TYPE%%.h
-include/uhdm/repeat.h
-include/uhdm/repeat_control.h
-include/uhdm/restrict.h
-include/uhdm/return_stmt.h
-include/uhdm/scope.h
-include/uhdm/seq_formal_decl.h
-include/uhdm/sequence_decl.h
-include/uhdm/sequence_expr_group.h
-include/uhdm/sequence_expr_multiclock_group.h
-include/uhdm/sequence_inst.h
-include/uhdm/sequence_typespec.h
-include/uhdm/short_int_typespec.h
-include/uhdm/short_int_var.h
-include/uhdm/short_real_typespec.h
-include/uhdm/short_real_var.h
-include/uhdm/simple_expr.h
-include/uhdm/simple_expr_use_group.h
-include/uhdm/soft_disable.h
-include/uhdm/spec_param.h
-include/uhdm/stmt.h
-include/uhdm/string_typespec.h
-include/uhdm/string_var.h
-include/uhdm/struct_net.h
-include/uhdm/struct_pattern.h
-include/uhdm/struct_typespec.h
-include/uhdm/struct_var.h
-include/uhdm/sv_vpi_user.h
-include/uhdm/switch_array.h
-include/uhdm/switch_tran.h
-include/uhdm/sys_func_call.h
-include/uhdm/sys_func_task_call_group.h
-include/uhdm/sys_task_call.h
-include/uhdm/table_entry.h
-include/uhdm/tagged_pattern.h
-include/uhdm/task.h
-include/uhdm/task_call.h
-include/uhdm/task_func.h
-include/uhdm/task_func_named_begin_fork_group.h
-include/uhdm/tchk.h
-include/uhdm/tchk_term.h
-include/uhdm/tf_call.h
-include/uhdm/tf_call_args.h
-include/uhdm/thread_obj.h
-include/uhdm/time_net.h
-include/uhdm/time_typespec.h
-include/uhdm/time_var.h
-include/uhdm/type_parameter.h
-include/uhdm/typespec.h
-include/uhdm/typespec_member.h
-include/uhdm/udp.h
-include/uhdm/udp_array.h
-include/uhdm/udp_defn.h
-include/uhdm/uhdm.h
-include/uhdm/uhdm_forward_decl.h
-include/uhdm/uhdm_types.h
-include/uhdm/uhdm_vpi_user.h
-include/uhdm/union_typespec.h
-include/uhdm/union_var.h
-include/uhdm/unsupported_expr.h
-include/uhdm/unsupported_stmt.h
-include/uhdm/unsupported_typespec.h
-include/uhdm/user_systf.h
-include/uhdm/var_bit.h
-include/uhdm/var_select.h
-include/uhdm/variable_drivers_group.h
-include/uhdm/variable_loads_group.h
-include/uhdm/variables.h
-include/uhdm/variables_operation_group.h
-include/uhdm/vhpi_user.h
-include/uhdm/virtual_interface_var.h
-include/uhdm/void_typespec.h
-include/uhdm/vpi_uhdm.h
-include/uhdm/vpi_user.h
-include/uhdm/vpi_visitor.h
-include/uhdm/wait_fork.h
-include/uhdm/wait_stmt.h
-include/uhdm/waits.h
-include/uhdm/while_stmt.h
 lib/cmake/SurelogConfig.cmake
-lib/libcapnp.so
-lib/libcapnp.so.0.8.0
-lib/libkj.so
-lib/libkj.so.0.8.0
-lib/libuhdm.so
 lib/surelog/libantlr4-runtime.a
 lib/surelog/libflatbuffers.a
 lib/surelog/libsurelog.so
-lib/uhdm/UHDM.capnp
 libdata/pkgconfig/Surelog.pc