[cdesktopenv-devel] [PATCH] make ttsnoop build under autotools
Only two programs left... Thank you for your time, -ChaseFrom 51e10c0b4c5b7c980ea48e7e0181e75c7a5bbf9b Mon Sep 17 00:00:00 2001 From: Chase Date: Sun, 7 Feb 2021 09:37:41 -0600 Subject: [PATCH] ttsnoop: make it build under autotools --- cde/configure.ac | 2 + cde/programs/Makefile.am | 4 +- cde/programs/ttsnoop/Makefile.am | 172 +++ 3 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 cde/programs/ttsnoop/Makefile.am diff --git a/cde/configure.ac b/cde/configure.ac index 2a8bfacd5..a2a2779ca 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -612,6 +612,8 @@ programs/fontaliases/freebsd/C/Makefile programs/dtdspmsg/Makefile +programs/ttsnoop/Makefile + programs/dtimsstart/Makefile programs/dtpdm/Makefile diff --git a/cde/programs/Makefile.am b/cde/programs/Makefile.am index 4c3dcd435..0cd943da0 100644 --- a/cde/programs/Makefile.am +++ b/cde/programs/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = backdrops icons dsdm dtmail dtpad dtfile dtwm dtlogin \ dtsession dthello dtstyle dtexec dtdbcache dticon dtterm dtcalc \ dtaction dtspcd dtscreen dtksh dtcm dtsearchpath dtappbuilder palettes \ dtappintegrate dtprintegrate dtconfig dtcreate dtprintinfo fontaliases \ - dtdspmsg dtimsstart dtpdm dtsr dtpdmd types \ + dtdspmsg ttsnoop dtimsstart dtpdm dtsr dtpdmd types \ tttypes util dtopen localized dthelp nsgmls dtdocbook -# NOTYET =dtinfo ttsnoop +# NOTYET = dtinfo diff --git a/cde/programs/ttsnoop/Makefile.am b/cde/programs/ttsnoop/Makefile.am new file mode 100644 index 0..de6d394c5 --- /dev/null +++ b/cde/programs/ttsnoop/Makefile.am @@ -0,0 +1,172 @@ +MAINTAINERCLEANFILES = Makefile.in + +appdefaultsdir = $(CDE_INSTALLATION_TOP)/app-defaults/C + +dist_appdefaults_DATA = Ttsnoop + +AB_MAKEFILES = \ + Makefile.aix \ + Makefile.hpux \ + Makefile.sunos \ + Makefile.linux \ + Makefile.freebsd \ + Makefile.netbsd \ + Makefile.openbsd + +DTCODEGENCAT = NLSPATH=$(top_builddir)/programs/dtappbuilder/src/abmf/dtcodegen.cat + +DTCODEGEN = $(DTCODEGENCAT) $(top_builddir)/programs/dtappbuilder/src/abmf/dtcodegen + +CLEANFILES = Ttsnoop .dtcodegen.log *.BAK *.delta *.patched $(AB_MAKEFILES) + +.NOTPARALLEL: + +bin_PROGRAMS = ttsnoop + +ttsnoop_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) $(LIBTERM) + +ttsnoop_SOURCES = stringChooser_stubs.C ttChooser_stubs.C \ + ttsnoop_ui.c apiTracer_stubs.C \ + argChooser_stubs.C callbackChooser_stubs.C \ + fileChooser_stubs.C messageProps_stubs.C \ + patternProps_stubs.C sessionChooser_stubs.C \ + ttsnoop.C ttsnoop_stubs.C \ + apiTracer_ui.cargChooser_ui.c \ + callbackChooser_ui.c dtb_utils.c \ + fileChooser_ui.c messageProps_ui.c \ + patternProps_ui.c sessionChooser_ui.c \ + stringChooser_ui.cttChooser_ui.c \ + tt_c++.C DtTt.C + +ttsnoop_ui.c ttsnoop_ui.h ttsnoop_stubs.C: ttsnoop.bip ttsnoop.bil ttsnoop_stubs.C.src + $(CP) ttsnoop_stubs.C.src ttsnoop_stubs.c + -if [ ! -w ttsnoop_stubs.c ]; then \ + chmod +w ttsnoop_stubs.c; fi + $(DTCODEGEN) -changed -merge -p ttsnoop.bip ttsnoop.bil + $(RM) ttsnoop_stubs.C + mv ttsnoop_stubs.c ttsnoop_stubs.C + cat externC.h ttsnoop_ui.h closeBrace.h > ttsnoop_ui.h.patched + mv ttsnoop_ui.h.patched ttsnoop_ui.h + $(SED) \ + -e 's/^DtbTt/extern String snooperArgv[];DtbTt/' \ + -e 's/XmNheight, 257,//' \ + -e 's/XmNwidth, 580,//' \ + -e 's/XmNcolumns, 80,//' \ + -e 's/XmNrows, 24/DtNsubprocessArgv, snooperArgv/' \ + ttsnoop_ui.c > ttsnoop_ui.c.patched + mv ttsnoop_ui.c.patched ttsnoop_ui.c + +apiTracer_ui.c apiTracer_ui.h apiTracer_stubs.C: ttsnoop.bip apiTracer.bil apiTracer_stubs.C.src + $(CP) apiTracer_stubs.C.src apiTracer_stubs.c + -if [ ! -w apiTracer_stubs.c ]; then \ + chmod +w apiTracer_stubs.c; fi + $(DTCODEGEN) -changed -merge -p ttsnoop.bip apiTracer.bil + $(RM) apiTracer_stubs.C + mv apiTracer_stubs.c apiTracer_stubs.C + cat externC.h apiTracer_ui.h closeBrace.h > apiTracer_ui.h.patched + mv apiTracer_ui.h.patched apiTracer_ui.h + $(SED) -e 's/^DtbApi/extern String apiTracerArgv[];DtbApi/' \ + -e 's/XmNrows, 24/XmNrows, 24, DtNsubprocessArgv, apiTracerArgv/' \ + apiTracer_ui.c > apiTracer_ui.c.patched + mv apiTracer_ui.c.patched apiTracer_ui.c + +ttChooser_ui.c ttChooser_ui.h ttChooser_stubs.C: ttsnoop.bip ttChooser.bil ttChooser_stubs.C.src + $(CP) ttChooser_stubs.C.src ttChooser_stubs.c + -if [ ! -w ttChooser_stubs.c ]; then \ + chmod +w ttChooser_stubs.c; fi + $(DTCODEGEN) -changed -merge -p ttsnoop.bip ttChooser.bil + $(RM) ttChooser_stubs.C + mv ttChooser_stubs.c ttChooser_stubs.C + cat externC.h ttChooser_ui.h closeBrace.h > ttChooser_ui.h.patched + mv ttChooser_ui.h.patched ttChooser_ui.h + +patternProps_ui.c patternProps_ui.h patternProps_stubs.C: ttsnoop.bip patternProps.bil patternProps_stubs.C.src + $(CP) patternProps_stubs.C.src patternProps_stubs.c + -if [ ! -w patternProps_stubs.c ]; then \ + chmod +w patternPro
[cdesktopenv-devel] [PATCH] dthelp/parser/helptag: build under autotools
So, this was an easy task, however, I do not think that I am capable of doing the rest of dthelp, is is some complex stuff. As for dtinfo, I still need to investigate it more... Thank you for your time, -ChaseFrom 1504a82780e979262249263d56077ec8f024404f Mon Sep 17 00:00:00 2001 From: Chase Date: Sun, 7 Feb 2021 14:48:51 -0600 Subject: [PATCH] dthelp/parser/helptag: build under autotools --- cde/.gitignore | 1 + cde/configure.ac | 1 + cde/programs/dthelp/parser/Makefile.am | 4 ++-- cde/programs/dthelp/parser/helptag/Makefile.am | 8 cde/programs/dthelp/parser/helptag/helptag.cpp | 0 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 cde/programs/dthelp/parser/helptag/Makefile.am mode change 100755 => 100644 cde/programs/dthelp/parser/helptag/helptag.cpp diff --git a/cde/.gitignore b/cde/.gitignore index 03da06818..f3a8815d0 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -556,6 +556,7 @@ programs/dthelp/parser/pass1/parser/dthelp_htag1 programs/dthelp/parser/pass1/parser/error programs/dthelp/parser/pass1/util/context programs/dthelp/parser/pass1/util/fclndir +programs/dthelp/parser/helptag/dthelptag # programs/dtinfo programs/dtinfo/clients/dtinfo_start/dtinfo_start diff --git a/cde/configure.ac b/cde/configure.ac index a2a2779ca..9d30ce995 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -520,6 +520,7 @@ programs/dthelp/parser/pass1/build/Makefile programs/dthelp/parser/pass1/eltdef/Makefile programs/dthelp/parser/pass1/helptag/Makefile programs/dthelp/parser/pass1/parser/Makefile +programs/dthelp/parser/helptag/Makefile programs/nsgmls/Makefile diff --git a/cde/programs/dthelp/parser/Makefile.am b/cde/programs/dthelp/parser/Makefile.am index 4e38114c9..549ce80f6 100644 --- a/cde/programs/dthelp/parser/Makefile.am +++ b/cde/programs/dthelp/parser/Makefile.am @@ -1,5 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = pass1 +SUBDIRS = pass1 helptag -#NOTYET canon1 pass2 helptag misc dtds +#NOTYET canon1 pass2 diff --git a/cde/programs/dthelp/parser/helptag/Makefile.am b/cde/programs/dthelp/parser/helptag/Makefile.am new file mode 100644 index 0..910fd7bfe --- /dev/null +++ b/cde/programs/dthelp/parser/helptag/Makefile.am @@ -0,0 +1,8 @@ +MAINTAINERCLEANFILES = Makefile.in + +bin_SCRIPTS = dthelptag + +dthelptag: helptag.cpp + $(RM) $@ + $(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@ + chmod +x $@ diff --git a/cde/programs/dthelp/parser/helptag/helptag.cpp b/cde/programs/dthelp/parser/helptag/helptag.cpp old mode 100755 new mode 100644 -- 2.17.1 ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] SPARC patch
On 2/3/21 9:31 PM, Lev wrote: > Hi Jon, > > If getting Motif and CDE relicensed under X11 someday is still desirable, I > think having the CDE project become a member of Software in the Public > Interest (they already help manage the legal side of X.org, etc.) could be > helpful. If I had a vote, I would have made both CDE and Motif MIT licensed, like X11... But I didn't. Last time I brought it up, the usual licensing arguments broke out. I can live with the way it is, there are bigger fish to fry, and another war over licensing seems pointless. There is also the issue that I am not sure I even have any legal right TO try to relicense CDE. I can't imaging anyone trying to sue someone for trying... but at this point, I see no point. > There are a lot of advantages of relicensing: > - Less worries statically linking CDE/Motif binaries containing > GPL-incompatible source code > > - To my knowledge, there is no major X11 widget library available under X11 > terms except Xaw. This could give us a considerable boost within the *BSD > community. Nothing prevents the BSD's from running GPL code. It is their choice to eliminate it as a default option. > - We would share the same license as X.org, so potentially the entire stack > (X server, Xlib, Xt, Motif, CDE) would be available under uniform terms. This > might encourage contributions from commercial vendors, etc. MIT... Motif is LGPL just like CDE as they were relicensed and opensourced at the same time. > As a legal entity, SPI could hold assets (trademarks, copyrights, etc.) in > trust for the CDE community indefinitely. Also, they would allow us to > receive tax-deductible donations, whether money, code, computer hardware, etc. I just don't see (as Marcin mentioned) we are anywhere near big enough to warrant any of that. Who knows what the future holds of course, but I'm pretty sure it isn't here yet... > As far as I can see, we haven’t been adding the MIT license to files that > have been changed, so presumably everything added is licensed under the LGPL. > I don’t think anyone wants a repeat of the Motif LGPL situation of tracking > contributors down and getting them to sign off. If we could arrange to offer > major contributors the possibility of assigning their copyright to a group > like SPI to hold in trust for CDE, that wouldn’t be a concern. We request that anyone who contributes, do so under the MIT license to avoid that issue. I am not sure we have ever had anyone come back and say "Wait, I don't agree to that, remove my code!". > Were there any plans in place for how we would go about convincing the Open > Group to relicense? Nope. -jon > Kind regards, > Lev > >> Hi Lev, >> >> Sorry, I don't know who this is really... What assistance are we looking >> for specifically? >> >> -jon -- Jon Trulson "Entropy. It isn't what it used to be." -- Sheldon ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] SPARC patch
I remember at the very dawn of the project we had a license debate and I do not wish to revisit those days. On Sunday, February 7, 2021, Jon Trulson wrote: > On 2/3/21 9:31 PM, Lev wrote: > > Hi Jon, > > If getting Motif and CDE relicensed under X11 someday is still desirable, I > think having the CDE project become a member of Software in the Public > Interest (they already help manage the legal side of X.org, etc.) could be > helpful. > > > If I had a vote, I would have made both CDE and Motif MIT licensed, like > X11... But I didn't. > ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] Remove Freetype dependency and switch default backdrop
Hi, I've applied this to master... libXm does have a proper dependency on libfreetype (for XFT). -jon On 2/6/21 1:38 PM, Lev via cdesktopenv-devel wrote: > Hello, > > The first patch removes an unnecessary dependency on Freetype that was the > result of including a private Motif header without undefining USE_XFT. CDE > itself cannot make use of Freetype. > > The second switches the default backdrop from SkyLight to KnitLight, > resolving ticket 100. > > Also, I was able to successfully build and use the new dtksh on NetBSD, and > the provided examples seemed to work flawlessly. CDE is now building with > musl out of the box, so I think that can be mentioned as an official feature > for the next release. > > Kind regards, > Lev > > > > ___ > cdesktopenv-devel mailing list > cdesktopenv-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel -- Jon Trulson "Entropy. It isn't what it used to be." -- Sheldon ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] Default font change
On 2/6/21 12:20 PM, Lev via cdesktopenv-devel wrote: > Hello, > > I would like to gather feedback from everyone on the list on whether > we should switch the default font (a bitmap rendering of Lucida) to a > manually adjusted screen font designed to maximize legibility. > > I’ve attached before and after screenshots. On my LCD screen, I think > this actually looks better (sharper while minimizing jaggedness) than > anti-aliasing. > Hi, I would not be opposed to reworking fonts... One issue is that we are still using ixo8859 fonts when I think we should be using iso10646 (unicode)... But I see this in my Xephyr which looks fine to me: Which looks clean to me... -jon > Kind regards, > Lev > > > ___ > cdesktopenv-devel mailing list > cdesktopenv-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel -- Jon Trulson "Entropy. It isn't what it used to be." -- Sheldon ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] Default font change
On 2/6/21 2:08 PM, Chase via cdesktopenv-devel wrote: > I can get behind this, I know there was talk of using motif's XFT > support for a bit, but I don't think anything ever came of it... > Some good portions of CDE can run using XFT - I believe Peter spent some time playing with this. Of course your Motif libs need to be compiled with that support (as is at least the case on Ubuntu systems). See the wiki: https://sourceforge.net/p/cdesktopenv/wiki/FontsWithXFT/ It would be great to get this working more fully on CDE (there are issues, such as dtterm). This would also improve the i18n experience due to TTF fonts and smarter glyph substitution... -jon > Thank you for your time, > -Chase > > > ‐‐‐ Original Message ‐‐‐ > On Saturday, February 6, 2021 1:20 PM, Lev via cdesktopenv-devel > wrote: > >> Hello, >> >> I would like to gather feedback from everyone on the list on whether >> we should switch the default font (a bitmap rendering of Lucida) to a >> manually adjusted screen font designed to maximize legibility. >> >> I’ve attached before and after screenshots. On my LCD screen, I think >> this actually looks better (sharper while minimizing jaggedness) than >> anti-aliasing. >> >> Kind regards, >> Lev >> >> > > > > ___ > cdesktopenv-devel mailing list > cdesktopenv-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel -- Jon Trulson "Entropy. It isn't what it used to be." -- Sheldon ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] Parallel build support for Imake
On 2/6/21 12:09 PM, Lev via cdesktopenv-devel wrote: > Hello, > > This patch allows for parallel ‘make World’ with imake. > > If we are interested in cross-compilation support, I could work on that as > well. As Chase mentioned, it is impressive but alas temporary. It is also flaky - several files do not get built properly: Load the Desktop from /home/jon/src/CDE/cde-master/cde 1. installing database CDE-RUN - creating CDE-RUN.lst file - installing ... done. - checking for errors ... - missing files: "/home/jon/src/CDE/cde-master/cde/programs/localized/C/types/datatypes.dt". "/home/jon/src/CDE/cde-master/cde/programs/localized/C/types/dt.dt". "/home/jon/src/CDE/cde-master/cde/programs/localized/C/types/dtscreen.dt". "/home/jon/src/CDE/cde-master/cde/programs/localized/C/types/engrampa.dt". ... I fixed several problems related to issues like this in the autotools branch. This is probably caused by the merge utility... There are also 2000+ warnings of the form: warning: -j8 forced in submake: resetting jobserver mode. So, not going to merge this one. -jon > Kind regards, > Lev > > > ___ > cdesktopenv-devel mailing list > cdesktopenv-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel -- Jon Trulson "Entropy. It isn't what it used to be." -- Sheldon ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] Teach Imake to autoconfigure itself using AT&T's iffe
On 2/6/21 8:30 PM, Lev via cdesktopenv-devel wrote: > Hello, > > This patch adds support for autoconfiguring and generating the appropriate > headers using AT&T’s iffe. > > Iffe was shipped as part of the original CDE release within the DtKsh and has > been tested to work with all UNIX compatible shells (including the original > Bourne shell.) Unfortunately this will break in the autotools branch, so not going to apply. I do not wantto create new things to fix in the autotools branch. -jon > Kind regards, > Lev > > > ___ > cdesktopenv-devel mailing list > cdesktopenv-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel -- Jon Trulson "Entropy. It isn't what it used to be." -- Sheldon ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] [PATCH] make ttsnoop build under autotools
On 2/7/21 8:39 AM, Chase via cdesktopenv-devel wrote: > Only two programs left... > Yeah, getting closer... Once those are done, then docs, then profit! I cannot apply this patch though as it breaks multicore builds: depbase=`echo stringChooser_stubs.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\ c++ -DHAVE_CONFIG_H -I. -I../../include -DANSICPP -DMULTIBYTE -DNLS16 -D_POSIX_SOURCE -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -DUSE_XINERAMA -fno-strict-aliasing -Wno-write-strings -Wno-unused-result -DOSMAJORVERSION=4 -DOSMINORVERSION=15 -g -O2 -DOPT_TIRPC -I/usr/include/tirpc -pthread -MT stringChooser_stubs.o -MD -MP -MF $depbase.Tpo -c -o stringChooser_stubs.o stringChooser_stubs.C &&\ mv -f $depbase.Tpo $depbase.Po stringChooser_stubs.C:22:10: fatal error: dtb_utils.h: No such file or directory 22 | #include "dtb_utils.h" | ^ compilation terminated. make[2]: *** [Makefile:606: stringChooser_stubs.o] Error 1 I think there is something generally wrong with deps in dtbuilder, and this may be another symptom. Maybe /.NOTPARALLEL:/ needs to be specified in more than one dtappbuilder Makefile.am? Not sure, no time to investigate, but worth trying. -jon > Thank you for your time, > -Chase > > > > > ___ > cdesktopenv-devel mailing list > cdesktopenv-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel -- Jon Trulson "Entropy. It isn't what it used to be." -- Sheldon ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] [PATCH] dthelp/parser/helptag: build under autotools
On 2/7/21 1:54 PM, Chase via cdesktopenv-devel wrote: > So, this was an easy task, however, I do not think that I am capable > of doing the rest of dthelp, is is some complex stuff. As for dtinfo, > I still need to investigate it more... > I've applied this. Yes, I did parser/pass1... I think only pass2/ and cannon/ are left for the parser. I'll finish those when I get more time. They do some weird things in there. -jon > Thank you for your time, > -Chase > > > > > ___ > cdesktopenv-devel mailing list > cdesktopenv-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel -- Jon Trulson "Entropy. It isn't what it used to be." -- Sheldon ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
Re: [cdesktopenv-devel] SPARC patch
Hi Jon, > On Feb 7, 2021, at 17:57, Jon Trulson wrote: > > If I had a vote, I would have made both CDE and Motif MIT licensed, like > X11... But I didn't. Last time I brought it up, the usual licensing > arguments broke out. I can live with the way it is, there are bigger fish to > fry, and another war over licensing seems pointless. > > There is also the issue that I am not sure I even have any legal right TO try > to relicense CDE. I can't imaging anyone trying to sue someone for trying... > but at this point, I see no point. I’d be very appreciative if you could please expand on this. How exactly was CDE open sourced and did the Open Group grant you the right to sublicense? I understand if there’s hesitancy here (and maybe we should take it off list), but if I’m going to have to start over from scratch for the legacy systems anyway, I’d be very curious. Also, if you know a better way to get ahold of Peter Howkins, he probably doesn’t know who I am... Kind regards, Lev ___ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
