On Mon, 13 Aug 2012, Joshuah Hurst wrote:
> On Mon, Aug 13, 2012 at 12:59 PM, Marcin Cieslak <sa...@saper.info> wrote:
> > On Mon, 13 Aug 2012, Irek Szczesniak wrote:
> >
> >> On Mon, Aug 13, 2012 at 4:01 AM, Marcin Cieslak <sa...@saper.info> wrote:
> >> > ---
> >> > cde/doc/C/Imakefile | 2 +-
> >> > cde/programs/Imakefile | 2 +-
> >> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> >> Why are you disabling dtksh? It's an integral part of CDE and required
> >> for functionality like DtBuilder.
> >
> > It does not compile right now; the build of dtksh is temporarily
> > disabled for Linux so it seems we need to do for FreeBSD
> > for the build to continue.
> >
> > I fully agree we need to get it working.
>
> At some point in the future we need to look at updating the ksh93 base
> of dtksh. dtksh is currently based on ksh93d-, which is an alpha
> version. The current AT&T ksh stable upstream version is ksh93u+, ~15
> years newer, much more stable and much more portable. Runs on Linux
> (Suse, Fedora, embedded, etc), FreeBSD, NetBSD, Solaris, Illumos,
> HP/UX, too.
> The license issues (if there are actually any, so far I haven't seen
> proof by a lawyer) are solvable by using libshell.so.1, which is ksh93
> as shared library.
Additionally, we need some Korn-compatible shell for building,
to run admin/IntegTools/dbTools/udbToAny.sh script.
For Linux distributions using bash not much is needed,
but I would propose to introduce KSHELL variable
that points to the Korn-compatible shell (the
default should be /bin/ksh).
Because BSD make does not run scripts from
the current directory (it uses $PATH just
like the shell) and ./ construct do not
work, I would propose changing script
invocations like this:
KSHELL should really be defined to config/cf/...
(this is just an example that works
for me on FreeBSD):
diff --git a/cde/admin/IntegTools/post_install/Imakefile
b/cde/admin/IntegTools/post_install/Imakefile
index f8e3d8d..4c8a6ec 100644
--- a/cde/admin/IntegTools/post_install/Imakefile
+++ b/cde/admin/IntegTools/post_install/Imakefile
@@ -9,8 +9,10 @@ XCOMM $TOG: Imakefile /main/13 1998/03/11 16:20:10 mgreess $
#endif
TOOL_DIR = ../dbTools
+KSHELL = /usr/local/bin/ksh93
DATABASE_DIR = ../../../databases
-BUILD_UDB_TOOL = ./build_udb_list
+BUILD_UDB_TOOL = $(SHELL) build_udb_list
+UDB_TOOL = $(KSHELL) $(TOOL_DIR)/udbToAny.ksh
#ifdef HPArchitecture
PLATFORM = hp-ux
@@ -50,62 +52,62 @@ MakeSubdirs($(SUBDIRS))
all::
configHelp:: $(DATABASE_DIR)/CDE-HELP-C.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-C.udb > CDE-HELP-C.lst
$(BUILD_UDB_TOOL) CDE-HELP-C ../../..
configHelpPrg:: $(DATABASE_DIR)/CDE-HELP-PRG.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-PRG.udb > CDE-HELP-PRG.lst
$(BUILD_UDB_TOOL) CDE-HELP-PRG ../../..
configDemos:: $(DATABASE_DIR)/CDE-DEMOS.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-DEMOS.udb > CDE-DEMOS.lst
$(BUILD_UDB_TOOL) CDE-DEMOS ../../..
configFonts:: $(DATABASE_DIR)/CDE-FONTS.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-FONTS.udb > CDE-FONTS.lst
$(BUILD_UDB_TOOL) CDE-FONTS ../../..
configHelpRun:: $(DATABASE_DIR)/CDE-HELP-RUN.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-RUN.udb > CDE-HELP-RUN.lst
$(BUILD_UDB_TOOL) CDE-HELP-RUN ../../..
configIcons:: $(DATABASE_DIR)/CDE-ICONS.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-ICONS.udb > CDE-ICONS.lst
$(BUILD_UDB_TOOL) CDE-ICONS ../../..
configInc:: $(DATABASE_DIR)/CDE-INC.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-INC.udb > CDE-INC.lst
$(BUILD_UDB_TOOL) CDE-INC ../../..
configManDev:: $(DATABASE_DIR)/CDE-MAN-DEV.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MAN-DEV.udb > CDE-MAN-DEV.lst
$(BUILD_UDB_TOOL) CDE-MAN-DEV ../../..
configMan:: $(DATABASE_DIR)/CDE-MAN.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MAN.udb > CDE-MAN.lst
$(BUILD_UDB_TOOL) CDE-MAN ../../..
configMsgCat:: $(DATABASE_DIR)/CDE-MSG-C.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MSG-C.udb > CDE-MSG-C.lst
$(BUILD_UDB_TOOL) CDE-MSG-C ../../..
configPrg:: $(DATABASE_DIR)/CDE-PRG.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-PRG.udb > CDE-PRG.lst
$(BUILD_UDB_TOOL) CDE-PRG ../../..
configShlibs:: $(DATABASE_DIR)/CDE-SHLIBS.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-SHLIBS.udb > CDE-SHLIBS.lst
$(BUILD_UDB_TOOL) CDE-SHLIBS ../../..
diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile
index 2db62e4..2fde9f8 100644
--- a/cde/databases/Imakefile
+++ b/cde/databases/Imakefile
@@ -91,13 +91,14 @@ CDE-INFOLIB-Locale.udb:: InfoDB
@@\
.SUFFIXES: .db .udb
TOOLSRC=../
+KSHELL=/usr/local/bin/ksh93 -x
DBTOOLS=admin/IntegTools/dbTools
CONVERSION= -toDB
.udb.db:
@echo "making $*.db"
@$(RM) $*.db
- $(TOOLSRC)/$(DBTOOLS)/udbToAny.ksh $(CONVERSION) $(UDB_RELEASE_OPT) $<
> $*.db
+ $(KSHELL) $(TOOLSRC)/$(DBTOOLS)/udbToAny.ksh $(CONVERSION)
$(UDB_RELEASE_OPT) $< > $*.db
all::
diff --git a/cde/programs/dtprintinfo/Imakefile
b/cde/programs/dtprintinfo/Imakefile
index ed42f6e..82ead70 100644
--- a/cde/programs/dtprintinfo/Imakefile
+++ b/cde/programs/dtprintinfo/Imakefile
@@ -68,7 +68,7 @@ DEFINES = -D_TOOLTALK
#endif
/* special processing for message files */
-SYM2NUM_CMD = ./sym2num
+SYM2NUM_CMD = $(SHELL) sym2num
SRCS = DtPrintinfo.C
OBJS = libUI/BaseUI.o objects/BaseObj.o DtPrintinfo.o
diff --git a/cde/programs/dtterm/Imakefile b/cde/programs/dtterm/Imakefile
index 847bf14..0b168a2 100644
--- a/cde/programs/dtterm/Imakefile
+++ b/cde/programs/dtterm/Imakefile
@@ -87,7 +87,7 @@ clean::
dtterm.ti: terminfoChecklist
$(RM) $@
- CPP="$(CPP) $(TIC_DEFINES)" ./terminfoCreate < terminfoChecklist > $@
+ CPP="$(CPP) $(TIC_DEFINES)" $(SHELL) terminfoCreate < terminfoChecklist
> $@
includes:: dtterm.ti
depend:: dtterm.ti
all:: dtterm.ti
//Marcin
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
