Attachment #214455 for bug #246441

View | Details | Raw Unified | Return to bug 246441
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	jtc
DISTVERSION=	1.76
CATEGORIES=	textproc

MAINTAINER=	vulcan@wired.sh

USE_GITHUB=	yes
GH_ACCOUNT=	ldn-softdev

LDFLAGS+=	-lexecinfo -lpthread

PLIST_FILES=	bin/${PORTNAME}
PORTDOCS=	"Release Notes.md" "User Guide.md" "Walk-path tutorial.md" \
		README.md

OPTIONS_DEFINE=	BG_CC BG_DTS BG_FLOW BG_MTS DOCS NO_DBG NO_DBG_PARSER

BG_CC_DESC=		Every call to a copy-constructor of Jnode class will reveal itself
BG_DTS_DESC=		Makes time-stamp display delta (since last debug message) instead of absolute stamp
BG_FLOW_DESC=		All debuggable function/method calls will display an entry and exit point
BG_MTS_DESC=		Display absolute time-stamps in the debug message
NO_DBG_DESC=		Disable all debug messages
NO_DBG_PARSER_DESC=	Disable debug messages coming from parsing JSON

BG_CC_CXXFLAGS=		-DBG_CC
BG_DTS_CXXFLAGS=	-DBG_dTS
BG_FLOW_CXXFLAGS=	-BG_FLOW
BG_MTS_CXXFLAGS=	-DBG_mTS -DBG_uTS
NO_DBG_CXXFLAGS=	-DNDEBUG
NO_DBG_PARSER_CXXFLAGS=	-DNDBG_PARSER

do-build:
	${CXX} ${CXXFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.cpp -o ${WRKSRC}/${PORTNAME}


Lines 1-3 Link Here

(-)textproc/jtc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1583518848	1	TIMESTAMP = 1589016243
2	SHA256 (ldn-softdev-jtc-1.75d_GH0.tar.gz) = e490a754be493660ef4f2e764ea121b5c39b280adf9b4c55d73e4876e8618f04	2	SHA256 (ldn-softdev-jtc-1.76_GH0.tar.gz) = 8524ba3c67364719196ffc8c81078ea9c1ccfa629fff5e57441edd09f1950052
3	SIZE (ldn-softdev-jtc-1.75d_GH0.tar.gz) = 206457	3	SIZE (ldn-softdev-jtc-1.76_GH0.tar.gz) = 228445

Lines 1-11 Link Here

(-)textproc/jtc/files/patch-lib_Json.hpp (-5 / +19 lines)
1	--- lib/Json.hpp.orig 2020-03-13 20:36:36 UTC	1	--- lib/Json.hpp.orig 2020-05-07 19:34:09 UTC
2	+++ lib/Json.hpp	2	+++ lib/Json.hpp
3	@@ -1189,8 +1189,6 @@ class Jnode::Iterator: public std::iterator<std::bidir	3	@@ -688,11 +688,11 @@ class Jnode {
		4	Jnode(const Jnode &jn): Jnode() { // CC
4		5
		6	#ifdef BG_CC // -DBG_CC to compile this debug
		7	- if(DBG()(__Dbg_flow__::ind)) { // dodge DBG's mutex dead-lock
		8	+ if(DBG()(__Dbg_flow__::ind())) { // dodge DBG's mutex dead-lock
		9	GUARD(DBG().alt_prefix, DBG().alt_prefix)
		10	DBG().alt_prefix(">");
		11	DOUT() << DBG().prompt(__func__,
		12	- __Dbg_flow__::ind + 1, DBG().stamped(),
		13	+ __Dbg_flow__::ind() + 1, DBG().stamped(),
		14	Debug::Indention::Alternative)
		15	<< "CC copying: "
		16	<< jn.to_string(Jnode::PrettyType::Raw, 0) << std::endl;
		17	@@ -1221,8 +1221,6 @@ class Jnode::Iterator: public std::iterator<std::bidir
		18	SuperJnode(Jtype t): Jnode{t} {} // Init Construct
		19
5	SuperJnode & operator()(const std::string &s, Jnode &jn)	20	SuperJnode & operator()(const std::string &s, Jnode &jn)
		21	- { lbp_ = &s; jnp_ = &jn; return *this; }
		22	- const SuperJnode & operator()(const std::string &s, const Jnode &jn) const
6	{ lbp_ = &s; jnp_ = &jn; return *this; }	23	{ lbp_ = &s; jnp_ = &jn; return *this; }
7	- const SuperJnode & operator()(const std::string &s, const Jnode &jn) const
8	- { lbp_ = &s; jnp_ = &jn; return *this; }
9		24
10	const std::string * lbp_{nullptr}; // pointer to a label string	25	const std::string * lbp_{nullptr}; // pointer to a label string
11	Jnode * jnp_{nullptr}; // resolved Jnode pointer




--- lib/dbg.hpp.orig	2020-05-07 19:34:09 UTC
+++ lib/dbg.hpp
@@ -879,6 +879,9 @@ class __Dbg_flow__ {
                          }
                         }
 
+    static size_t       ind(void) { return __Dbg_flow__::ind_; }
+
+
  protected:
     const Debug &       dbg_;                                   // debug reference
     const char *        dfnc_;                                  // debug function

Return to bug 246441

Lines 1-7 Link Here

(-)textproc/jtc/Makefile (-5 / +19 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= jtc	3	PORTNAME= jtc
4	PORTVERSION= 1.75d	4	DISTVERSION= 1.76
5	CATEGORIES= textproc	5	CATEGORIES= textproc
6		6
7	MAINTAINER= vulcan@wired.sh	7	MAINTAINER= vulcan@wired.sh
Lines 15-28 Link Here
15	USE_GITHUB= yes	15	USE_GITHUB= yes
16	GH_ACCOUNT= ldn-softdev	16	GH_ACCOUNT= ldn-softdev
17		17
18	LDFLAGS+= -lexecinfo	18	LDFLAGS+= -lexecinfo -lpthread
19		19
20	PLIST_FILES= bin/${PORTNAME}	20	PLIST_FILES= bin/${PORTNAME}
21	PORTDOCS= README.md Release\ Notes.md User\ Guide.md \	21	PORTDOCS= "Release Notes.md" "User Guide.md" "Walk-path tutorial.md" \
22	Walk-path\ tutorial.md	22	README.md
23		23
24	OPTIONS_DEFINE= DOCS	24	OPTIONS_DEFINE= BG_CC BG_DTS BG_FLOW BG_MTS DOCS NO_DBG NO_DBG_PARSER
25		25
		26	BG_CC_DESC= Every call to a copy-constructor of Jnode class will reveal itself
		27	BG_DTS_DESC= Makes time-stamp display delta (since last debug message) instead of absolute stamp
		28	BG_FLOW_DESC= All debuggable function/method calls will display an entry and exit point
		29	BG_MTS_DESC= Display absolute time-stamps in the debug message
		30	NO_DBG_DESC= Disable all debug messages
		31	NO_DBG_PARSER_DESC= Disable debug messages coming from parsing JSON
		32
		33	BG_CC_CXXFLAGS= -DBG_CC
		34	BG_DTS_CXXFLAGS= -DBG_dTS
		35	BG_FLOW_CXXFLAGS= -BG_FLOW
		36	BG_MTS_CXXFLAGS= -DBG_mTS -DBG_uTS
		37	NO_DBG_CXXFLAGS= -DNDEBUG
		38	NO_DBG_PARSER_CXXFLAGS= -DNDBG_PARSER
		39
26	do-build:	40	do-build:
27	${CXX} ${CXXFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.cpp -o ${WRKSRC}/${PORTNAME}	41	${CXX} ${CXXFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.cpp -o ${WRKSRC}/${PORTNAME}
28		42

Line 0 Link Here

(-)textproc/jtc/files/patch-lib_dbg.hpp (+12 lines)
	1	--- lib/dbg.hpp.orig 2020-05-07 19:34:09 UTC
	2	+++ lib/dbg.hpp
	3	@@ -879,6 +879,9 @@ class __Dbg_flow__ {
	4	}
	5	}
	6
	7	+ static size_t ind(void) { return __Dbg_flow__::ind_; }
	8	+
	9	+
	10	protected:
	11	const Debug & dbg_; // debug reference
	12	const char * dfnc_; // debug function