From 26467479b775d27097224a3783d2a6d82401324b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 21 May 2011 16:34:45 +0300 Subject: Drop OS2 --- hyphen/makefile.mk | 5 ----- libtextcat/makefile.mk | 4 ++-- lpsolve/lp_solve_5.5.patch | 17 ----------------- lpsolve/makefile.mk | 5 +---- mythes/makefile.mk | 5 ----- np_sdk/mozsrc/jri_md.h | 12 +----------- np_sdk/mozsrc/makefile.mk | 2 +- np_sdk/mozsrc/npapi.h | 24 ------------------------ np_sdk/mozsrc/npupp.h | 31 ++----------------------------- np_sdk/mozsrc/npwin.cpp | 6 ------ redland/raptor/makefile.mk | 7 +------ redland/rasqal/makefile.mk | 7 +------ redland/redland/makefile.mk | 7 +------ unixODBC/inc/sqltypes.h | 4 ---- 14 files changed, 10 insertions(+), 126 deletions(-) diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index 529020f..d7169e4 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -99,11 +99,6 @@ BUILD_ACTION=dmake OUT2INC += hyphen.h .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -BUILD_ACTION=dmake -OUT2INC += hyphen.h -.ENDIF # "$(GUI)"=="OS2" - .IF "$(CROSS_COMPILING)"!="" CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" .ENDIF diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index e1b480b..74b1804 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -84,9 +84,9 @@ OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*$(DLLPOST) .ENDIF # "$(GUI)"=="UNX" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" BUILD_ACTION=cd src && dmake $(MAKEMACROS) -.ENDIF # "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.ENDIF # "$(GUI)"=="WNT" OUT2INC= \ diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index 2d25979..661a8d3 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -33,23 +33,6 @@ + $c $pic -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src + $c -shared $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs fi ---- misc/lp_solve_5.5/lpsolve55/ccc.os2 2008-11-26 12:49:36.000000000 +0100 -+++ misc/build/lp_solve_5.5/lpsolve55/ccc.os2 2008-09-25 17:27:48.000000000 +0200 -@@ -1 +1,13 @@ --dummy -+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -+c=$CC -+ -+def= -+so= -+ -+opts='-O3' -+ -+$c -s -c -Zomf -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -+emxomfar rv liblpsolve55.lib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -+echo liblpsolve55.a -+ -+rm *.o 2>/dev/null --- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008 @@ -1,8 +1,12 @@ diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 408c6f0..21dca49 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -45,7 +45,7 @@ PATCH_FILES=lp_solve_5.5-windows.patch PATCH_FILES=\ lp_solve_5.5.patch \ lp_solve-aix.patch -ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios lpsolve55$/ccc.os2 +ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios .ENDIF .IF "$(OS)"=="OPENBSD" @@ -76,9 +76,6 @@ BUILD_ACTION=cmd /c cvc6.bat OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib .ENDIF OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll -.ELIF "$(GUI)"=="OS2" -BUILD_ACTION=sh ccc.os2 -OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib .ELSE .IF "$(OS)"=="MACOSX" .EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS diff --git a/mythes/makefile.mk b/mythes/makefile.mk index 131b1ee..20efead 100644 --- a/mythes/makefile.mk +++ b/mythes/makefile.mk @@ -101,11 +101,6 @@ BUILD_ACTION=dmake OUT2INC += mythes.hxx .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -BUILD_ACTION=dmake -OUT2INC += mythes.hxx -.ENDIF # "$(GUI)"=="OS2" - # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/mozsrc/jri_md.h index 847675c..6db8c65 100644 --- a/np_sdk/mozsrc/jri_md.h +++ b/np_sdk/mozsrc/jri_md.h @@ -68,17 +68,7 @@ extern "C" { /* DLL Entry modifiers... */ /* PC */ -#if defined(XP_OS2) -# ifdef XP_OS2_VACPP -# define JRI_PUBLIC_API(ResultType) ResultType _Optlink -# define JRI_PUBLIC_VAR(VarType) VarType -# define JRI_CALLBACK -# else -# define JRI_PUBLIC_API(ResultType) ResultType -# define JRI_PUBLIC_VAR(VarType) VarType -# define JRI_CALLBACK -# endif -#elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) +#if defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) # include # if defined(_MSC_VER) || defined(__MINGW32__) # if defined(WIN32) || defined(_WIN32) diff --git a/np_sdk/mozsrc/makefile.mk b/np_sdk/mozsrc/makefile.mk index 1172a38..248cb6d 100644 --- a/np_sdk/mozsrc/makefile.mk +++ b/np_sdk/mozsrc/makefile.mk @@ -41,7 +41,7 @@ JDKINCS= # --- Files -------------------------------------------------------- -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" MOZFILES = $(SLO)$/npwin.obj .ELSE MOZFILES = $(SLO)$/npunix.obj diff --git a/np_sdk/mozsrc/npapi.h b/np_sdk/mozsrc/npapi.h index af64042..e0863b1 100644 --- a/np_sdk/mozsrc/npapi.h +++ b/np_sdk/mozsrc/npapi.h @@ -45,18 +45,8 @@ #ifndef _NPAPI_H_ #define _NPAPI_H_ -#ifdef __OS2__ -#pragma pack(1) -#endif - #include "jri.h" /* Java Runtime Interface */ -#if defined (__OS2__ ) || defined (OS2) -# ifndef XP_OS2 -# define XP_OS2 1 -# endif /* XP_OS2 */ -#endif /* __OS2__ */ - #ifdef _WINDOWS # ifndef XP_WIN # define XP_WIN 1 @@ -388,13 +378,6 @@ typedef struct _NPEvent uint32 wParam; uint32 lParam; } NPEvent; -#elif defined(XP_OS2) -typedef struct _NPEvent -{ - uint32 event; - uint32 wParam; - uint32 lParam; -} NPEvent; #elif defined (XP_UNIX) && !defined(NO_X11) typedef XEvent NPEvent; #else @@ -521,12 +504,8 @@ enum NPEventType { #if defined(_WINDOWS) && !defined(WIN32) #define NP_LOADDS _loadds #else -#if defined(__OS2__) -#define NP_LOADDS _System -#else #define NP_LOADDS #endif -#endif #ifdef __cplusplus extern "C" { @@ -603,8 +582,5 @@ void NP_LOADDS NPN_ForceRedraw(NPP instance); #endif #endif /* RC_INVOKED */ -#ifdef __OS2__ -#pragma pack() -#endif #endif /* _NPAPI_H_ */ diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/mozsrc/npupp.h index 9cf63e1..b2f9576 100644 --- a/np_sdk/mozsrc/npupp.h +++ b/np_sdk/mozsrc/npupp.h @@ -46,10 +46,6 @@ #ifndef _NPUPP_H_ #define _NPUPP_H_ -#if defined(__OS2__) -#pragma pack(1) -#endif - #ifndef GENERATINGCFM #define GENERATINGCFM 0 #endif @@ -1223,35 +1219,16 @@ typedef OSErr (* NP_LOADDS BP_GetSupportedMIMETypesUPP)(BPSupportedMIMETypes*, U #if defined(_WINDOWS) #define OSCALL WINAPI #else -#if defined(__OS2__) -#define OSCALL _System -#else #define OSCALL #endif -#endif -#if defined( _WINDOWS ) || defined (__OS2__) +#if defined( _WINDOWS ) #ifdef __cplusplus extern "C" { #endif /* plugin meta member functions */ -#if defined(__OS2__) - -typedef struct _NPPluginData { /* Alternate OS2 Plugin interface */ - char *pMimeTypes; - char *pFileExtents; - char *pFileOpenTemplate; - char *pProductName; - char *pProductDescription; - unsigned long dwProductVersionMS; - unsigned long dwProductVersionLS; -} NPPluginData; - -NPError OSCALL NP_GetPluginData(NPPluginData * pPluginData); - -#endif NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* pFuncs); @@ -1265,11 +1242,7 @@ char* NP_GetMIMEDescription(); } #endif -#endif /* _WINDOWS || __OS2__ */ - -#if defined(__OS2__) -#pragma pack() -#endif +#endif /* _WINDOWS */ #ifdef XP_UNIX diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp index 1fb4d3e..3c893b2 100644 --- a/np_sdk/mozsrc/npwin.cpp +++ b/np_sdk/mozsrc/npwin.cpp @@ -45,12 +45,6 @@ //\\// DEFINE #define NP_EXPORT -#ifdef OS2 -#define WINAPI _System -#define HIBYTE(a) (a>>8) -#define LOBYTE(a) (a&0xFF) -#endif - //\\// GLOBAL DATA NPNetscapeFuncs* g_pNavigatorFuncs = 0; diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 6fc9e4b..61d1e5a 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -67,10 +67,7 @@ OOO_PATCH_FILES += \ PATCH_FILES=$(OOO_PATCH_FILES) -.IF "$(OS)"=="OS2" -BUILD_ACTION=dmake -BUILD_DIR=$(CONFIGURE_DIR)$/src -.ELIF "$(OS)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw raptor_CC=$(CC) -mthreads @@ -171,8 +168,6 @@ OUT2BIN+=src/raptor-config .ELSE # if we use dmake, this is done automagically .ENDIF -.ELIF "$(GUI)"=="OS2" -# if we use dmake, this is done automagically .ELSE OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 9956dac..2b09a4d 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -62,10 +62,7 @@ OOO_PATCH_FILES= \ PATCH_FILES=$(OOO_PATCH_FILES) -.IF "$(OS)"=="OS2" -BUILD_ACTION=dmake -BUILD_DIR=$(CONFIGURE_DIR)$/src -.ELIF "$(OS)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" rasqal_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" @@ -158,8 +155,6 @@ OUT2BIN+=src/rasqal-config .ELSE # if we use dmake, this is done automagically .ENDIF -.ELIF "$(OS)"=="OS2" -# if we use dmake, this is done automagically .ELSE OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so OUT2BIN+=src/rasqal-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index cbe9b4e..f7c6f8a 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -62,10 +62,7 @@ OOO_PATCH_FILES= \ PATCH_FILES=$(OOO_PATCH_FILES) \ -.IF "$(OS)"=="OS2" -BUILD_ACTION=dmake -BUILD_DIR=$(CONFIGURE_DIR)$/librdf -.ELIF "$(OS)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" redland_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" @@ -159,8 +156,6 @@ OUT2BIN+=librdf$/.libs$/*.dll .ELSE # if we use dmake, this is done automagically .ENDIF -.ELIF "$(OS)"=="OS2" -# if we use dmake, this is done automagically .ELSE OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR) .ENDIF diff --git a/unixODBC/inc/sqltypes.h b/unixODBC/inc/sqltypes.h index 130de90..5bee0d6 100644 --- a/unixODBC/inc/sqltypes.h +++ b/unixODBC/inc/sqltypes.h @@ -75,11 +75,7 @@ extern "C" { #define FAR #define CALLBACK -#ifdef __OS2__ -#define SQL_API _System -#else #define SQL_API -#endif #define BOOL int typedef void* HWND; typedef char CHAR; -- cgit v1.2.3