debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Discontinue HPUX support

Browse Source
This commit is contained in:
Chase
2022-07-22 21:42:06 -05:00
committed by Jon Trulson
parent bd83b53d56
commit edf4319548
235 changed files with 198 additions and 6290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cde/programs/dtappbuilder/src/ab/Makefile.am
View File

@@ -29,7 +29,6 @@ endif
AB_MAKEFILES = \
Makefile.aix \
Makefile.hpux \
Makefile.sunos \
Makefile.linux \
Makefile.freebsd \

75
cde/programs/dtappbuilder/src/abmf/make_file.c
View File

@@ -99,7 +99,6 @@ static int write_os_params(
AbmfLibs libs
);
static int write_aix_stuff(File makeFile, AbmfLibs libs);
static int write_hpux_stuff(File makeFile, AbmfLibs libs);
static int write_sunos_params(File makeFile, AbmfLibs libs);
static int write_lnx_params(File makeFile, AbmfLibs libs);
static int write_fbsd_params(File makeFile, AbmfLibs libs);
@@ -107,7 +106,6 @@ static int write_nbsd_params(File makeFile, AbmfLibs libs);
static int write_obsd_params(File makeFile, AbmfLibs libs);
static int determine_aix_libs(AbmfLibs libs, ABObj project);
static int determine_hpux_libs(AbmfLibs libs, ABObj project);
static int determine_sunos_libs(AbmfLibs libs, ABObj project);
static int determine_lnx_libs(AbmfLibs libs, ABObj project);
static int determine_fbsd_libs(AbmfLibs libs, ABObj project);
@@ -196,11 +194,6 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType)
lib_add(libs, LibICE, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP);
lib_add(libs, LibSM, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP);
lib_add(libs, LibXp, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP);
if (osType == AB_OS_HPUX)
{
lib_add(libs, LibTt, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP);
}
}
if (projData->has_terminal)
@@ -217,10 +210,6 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType)
return_value = determine_aix_libs(libs, project);
break;
case AB_OS_HPUX:
return_value = determine_hpux_libs(libs, project);
break;
case AB_OS_SUNOS:
return_value = determine_sunos_libs(libs, project);
break;
@@ -247,18 +236,6 @@ determine_aix_libs(AbmfLibs libs, ABObj project)
return 0;
}
static int
determine_hpux_libs(AbmfLibs libs, ABObj project)
{
/*
lib_add(libs, LibWlarchive, ABMF_LIB_PREPEND, ABMF_LIB_REPLACE_DUP);
lib_add(libs, LibWldefault, ABMF_LIB_APPEND, ABMF_LIB_REPLACE_DUP);
*/
return 0;
}
static int
determine_sunos_libs(AbmfLibs libs, ABObj project)
{
@@ -476,10 +453,6 @@ write_os_params(
return_value = write_aix_stuff(makeFile, libs);
break;
case AB_OS_HPUX:
return_value = write_hpux_stuff(makeFile, libs);
break;
case AB_OS_SUNOS:
return_value = write_sunos_params(makeFile, libs);
break;
@@ -551,52 +524,6 @@ write_aix_stuff(File makeFile, AbmfLibs libs)
}
static int
write_hpux_stuff(File makeFile, AbmfLibs libs)
{
STRING osName = util_os_type_to_string(AB_OS_HPUX);
abio_printf(makeFile,
"###########################################################################\n"
"# These are the %s-dependent configuration parameters that must be\n"
"# set in order for any application to build.\n"
"###########################################################################\n",
osName);
abio_puts(makeFile, "\n");
abio_puts(makeFile,
" RM = rm -f\n"
" INCLUDES = -I/usr/dt/include -I/X11/include\n"
"\n"
" STD_DEFINES = -DSYSV -DNLS16 -DMALLOC_0_RETURNS_NULL -DMERGE -DNDEBUG"
" -D__hpux -Dhpux -DOSMAJORVERSION=9 -DOSMINORVERSION=0 -DSHMLINK"
" -D__hp9000s800 -Dhp9000s800 -Dhp9000s700 -DHPPEX\n"
" ANSI_DEFINES = -Aa -D_HPUX_SOURCE -DANSICPP\n"
"\n"
" CDEBUGFLAGS = -g -z\n"
" COPTFLAGS = -O -z\n"
" SYS_LIBRARIES = -lm\n"
" CDE_LIBPATH = /usr/dt/lib\n"
" CDE_LDFLAGS = -L$(CDE_LIBPATH)\n"
" ALLX_LIBPATH = /X11/lib\n"
" ALLX_LDFLAGS = -L$(ALLX_LIBPATH)\n"
);
write_local_libraries(makeFile, libs, AB_OS_HPUX);
abio_puts(makeFile,
"\n"
" CFLAGS = $(CDEBUGFLAGS) $(INCLUDES) $(STD_DEFINES)"
" $(ANSI_DEFINES)\n"
" LDLIBS = $(SYS_LIBRARIES)\n"
" LDOPTIONS = $(CDE_LDFLAGS) $(ALLX_LDFLAGS)\n"
"\n"
);
return 0;
}
static int
write_sunos_params(File makeFile, AbmfLibs libs)
{
@@ -1159,7 +1086,7 @@ write_targets(
"\n"
"scour:\n"
" $(RM) $(CLEAN_FILES) $(TARGETS.h.merged) $(TARGETS.c.merged) \\\n"
" Makefile Makefile.aix Makefile.hpux Makefile.sunos \\\n"
" Makefile Makefile.aix Makefile.sunos \\\n"
" Makefile.linux \\\n"
" Makefile.freebsd Makefile.netbsd Makefile.openbsd\n"
);

1
cde/programs/dtappbuilder/src/include/ab_private/util.h
View File

@@ -78,7 +78,6 @@ extern char *strdup(const char *);
typedef enum
{
AB_OS_UNDEF = 0,
AB_OS_HPUX,
AB_OS_AIX,
AB_OS_SUNOS,
AB_OS_LNX,

4
cde/programs/dtappbuilder/src/libABil/Makefile.am
View File

@@ -8,10 +8,6 @@ BUILT_SOURCES = bil_parse.h bil_parse.c
CLEANFILES = bil_parse.h bil_parse.c
AM_YFLAGS = -d
if HPUX
CCOPTIONS = -Ae
endif
noinst_LIBRARIES = libABil.a
#noinst_PROGRAMS = bil_test

4
cde/programs/dtappbuilder/src/libABobjXm/Makefile.am
View File

@@ -4,10 +4,6 @@ ABINCLUDES = ../include
EXTRA_DEFINES = -D_POSIX_SOURCE=1
if HPUX
CCOPTIONS = -Ae
endif
noinst_LIBRARIES = libABobjXm.a
libABobjXm_a_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)

4
cde/programs/dtappbuilder/src/libAButil/Makefile.am
View File

@@ -4,10 +4,6 @@ ABINCLUDES = ../include
EXTRA_DEFINES = -D_POSIX_SOURCE=1
if HPUX
CCOPTIONS = -Ae
endif
noinst_LIBRARIES = libAButil.a
#noinst_PROGRAMS = util_test istr_test

33
cde/programs/dtappbuilder/src/libAButil/util.c
View File

@@ -233,7 +233,7 @@ util_vfork(void)
#ifdef __cplusplus
extern "C" {
#endif
#if defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 )
#if (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 )
extern int putenv(const char *string);
#elif !(defined(__aix) || defined(__NetBSD__))
extern int putenv(char *string);
@@ -258,7 +258,6 @@ util_get_os_type(void)
int rc = 0; /* return code */
struct utsname sysInfo;
int aixIndex = -1;
int hpIndex = -1;
int sunIndex = -1;
int lnxIndex = -1;
int fbsdIndex = -1;
@@ -275,7 +274,6 @@ util_get_os_type(void)
}
aixIndex = util_strcasestr(sysInfo.sysname, "aix");
hpIndex = util_strcasestr(sysInfo.sysname, "hp");
sunIndex = util_strcasestr(sysInfo.sysname, "sun");
lnxIndex = util_strcasestr(sysInfo.sysname, "linux");
fbsdIndex = util_strcasestr(sysInfo.sysname, "freebsd");
@@ -283,49 +281,36 @@ util_get_os_type(void)
obsdIndex = util_strcasestr(sysInfo.sysname, "openbsd");
if (aixIndex < 0) aixIndex = INT_MAX;
if (hpIndex < 0) hpIndex = INT_MAX;
if (sunIndex < 0) sunIndex = INT_MAX;
if (lnxIndex < 0) lnxIndex = INT_MAX;
if (fbsdIndex < 0) fbsdIndex = INT_MAX;
if (nbsdIndex < 0) nbsdIndex = INT_MAX;
if (obsdIndex < 0) obsdIndex = INT_MAX;
#define IS_MATCH(a,b,c,d,e,f,g) \
(((a) < (b)) && ((a) < (c)) && ((a) < (d)) && ((a) < (e)) && ((a) < (f)) && \
((a) < (g)))
#define IS_MATCH(a,b,c,d,e,f) \
(((a) < (b)) && ((a) < (c)) && ((a) < (d)) && ((a) < (e)) && ((a) < (f)))
if (IS_MATCH(aixIndex, hpIndex, sunIndex, lnxIndex, fbsdIndex, nbsdIndex,
obsdIndex))
if (IS_MATCH(aixIndex, sunIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_AIX;
}
if (IS_MATCH(hpIndex, aixIndex, sunIndex, lnxIndex, fbsdIndex, nbsdIndex,
obsdIndex))
{
return AB_OS_HPUX;
}
if (IS_MATCH(sunIndex, aixIndex, hpIndex, lnxIndex, fbsdIndex, nbsdIndex,
obsdIndex))
if (IS_MATCH(sunIndex, aixIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_SUNOS;
}
if (IS_MATCH(lnxIndex, aixIndex, hpIndex, sunIndex, fbsdIndex, nbsdIndex,
obsdIndex))
if (IS_MATCH(lnxIndex, aixIndex, sunIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_LNX;
}
if (IS_MATCH(fbsdIndex, aixIndex, hpIndex, sunIndex, lnxIndex, nbsdIndex,
obsdIndex))
if (IS_MATCH(fbsdIndex, aixIndex, sunIndex, lnxIndex, nbsdIndex, obsdIndex))
{
return AB_OS_FBSD;
}
if (IS_MATCH(nbsdIndex, aixIndex, hpIndex, sunIndex, lnxIndex, fbsdIndex,
obsdIndex))
if (IS_MATCH(nbsdIndex, aixIndex, sunIndex, lnxIndex, fbsdIndex, obsdIndex))
{
return AB_OS_NBSD;
}
if (IS_MATCH(obsdIndex, aixIndex, hpIndex, sunIndex, lnxIndex, fbsdIndex,
nbsdIndex))
if (IS_MATCH(obsdIndex, aixIndex, sunIndex, lnxIndex, fbsdIndex, nbsdIndex))
{
return AB_OS_OBSD;
}

2
cde/programs/dtappbuilder/src/libAButil/util_convert.c
View File

@@ -852,7 +852,6 @@ util_os_type_to_ident(AB_OS_TYPE osType)
switch (osType)
{
case AB_OS_AIX: typeString = "aix"; break;
case AB_OS_HPUX: typeString = "hpux"; break;
case AB_OS_SUNOS: typeString = "sunos"; break;
case AB_OS_LNX: typeString = "linux"; break;
case AB_OS_FBSD: typeString = "freebsd"; break;
@@ -875,7 +874,6 @@ util_os_type_to_string(AB_OS_TYPE osType)
switch (osType)
{
case AB_OS_AIX: nameString = "AIX"; break;
case AB_OS_HPUX: nameString = "HP-UX"; break;
case AB_OS_SUNOS: nameString = "SunOS"; break;
case AB_OS_LNX: nameString = "Linux"; break;
case AB_OS_FBSD: nameString = "FreeBSD"; break;