Extract Library libtrn to subdirectory

LegalizeAdulthood · Feb 19, 2024 · 6fee80c · 6fee80c
1 parent 39c672d
commit 6fee80c
Show file tree

Hide file tree

Showing 144 changed files with 86 additions and 81 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,93 +14,18 @@ find_package(BISON REQUIRED)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-add_library(libtrn
-    addng.cpp addng.h
-    art.cpp art.h
-    artio.cpp artio.h
-    artsrch.cpp artsrch.h
-    artstate.h
-    autosub.cpp autosub.h
-    backpage.cpp backpage.h
-    bits.cpp bits.h
-    cache.cpp cache.h
-    charsubst.cpp charsubst.h
-    color.cpp color.h
-    datasrc.cpp datasrc.h
-    decode.cpp decode.h
-    edit_dist.cpp edit_dist.h
-    final.cpp final.h
-    hash.cpp hash.h
-    head.cpp head.h
-    help.cpp help.h
-    init.cpp init.h
-    intrp.cpp intrp.h
-    kfile.cpp kfile.h
-    last.cpp last.h
-    list.cpp list.h
-    mempool.cpp mempool.h
-    mime.cpp mime.h mime-internal.h
-    ng.cpp ng.h
-    ngdata.cpp ngdata.h
-    ngsrch.cpp ngsrch.h
-    ngstuff.cpp ngstuff.h
-    nntp.cpp nntp.h
-    only.cpp only.h
-    opt.cpp opt.h
-    patchlevel.h
-    rcln.cpp rcln.h
-    rcstuff.cpp rcstuff.h
-    respond.cpp respond.h
-    rt-ov.cpp rt-ov.h
-    rt-page.cpp rt-page.h
-    rt-process.cpp rt-process.h
-    rt-select.cpp rt-select.h
-    rt-util.cpp rt-util.h
-    rt-wumpus.cpp rt-wumpus.h
-    rthread.cpp rthread.h
-    sacmd.cpp sacmd.h
-    sadesc.cpp sadesc.h
-    sadisp.cpp sadisp.h
-    samain.cpp samain.h
-    samisc.cpp samisc.h
-    sathread.cpp sathread.h
-    scan.cpp scan.h
-    scanart.cpp scanart.h
-    scmd.cpp scmd.h
-    score-easy.cpp score-easy.h
-    score.cpp score.h
-    scorefile.cpp scorefile.h
-    scoresave.cpp scoresave.h
-    sdisp.cpp sdisp.h
-    search.cpp search.h
-    smisc.cpp smisc.h
-    sorder.cpp sorder.h
-    spage.cpp spage.h
-    sw.cpp sw.h
-    term.cpp term.h
-    trn.cpp trn.h
-    utf.cpp utf.h
-    univ.cpp univ.h
-    url.cpp url.h
-    util.cpp util.h
-    uudecode.cpp uudecode.h
-)
-# We require <filesystem>
-target_compile_features(libtrn PUBLIC cxx_std_17)
-source_group("Header Files" REGULAR_EXPRESSION "^.*\\.h$")
-target_include_directories(libtrn PUBLIC .)
-target_link_libraries(libtrn PUBLIC parsedate curses nntp)
-set_property(TARGET libtrn PROPERTY FOLDER Libraries)
-
 add_executable(inews inews.cpp)
+target_include_directories(inews PRIVATE libtrn)
 target_link_libraries(inews PUBLIC nntp tool)
 set_property(TARGET inews PROPERTY FOLDER Tools)
 
 add_executable(nntplist nntplist.cpp)
+target_include_directories(nntplist PRIVATE libtrn)
 target_link_libraries(nntplist PUBLIC nntp tool)
 set_property(TARGET nntplist PROPERTY FOLDER Tools)
 
 add_executable(trn-artchk trn-artchk.cpp)
+target_include_directories(trn-artchk PRIVATE libtrn)
 target_link_libraries(trn-artchk PUBLIC nntp tool)
 set_property(TARGET trn-artchk PROPERTY FOLDER Tools)
 
@@ -124,6 +49,7 @@ source_group("Text Files" FILES ${trn_text_files})
 target_link_libraries(trn PUBLIC libtrn)
 
 add_subdirectory(config)
+add_subdirectory(libtrn)
 add_subdirectory(nntp)
 add_subdirectory(parsedate)
 add_subdirectory(tool)

diff --git a/libtrn/CMakeLists.txt b/libtrn/CMakeLists.txt
@@ -0,0 +1,79 @@
+add_library(libtrn
+    addng.cpp addng.h
+    art.cpp art.h
+    artio.cpp artio.h
+    artsrch.cpp artsrch.h
+    artstate.h
+    autosub.cpp autosub.h
+    backpage.cpp backpage.h
+    bits.cpp bits.h
+    cache.cpp cache.h
+    charsubst.cpp charsubst.h
+    color.cpp color.h
+    datasrc.cpp datasrc.h
+    decode.cpp decode.h
+    edit_dist.cpp edit_dist.h
+    enum-flags.h
+    final.cpp final.h
+    hash.cpp hash.h
+    head.cpp head.h
+    help.cpp help.h
+    init.cpp init.h
+    intrp.cpp intrp.h
+    kfile.cpp kfile.h
+    last.cpp last.h
+    list.cpp list.h
+    mempool.cpp mempool.h
+    mime.cpp mime.h mime-internal.h
+    ng.cpp ng.h
+    ngdata.cpp ngdata.h
+    ngsrch.cpp ngsrch.h
+    ngstuff.cpp ngstuff.h
+    nntp.cpp nntp.h
+    only.cpp only.h
+    opt.cpp opt.h
+    patchlevel.h
+    rcln.cpp rcln.h
+    rcstuff.cpp rcstuff.h
+    respond.cpp respond.h
+    rt-ov.cpp rt-ov.h
+    rt-page.cpp rt-page.h
+    rt-process.cpp rt-process.h
+    rt-select.cpp rt-select.h
+    rt-util.cpp rt-util.h
+    rt-wumpus.cpp rt-wumpus.h
+    rthread.cpp rthread.h
+    sacmd.cpp sacmd.h
+    sadesc.cpp sadesc.h
+    sadisp.cpp sadisp.h
+    samain.cpp samain.h
+    samisc.cpp samisc.h
+    sathread.cpp sathread.h
+    scan.cpp scan.h
+    scanart.cpp scanart.h
+    scmd.cpp scmd.h
+    score-easy.cpp score-easy.h
+    score.cpp score.h
+    scorefile.cpp scorefile.h
+    scoresave.cpp scoresave.h
+    sdisp.cpp sdisp.h
+    search.cpp search.h
+    smisc.cpp smisc.h
+    sorder.cpp sorder.h
+    spage.cpp spage.h
+    string-algos.h
+    sw.cpp sw.h
+    term.cpp term.h
+    trn.cpp trn.h
+    utf.cpp utf.h
+    univ.cpp univ.h
+    url.cpp url.h
+    util.cpp util.h
+    uudecode.cpp uudecode.h
+)
+# We require <filesystem>
+target_compile_features(libtrn PUBLIC cxx_std_17)
+source_group("Header Files" REGULAR_EXPRESSION "^.*\\.h$")
+target_include_directories(libtrn PUBLIC .)
+target_link_libraries(libtrn PUBLIC parsedate curses nntp)
+set_property(TARGET libtrn PROPERTY FOLDER Libraries)
diff --git a/addng.cpp → libtrn/addng.cpp b/addng.cpp → libtrn/addng.cpp
diff --git a/addng.h → libtrn/addng.h b/addng.h → libtrn/addng.h
diff --git a/art.cpp → libtrn/art.cpp b/art.cpp → libtrn/art.cpp
diff --git a/art.h → libtrn/art.h b/art.h → libtrn/art.h
diff --git a/artio.cpp → libtrn/artio.cpp b/artio.cpp → libtrn/artio.cpp
diff --git a/artio.h → libtrn/artio.h b/artio.h → libtrn/artio.h
diff --git a/artsrch.cpp → libtrn/artsrch.cpp b/artsrch.cpp → libtrn/artsrch.cpp
diff --git a/artsrch.h → libtrn/artsrch.h b/artsrch.h → libtrn/artsrch.h
diff --git a/artstate.h → libtrn/artstate.h b/artstate.h → libtrn/artstate.h
diff --git a/autosub.cpp → libtrn/autosub.cpp b/autosub.cpp → libtrn/autosub.cpp
diff --git a/autosub.h → libtrn/autosub.h b/autosub.h → libtrn/autosub.h
diff --git a/backpage.cpp → libtrn/backpage.cpp b/backpage.cpp → libtrn/backpage.cpp
diff --git a/backpage.h → libtrn/backpage.h b/backpage.h → libtrn/backpage.h
diff --git a/bits.cpp → libtrn/bits.cpp b/bits.cpp → libtrn/bits.cpp
diff --git a/bits.h → libtrn/bits.h b/bits.h → libtrn/bits.h
diff --git a/cache.cpp → libtrn/cache.cpp b/cache.cpp → libtrn/cache.cpp
diff --git a/cache.h → libtrn/cache.h b/cache.h → libtrn/cache.h
diff --git a/charsubst.cpp → libtrn/charsubst.cpp b/charsubst.cpp → libtrn/charsubst.cpp
diff --git a/charsubst.h → libtrn/charsubst.h b/charsubst.h → libtrn/charsubst.h
diff --git a/color.cpp → libtrn/color.cpp b/color.cpp → libtrn/color.cpp
diff --git a/color.h → libtrn/color.h b/color.h → libtrn/color.h
diff --git a/datasrc.cpp → libtrn/datasrc.cpp b/datasrc.cpp → libtrn/datasrc.cpp
diff --git a/datasrc.h → libtrn/datasrc.h b/datasrc.h → libtrn/datasrc.h
diff --git a/decode.cpp → libtrn/decode.cpp b/decode.cpp → libtrn/decode.cpp
diff --git a/decode.h → libtrn/decode.h b/decode.h → libtrn/decode.h
diff --git a/edit_dist.cpp → libtrn/edit_dist.cpp b/edit_dist.cpp → libtrn/edit_dist.cpp
diff --git a/edit_dist.h → libtrn/edit_dist.h b/edit_dist.h → libtrn/edit_dist.h
diff --git a/enum-flags.h → libtrn/enum-flags.h b/enum-flags.h → libtrn/enum-flags.h
diff --git a/final.cpp → libtrn/final.cpp b/final.cpp → libtrn/final.cpp
diff --git a/final.h → libtrn/final.h b/final.h → libtrn/final.h
diff --git a/hash.cpp → libtrn/hash.cpp b/hash.cpp → libtrn/hash.cpp
diff --git a/hash.h → libtrn/hash.h b/hash.h → libtrn/hash.h
diff --git a/head.cpp → libtrn/head.cpp b/head.cpp → libtrn/head.cpp
diff --git a/head.h → libtrn/head.h b/head.h → libtrn/head.h
diff --git a/help.cpp → libtrn/help.cpp b/help.cpp → libtrn/help.cpp
diff --git a/help.h → libtrn/help.h b/help.h → libtrn/help.h
diff --git a/init.cpp → libtrn/init.cpp b/init.cpp → libtrn/init.cpp
diff --git a/init.h → libtrn/init.h b/init.h → libtrn/init.h
diff --git a/intrp.cpp → libtrn/intrp.cpp b/intrp.cpp → libtrn/intrp.cpp
diff --git a/intrp.h → libtrn/intrp.h b/intrp.h → libtrn/intrp.h
diff --git a/kfile.cpp → libtrn/kfile.cpp b/kfile.cpp → libtrn/kfile.cpp
diff --git a/kfile.h → libtrn/kfile.h b/kfile.h → libtrn/kfile.h
diff --git a/last.cpp → libtrn/last.cpp b/last.cpp → libtrn/last.cpp
diff --git a/last.h → libtrn/last.h b/last.h → libtrn/last.h
diff --git a/list.cpp → libtrn/list.cpp b/list.cpp → libtrn/list.cpp
diff --git a/list.h → libtrn/list.h b/list.h → libtrn/list.h
diff --git a/mempool.cpp → libtrn/mempool.cpp b/mempool.cpp → libtrn/mempool.cpp
diff --git a/mempool.h → libtrn/mempool.h b/mempool.h → libtrn/mempool.h
diff --git a/mime-internal.h → libtrn/mime-internal.h b/mime-internal.h → libtrn/mime-internal.h
diff --git a/mime.cpp → libtrn/mime.cpp b/mime.cpp → libtrn/mime.cpp
diff --git a/mime.h → libtrn/mime.h b/mime.h → libtrn/mime.h
diff --git a/ng.cpp → libtrn/ng.cpp b/ng.cpp → libtrn/ng.cpp
diff --git a/ng.h → libtrn/ng.h b/ng.h → libtrn/ng.h
diff --git a/ngdata.cpp → libtrn/ngdata.cpp b/ngdata.cpp → libtrn/ngdata.cpp
diff --git a/ngdata.h → libtrn/ngdata.h b/ngdata.h → libtrn/ngdata.h
diff --git a/ngsrch.cpp → libtrn/ngsrch.cpp b/ngsrch.cpp → libtrn/ngsrch.cpp
diff --git a/ngsrch.h → libtrn/ngsrch.h b/ngsrch.h → libtrn/ngsrch.h
diff --git a/ngstuff.cpp → libtrn/ngstuff.cpp b/ngstuff.cpp → libtrn/ngstuff.cpp
diff --git a/ngstuff.h → libtrn/ngstuff.h b/ngstuff.h → libtrn/ngstuff.h
diff --git a/nntp.cpp → libtrn/nntp.cpp b/nntp.cpp → libtrn/nntp.cpp
diff --git a/nntp.h → libtrn/nntp.h b/nntp.h → libtrn/nntp.h
diff --git a/only.cpp → libtrn/only.cpp b/only.cpp → libtrn/only.cpp
diff --git a/only.h → libtrn/only.h b/only.h → libtrn/only.h
diff --git a/opt.cpp → libtrn/opt.cpp b/opt.cpp → libtrn/opt.cpp
diff --git a/opt.h → libtrn/opt.h b/opt.h → libtrn/opt.h
diff --git a/patchlevel.h → libtrn/patchlevel.h b/patchlevel.h → libtrn/patchlevel.h
diff --git a/rcln.cpp → libtrn/rcln.cpp b/rcln.cpp → libtrn/rcln.cpp
diff --git a/rcln.h → libtrn/rcln.h b/rcln.h → libtrn/rcln.h
diff --git a/rcstuff.cpp → libtrn/rcstuff.cpp b/rcstuff.cpp → libtrn/rcstuff.cpp
diff --git a/rcstuff.h → libtrn/rcstuff.h b/rcstuff.h → libtrn/rcstuff.h
diff --git a/respond.cpp → libtrn/respond.cpp b/respond.cpp → libtrn/respond.cpp
diff --git a/respond.h → libtrn/respond.h b/respond.h → libtrn/respond.h
diff --git a/rt-ov.cpp → libtrn/rt-ov.cpp b/rt-ov.cpp → libtrn/rt-ov.cpp
diff --git a/rt-ov.h → libtrn/rt-ov.h b/rt-ov.h → libtrn/rt-ov.h
diff --git a/rt-page.cpp → libtrn/rt-page.cpp b/rt-page.cpp → libtrn/rt-page.cpp
diff --git a/rt-page.h → libtrn/rt-page.h b/rt-page.h → libtrn/rt-page.h
diff --git a/rt-process.cpp → libtrn/rt-process.cpp b/rt-process.cpp → libtrn/rt-process.cpp
diff --git a/rt-process.h → libtrn/rt-process.h b/rt-process.h → libtrn/rt-process.h
diff --git a/rt-select.cpp → libtrn/rt-select.cpp b/rt-select.cpp → libtrn/rt-select.cpp
diff --git a/rt-select.h → libtrn/rt-select.h b/rt-select.h → libtrn/rt-select.h
diff --git a/rt-util.cpp → libtrn/rt-util.cpp b/rt-util.cpp → libtrn/rt-util.cpp
diff --git a/rt-util.h → libtrn/rt-util.h b/rt-util.h → libtrn/rt-util.h
diff --git a/rt-wumpus.cpp → libtrn/rt-wumpus.cpp b/rt-wumpus.cpp → libtrn/rt-wumpus.cpp
diff --git a/rt-wumpus.h → libtrn/rt-wumpus.h b/rt-wumpus.h → libtrn/rt-wumpus.h
diff --git a/rthread.cpp → libtrn/rthread.cpp b/rthread.cpp → libtrn/rthread.cpp
diff --git a/rthread.h → libtrn/rthread.h b/rthread.h → libtrn/rthread.h
diff --git a/sacmd.cpp → libtrn/sacmd.cpp b/sacmd.cpp → libtrn/sacmd.cpp
diff --git a/sacmd.h → libtrn/sacmd.h b/sacmd.h → libtrn/sacmd.h
diff --git a/sadesc.cpp → libtrn/sadesc.cpp b/sadesc.cpp → libtrn/sadesc.cpp
diff --git a/sadesc.h → libtrn/sadesc.h b/sadesc.h → libtrn/sadesc.h
diff --git a/sadisp.cpp → libtrn/sadisp.cpp b/sadisp.cpp → libtrn/sadisp.cpp
diff --git a/sadisp.h → libtrn/sadisp.h b/sadisp.h → libtrn/sadisp.h
diff --git a/samain.cpp → libtrn/samain.cpp b/samain.cpp → libtrn/samain.cpp
diff --git a/samain.h → libtrn/samain.h b/samain.h → libtrn/samain.h
diff --git a/samisc.cpp → libtrn/samisc.cpp b/samisc.cpp → libtrn/samisc.cpp
diff --git a/samisc.h → libtrn/samisc.h b/samisc.h → libtrn/samisc.h
diff --git a/sathread.cpp → libtrn/sathread.cpp b/sathread.cpp → libtrn/sathread.cpp
diff --git a/sathread.h → libtrn/sathread.h b/sathread.h → libtrn/sathread.h
diff --git a/scan.cpp → libtrn/scan.cpp b/scan.cpp → libtrn/scan.cpp
diff --git a/scan.h → libtrn/scan.h b/scan.h → libtrn/scan.h
diff --git a/scanart.cpp → libtrn/scanart.cpp b/scanart.cpp → libtrn/scanart.cpp
diff --git a/scanart.h → libtrn/scanart.h b/scanart.h → libtrn/scanart.h
diff --git a/scmd.cpp → libtrn/scmd.cpp b/scmd.cpp → libtrn/scmd.cpp
diff --git a/scmd.h → libtrn/scmd.h b/scmd.h → libtrn/scmd.h
diff --git a/score-easy.cpp → libtrn/score-easy.cpp b/score-easy.cpp → libtrn/score-easy.cpp
diff --git a/score-easy.h → libtrn/score-easy.h b/score-easy.h → libtrn/score-easy.h
diff --git a/score.cpp → libtrn/score.cpp b/score.cpp → libtrn/score.cpp
diff --git a/score.h → libtrn/score.h b/score.h → libtrn/score.h
diff --git a/scorefile.cpp → libtrn/scorefile.cpp b/scorefile.cpp → libtrn/scorefile.cpp
diff --git a/scorefile.h → libtrn/scorefile.h b/scorefile.h → libtrn/scorefile.h
diff --git a/scoresave.cpp → libtrn/scoresave.cpp b/scoresave.cpp → libtrn/scoresave.cpp
diff --git a/scoresave.h → libtrn/scoresave.h b/scoresave.h → libtrn/scoresave.h
diff --git a/sdisp.cpp → libtrn/sdisp.cpp b/sdisp.cpp → libtrn/sdisp.cpp
diff --git a/sdisp.h → libtrn/sdisp.h b/sdisp.h → libtrn/sdisp.h
diff --git a/search.cpp → libtrn/search.cpp b/search.cpp → libtrn/search.cpp
diff --git a/search.h → libtrn/search.h b/search.h → libtrn/search.h
diff --git a/smisc.cpp → libtrn/smisc.cpp b/smisc.cpp → libtrn/smisc.cpp
diff --git a/smisc.h → libtrn/smisc.h b/smisc.h → libtrn/smisc.h
diff --git a/sorder.cpp → libtrn/sorder.cpp b/sorder.cpp → libtrn/sorder.cpp
diff --git a/sorder.h → libtrn/sorder.h b/sorder.h → libtrn/sorder.h
diff --git a/spage.cpp → libtrn/spage.cpp b/spage.cpp → libtrn/spage.cpp
diff --git a/spage.h → libtrn/spage.h b/spage.h → libtrn/spage.h
diff --git a/string-algos.h → libtrn/string-algos.h b/string-algos.h → libtrn/string-algos.h
diff --git a/sw.cpp → libtrn/sw.cpp b/sw.cpp → libtrn/sw.cpp
diff --git a/sw.h → libtrn/sw.h b/sw.h → libtrn/sw.h
diff --git a/term.cpp → libtrn/term.cpp b/term.cpp → libtrn/term.cpp
diff --git a/term.h → libtrn/term.h b/term.h → libtrn/term.h
diff --git a/trn.cpp → libtrn/trn.cpp b/trn.cpp → libtrn/trn.cpp
diff --git a/trn.h → libtrn/trn.h b/trn.h → libtrn/trn.h
diff --git a/univ.cpp → libtrn/univ.cpp b/univ.cpp → libtrn/univ.cpp
diff --git a/univ.h → libtrn/univ.h b/univ.h → libtrn/univ.h
diff --git a/url.cpp → libtrn/url.cpp b/url.cpp → libtrn/url.cpp
diff --git a/url.h → libtrn/url.h b/url.h → libtrn/url.h
diff --git a/utf.cpp → libtrn/utf.cpp b/utf.cpp → libtrn/utf.cpp
diff --git a/utf.h → libtrn/utf.h b/utf.h → libtrn/utf.h
diff --git a/util.cpp → libtrn/util.cpp b/util.cpp → libtrn/util.cpp
diff --git a/util.h → libtrn/util.h b/util.h → libtrn/util.h
diff --git a/uudecode.cpp → libtrn/uudecode.cpp b/uudecode.cpp → libtrn/uudecode.cpp
diff --git a/uudecode.h → libtrn/uudecode.h b/uudecode.h → libtrn/uudecode.h
diff --git a/nntp/CMakeLists.txt b/nntp/CMakeLists.txt
@@ -6,6 +6,6 @@ add_library(nntp
     nntpinit.cpp nntpinit.h
 )
 target_include_directories(nntp PUBLIC .)
-target_include_directories(nntp PRIVATE ..)
+target_include_directories(nntp PRIVATE ../libtrn)
 target_link_libraries(nntp PUBLIC boost::asio util)
 set_property(TARGET nntp PROPERTY FOLDER Libraries)
diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
@@ -2,6 +2,6 @@ add_library(tool
     util3.cpp util3.h
 )
 target_include_directories(tool PUBLIC .)
-target_include_directories(tool PRIVATE ..)
+target_include_directories(tool PRIVATE ../libtrn)
 target_link_libraries(tool PUBLIC nntp)
 set_property(TARGET tool PROPERTY FOLDER Libraries)
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
@@ -9,6 +9,6 @@ if(WIN32)
     target_compile_definitions(util PUBLIC _CRT_DECLARE_NONSTDC_NAMES=1 _CRT_INTERNAL_NONSTDC_NAMES=1)
 endif()
 target_include_directories(util PUBLIC .)
-target_include_directories(util PRIVATE .. ../tool)
+target_include_directories(util PRIVATE ../libtrn ../tool)
 target_link_libraries(util PUBLIC config)
 set_property(TARGET util PROPERTY FOLDER Libraries)