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

Remove UXPDS support

Browse Source
This commit is contained in:
chase
2018-05-15 20:11:08 -05:00
committed by Jon Trulson
parent 0f8233dadd
commit 8a4f389634
319 changed files with 317 additions and 8776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/programs/dtappbuilder/src/ab.tmpl
View File

@@ -60,9 +60,6 @@ clean::
#if defined(USLArchitecture)
EXTRA_DEFINES = -D_POSIX_SOURCE=1
#elif defined(UXPArchitecture)
/* Need to define __uxp__ when using -Xc */
EXTRA_DEFINES = -D_POSIX_SOURCE=1 -Xc -D__uxp__
#elif defined(AlphaArchitecture)
EXTRA_DEFINES = -D_XOPEN_SOURCE=1 -D_OSF_SOURCE=1
/* default storage(40000) is not enough to process ./src/libABil/bil_parse.y */

1
cde/programs/dtappbuilder/src/ab/Imakefile
View File

@@ -179,7 +179,6 @@ AB_MAKEFILES = \
Makefile.hpux \
Makefile.sunos \
Makefile.osf1 \
Makefile.uxp \
Makefile.unixware \
Makefile.linux \
Makefile.freebsd \

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

@@ -102,7 +102,6 @@ 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_unixware_params(File makeFile, AbmfLibs libs);
static int write_uxp_params(File makeFile, AbmfLibs libs);
static int write_osf1_stuff(File makeFile, AbmfLibs libs);
static int write_lnx_params(File makeFile, AbmfLibs libs);
static int write_fbsd_params(File makeFile, AbmfLibs libs);
@@ -113,7 +112,6 @@ 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_unixware_libs(AbmfLibs libs, ABObj project);
static int determine_uxp_libs(AbmfLibs libs, ABObj project);
static int determine_osf1_libs(AbmfLibs libs, ABObj project);
static int determine_lnx_libs(AbmfLibs libs, ABObj project);
static int determine_fbsd_libs(AbmfLibs libs, ABObj project);
@@ -215,7 +213,7 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType)
lib_add(libs, LibDtTerm, ABMF_LIB_PREPEND, ABMF_LIB_REJECT_DUP);
}
#if defined(USL) || defined(__uxp__)
#if defined(USL)
if (1) /* Workaround because tooltalk not being used when needed */
#else
if (obj_get_tooltalk_level(project) != AB_TOOLTALK_NONE)
@@ -241,9 +239,6 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType)
case AB_OS_UNIXWARE:
return_value = determine_unixware_libs(libs, project);
break;
case AB_OS_UXP:
return_value = determine_uxp_libs(libs, project);
break;
case AB_OS_LNX:
return_value = determine_lnx_libs(libs, project);
break;
@@ -285,12 +280,6 @@ determine_sunos_libs(AbmfLibs libs, ABObj project)
return 0;
}
static int
determine_uxp_libs(AbmfLibs libs, ABObj project)
{
return 0;
}
static int
determine_osf1_libs(AbmfLibs libs, ABObj project)
{
@@ -526,10 +515,6 @@ write_os_params(
return_value = write_unixware_params(makeFile, libs);
break;
case AB_OS_UXP:
return_value = write_uxp_params(makeFile, libs);
break;
case AB_OS_OSF1:
return_value = write_osf1_stuff(makeFile, libs);
break;
@@ -692,47 +677,6 @@ write_sunos_params(File makeFile, AbmfLibs libs)
return 0;
}
static int
write_uxp_params(File makeFile, AbmfLibs libs)
{
STRING osName = util_os_type_to_string(AB_OS_UXP);
abio_printf(makeFile,
"\n"
"###########################################################################\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 = \n"
" ANSI_DEFINES = \n"
"\n"
" CDEBUGFLAGS = -O\n"
" SYS_LIBRARIES = -lnsl -lsocket -lm -ldl -lgen -lresolv -lw\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_UXP);
abio_puts(makeFile,
" CFLAGS = $(CDEBUGFLAGS) -D_POSIX_SOURCE=1 $(INCLUDES) $(STD_DEFINES)"
" $(ANSI_DEFINES)\n"
" LDLIBS = $(SYS_LIBRARIES)\n"
" LDOPTIONS = $(CDE_LDFLAGS) $(ALLX_LDFLAGS)\n"
"\n"
);
return 0;
}
static int
write_osf1_stuff(File makeFile, AbmfLibs libs)
{
@@ -1336,7 +1280,7 @@ write_targets(
"scour:\n"
" $(RM) $(CLEAN_FILES) $(TARGETS.h.merged) $(TARGETS.c.merged) \\\n"
" Makefile Makefile.aix Makefile.hpux Makefile.sunos \\\n"
" Makefile.osf1 Makefile.uxp Makefile.unixware Makefile.linux \\\n"
" Makefile.osf1 Makefile.unixware Makefile.linux \\\n"
" Makefile.freebsd Makefile.netbsd Makefile.openbsd\n"
);

4
cde/programs/dtappbuilder/src/libABobj/obj.c
View File

@@ -459,7 +459,7 @@ obj_alloc_unique_name_for_child(
{
maxlen = 8192;
}
#if defined (USL) || defined(__uxp__)
#if defined (USL)
/*
* The USL specific changes were added ifdef due to time constraints
* They should be removed in the next release
@@ -494,7 +494,7 @@ obj_alloc_unique_name_istr_for_child(
{
maxlen = 8192;
}
#if defined (USL) || defined(__uxp__)
#if defined (USL)
maxlen = util_min(8191,maxlen);
#else
maxlen = util_min(8192,maxlen);

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

@@ -223,7 +223,7 @@ util_vfork()
#ifdef __cplusplus
extern "C" {
#endif
#if defined(__uxp__) || defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 )
#if defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 )
extern int putenv(const char *string);
#elif !(defined(__osf__) || defined(__aix) || defined(__NetBSD__))
extern int putenv(char *string);
@@ -251,7 +251,6 @@ util_get_os_type(void)
int hpIndex = -1;
int sunIndex = -1;
int unixwareIndex = -1;
int uxpIndex = -1;
int osf1Index = -1;
int lnxIndex = -1;
int fbsdIndex = -1;
@@ -271,7 +270,6 @@ util_get_os_type(void)
hpIndex = util_strcasestr(sysInfo.sysname, "hp");
sunIndex = util_strcasestr(sysInfo.sysname, "sun");
unixwareIndex = util_strcasestr(sysInfo.sysname, "UNIX_SV");
uxpIndex = util_strcasestr(sysInfo.sysname, "UNIX_System_V");
osf1Index = util_strcasestr(sysInfo.sysname, "osf1");
lnxIndex = util_strcasestr(sysInfo.sysname, "linux");
fbsdIndex = util_strcasestr(sysInfo.sysname, "freebsd");
@@ -282,64 +280,58 @@ util_get_os_type(void)
if (hpIndex < 0) hpIndex = INT_MAX;
if (sunIndex < 0) sunIndex = INT_MAX;
if (unixwareIndex < 0) unixwareIndex = INT_MAX;
if (uxpIndex < 0) uxpIndex = INT_MAX;
if (osf1Index < 0) osf1Index = 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,h,i,j) \
#define IS_MATCH(a,b,c,d,e,f,g,h,i) \
(((a) < (b)) && ((a) < (c)) && ((a) < (d)) && ((a) < (e)) && ((a) < (f)) && \
((a) < (g)) && ((a) < (h)) && ((a) < (i)) && ((a) < (j)))
((a) < (g)) && ((a) < (h)) && ((a) < (i)))
if (IS_MATCH(aixIndex, hpIndex, sunIndex, osf1Index, unixwareIndex,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_AIX;
}
if (IS_MATCH(hpIndex, aixIndex, sunIndex, osf1Index, unixwareIndex,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_HPUX;
}
if (IS_MATCH(sunIndex, aixIndex, hpIndex, osf1Index, unixwareIndex,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_SUNOS;
}
if (IS_MATCH(osf1Index, aixIndex, hpIndex, sunIndex, unixwareIndex,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_OSF1;
}
if (IS_MATCH(uxpIndex, aixIndex, hpIndex, sunIndex, unixwareIndex,
osf1Index, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_UXP;
}
if (IS_MATCH(unixwareIndex, aixIndex, hpIndex, sunIndex, osf1Index,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_UNIXWARE;
}
if (IS_MATCH(lnxIndex, aixIndex, hpIndex, sunIndex, osf1Index,
unixwareIndex, uxpIndex, fbsdIndex, nbsdIndex, obsdIndex))
unixwareIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_LNX;
}
if (IS_MATCH(fbsdIndex, aixIndex, hpIndex, sunIndex, osf1Index,
unixwareIndex, uxpIndex, lnxIndex, nbsdIndex, obsdIndex))
unixwareIndex, lnxIndex, nbsdIndex, obsdIndex))
{
return AB_OS_FBSD;
}
if (IS_MATCH(nbsdIndex, aixIndex, hpIndex, sunIndex, osf1Index,
unixwareIndex, uxpIndex, lnxIndex, fbsdIndex, obsdIndex))
unixwareIndex, lnxIndex, fbsdIndex, obsdIndex))
{
return AB_OS_NBSD;
}
if (IS_MATCH(obsdIndex, aixIndex, hpIndex, sunIndex, osf1Index,
unixwareIndex, uxpIndex, lnxIndex, fbsdIndex, nbsdIndex))
unixwareIndex, lnxIndex, fbsdIndex, nbsdIndex))
{
return AB_OS_OBSD;
}

1
cde/programs/dtappbuilder/src/libAButil/util.h
View File

@@ -83,7 +83,6 @@ typedef enum
AB_OS_SUNOS,
AB_OS_OSF1,
AB_OS_UNIXWARE,
AB_OS_UXP,
AB_OS_LNX,
AB_OS_FBSD,
AB_OS_NBSD,

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

@@ -855,7 +855,6 @@ util_os_type_to_ident(AB_OS_TYPE osType)
case AB_OS_HPUX: typeString = "hpux"; break;
case AB_OS_SUNOS: typeString = "sunos"; break;
case AB_OS_UNIXWARE: typeString = "unixware"; break;
case AB_OS_UXP: typeString = "uxp"; break;
case AB_OS_OSF1: typeString = "osf1"; break;
case AB_OS_LNX: typeString = "linux"; break;
case AB_OS_FBSD: typeString = "freebsd"; break;
@@ -881,7 +880,6 @@ util_os_type_to_string(AB_OS_TYPE osType)
case AB_OS_HPUX: nameString = "HP-UX"; break;
case AB_OS_SUNOS: nameString = "SunOS"; break;
case AB_OS_UNIXWARE: nameString = "UnixWare"; break;
case AB_OS_UXP: nameString = "UXP"; break;
case AB_OS_OSF1: nameString = "OSF/1"; break;
case AB_OS_LNX: nameString = "Linux"; break;
case AB_OS_FBSD: nameString = "FreeBSD"; break;