Attachment #3021 for issue #6078

View | Details | Raw Unified | Return to issue 6078
Collapse All | Expand All

Lines 256-261 Link Here

(-)inc/gcfg.inc (-2 / +11 lines)
256	#define CONCAT5( x, y, z, a, b ) DOCONCAT5(x,y,z,a,b)	256	#define CONCAT5( x, y, z, a, b ) DOCONCAT5(x,y,z,a,b)
257	#define DOCONCAT6( x, y, z, a, b, c ) x##y##z##a##b##c	257	#define DOCONCAT6( x, y, z, a, b, c ) x##y##z##a##b##c
258	#define CONCAT6( x, y, z, a, b, c ) DOCONCAT6(x,y,z,a,b,c)	258	#define CONCAT6( x, y, z, a, b, c ) DOCONCAT6(x,y,z,a,b,c)
		259	#define DOCONCAT7( x, y, z, a, b, c, d ) x##y##z##a##b##c##d
		260	#define CONCAT7( x, y, z, a, b, c, d ) DOCONCAT7(x,y,z,a,b,c,d)
		261	#define DOCONCAT8( x, y, z, a, b, c, d, e ) x##y##z##a##b##c##d##e
		262	#define CONCAT8( x, y, z, a, b, c, d, e ) DOCONCAT8(x,y,z,a,b,c,d,e)
259		263
260	/* --------------------------------------------------*/	264	/* --------------------------------------------------*/
261		265
Lines 284-291 Link Here
284	/* --------------------------------------------------*/	288	/* --------------------------------------------------*/
285		289
286	#ifdef UNX	290	#ifdef UNX
287	#define LIBNAME(name) STRING(CONCAT5(lib,name,SUPD,DLLSUFFIX,.so))	291	#ifdef MACOSX
288	#define LIBSHORTNAME(name) STRING(CONCAT4(lib,name,DLLSUFFIX,.so))	292	#define UNXSUFFIX .dylib
		293	#else
		294	#define UNXSUFFIX .so
		295	#endif
		296	#define LIBNAME(name) STRING(CONCAT5(lib,name,SUPD,DLLSUFFIX,UNXSUFFIX))
		297	#define LIBSHORTNAME(name) STRING(CONCAT4(lib,name,DLLSUFFIX,UNXSUFFIX))
289	#define FILTER_LIBNAME(name) LIBNAME(name)	298	#define FILTER_LIBNAME(name) LIBNAME(name)
290	#define EXENAME(name) STRING(name)	299	#define EXENAME(name) STRING(name)
291	#define PROFILENAME(name) STRING(CONCAT2(name,rc))	300	#define PROFILENAME(name) STRING(CONCAT2(name,rc))

Lines 93-99 Link Here

(-)source/calc/files_calc.scp (-1 / +1 lines)
93	#ifdef WNT	93	#ifdef WNT
94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))	94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
95	#else	95	#else
96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))	96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
97	#endif	97	#endif
98		98
99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \	99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \

Lines 93-99 Link Here

(-)source/chart/files_chart.scp (-1 / +1 lines)
93	#ifdef WNT	93	#ifdef WNT
94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))	94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
95	#else	95	#else
96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))	96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
97	#endif	97	#endif
98		98
99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \	99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \

Lines 93-99 Link Here

(-)source/draw/files_draw.scp (-1 / +1 lines)
93	#ifdef WNT	93	#ifdef WNT
94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))	94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
95	#else	95	#else
96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))	96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
97	#endif	97	#endif
98		98
99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \	99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \

Lines 155-161 Link Here

(-)source/fonts/files_fonts.scp (-1 / +1 lines)
155	#ifdef WNT	155	#ifdef WNT
156	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))	156	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
157	#else	157	#else
158	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))	158	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
159	#endif	159	#endif
160		160
161	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \	161	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \




        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
        #else
        Name            = "mcnttype.dll";
        #endif

            Dir             = GCFG_BINARY_DIR;
        #endif
        #ifdef UNX
            Name            = STRING(CONCAT4(libvcl,SUPD,DLLSUFFIX,UNXSUFFIX));
        #else
            Name            = STRING(CONCAT4(vcl,SUPD,DLLSUFFIX,.dll));
        #endif

    Styles          = (PACKED, SETUPZIP);
    Dir             = GCFG_BINARY_DIR;
  #ifdef UNX
    Name            = STRING(CONCAT2(libasv,UNXSUFFIX));
  #else
    Name            = "asv.dll";
  #endif

File GID_FILE_LIB_LOCALEDATA_ASCII
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(liblocaledata_ascii,UNXSUFFIX));
    #else
    Name            = "localedata_ascii.dll";
	#endif

File GID_FILE_LIB_LOCALEDATA_CJK
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(liblocaledata_CJK,UNXSUFFIX));
    #else
    Name            = "localedata_CJK.dll";
	#endif

        Dir             = GCFG_BINARY_DIR;
#ifdef UNX
  #if defined(_gcc3) || defined(_GCC)
            Name            = STRING(CONCAT3(libstlport_,gcc,UNXSUFFIX));
  #else
    #ifdef SOLARIS
            Name            = STRING(CONCAT3(libstlport_,sunpro,UNXSUFFIX));
    #else
            Name            = STRING(CONCAT3(libstlport_,COMNAME,UNXSUFFIX));
	#endif
  #endif
#else

File GID_FILE_LIB_COLLATOR
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libcollator,UNXSUFFIX));
	#else
    Name            = "collator.dll";
	#endif

	Dir				= GCFG_BINARY_DIR;
	Styles			= (PACKED, SETUPZIP);
    #ifdef UNX
      Name          = STRING(CONCAT3(libucbhelper1,COMID,UNXSUFFIX));
    #else
      Name          = STRING(CONCAT3(ucbhelper1,COMID,.dll));
	#endif

File GID_FILE_LIB_J
	BIN_FILE_BODY;
	#ifdef UNX
	Name			= STRING(CONCAT6(lib,j,SUPD,DLLSUFFIX,_g,UNXSUFFIX));
	#else
	Name			= STRING(CONCAT5(j,SUPD,DLLSUFFIX,_g,.dll));
	#endif

File GID_FILE_LIB_COMPHELPER2
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libcomphelp2,UNXSUFFIX));
	#else
    Name            = "comphelp2.dll";
	#endif

File GID_FILE_LIB_VOS
	BIN_FILE_BODY;
    #ifdef UNX
      Name          = STRING(CONCAT3(libvos2,COMID,UNXSUFFIX));
    #else
      Name          = STRING(CONCAT3(vos2,COMID,.dll));
	#endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
#ifdef UNX
        Name            = STRING(CONCAT4(libdtransX11,SUPD,DLLSUFFIX,UNXSUFFIX));
#else
        Name            = "sysdtrans.dll";
#endif


#endif

#ifdef MACOSX

File GID_FILE_LIB_STATIC
        BIN_FILE_BODY;
        Styles          = (PACKED, SETUPZIP);
        #ifdef SRV_PRODUCT
            Dir             = GID_DIR_PROGRAM_LOCAL;
        #else
            Dir             = GCFG_BINARY_DIR;
        #endif
        Name            = STRING(CONCAT3(libstatic,DLLSUFFIX,UNXSUFFIX));
End

File GID_FILE_LIB_DL
        BIN_FILE_BODY;
        Styles          = (PACKED, SETUPZIP);
        #ifdef SRV_PRODUCT
            Dir             = GID_DIR_PROGRAM_LOCAL;
        #else
            Dir             = GCFG_BINARY_DIR;
        #endif
        Name            = STRING(CONCAT2(libdl.0,UNXSUFFIX));
End

#endif


Lines 1-4 Link Here

(-)source/global/udk_base.scp (-1 / +1 lines)
1	#include "gid.inc"	1	#include "gid.inc"
2	#include "szipmac.inc"	2	#include "szipmac.inc"
3		3
4	#include <scp/udk_basefiles.scp>	4	#include <scp/udk_basefiles.scp>

Lines 93-99 Link Here

(-)source/grafikfilter/files_grafik.scp (-1 / +1 lines)
93	#ifdef WNT	93	#ifdef WNT
94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))	94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
95	#else	95	#else
96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))	96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
97	#endif	97	#endif
98		98
99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \	99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \

Lines 93-99 Link Here

(-)source/impress/files_impress.scp (-1 / +1 lines)
93	#ifdef WNT	93	#ifdef WNT
94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))	94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
95	#else	95	#else
96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))	96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
97	#endif	97	#endif
98		98
99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \	99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \

Lines 93-99 Link Here

(-)source/math/files_math.scp (-1 / +1 lines)
93	#ifdef WNT	93	#ifdef WNT
94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))	94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
95	#else	95	#else
96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))	96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
97	#endif	97	#endif
98		98
99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \	99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \




#ifdef WNT
#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
#else
#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
#endif

#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \

File GID_FILE_LIB_DTRANS
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libdtrans,UNXSUFFIX));
	#else
    Name            = "dtrans.dll";
	#endif

File GID_FILE_LIB_UCPCHELP1
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
	#else
    Name            = "ucpchelp1.dll";
	#endif

File GID_FILE_LIB_DBT
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libdbtools2,UNXSUFFIX));
	#else
    Name            = "dbtools2.dll";
	#endif

File GID_FILE_LIB_DBODBCBASE
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libodbcbase2,UNXSUFFIX));
	#else
    Name            = "odbcbase2.dll";
	#endif
    Dir             = GID_DIR_PROGRAM;
	Styles			= (PACKED);
End

File GID_FILE_LIB_MOZABDRV
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libmozabdrv2,UNXSUFFIX));
	#else
    Name            = "mozabdrv2.dll";
	#endif

	Styles			= (PACKED);
End


STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)


File GID_FILE_LIB_DICT_JA_JP
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libdict_ja_JP,UNXSUFFIX));
	#else
    Name            = "dict_ja_JP.dll";
	#endif

File GID_FILE_LIB_DICT_ZH_CN
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libdict_zh_CN,UNXSUFFIX));
    #else
    Name            = "dict_zh_CN.dll";
	#endif

File GID_FILE_LIB_DICT_ZH_TW
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libdict_zh_TW,UNXSUFFIX));
    #else
    Name            = "dict_zh_TW.dll";
	#endif

    Styles          = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
    RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
	#ifdef UNX
    Name            = STRING(CONCAT2(libportal,UNXSUFFIX));
	#else
    Name            = "portal.dll";
	#endif

File GID_PORTAL_FILE_LIB_PORTALCONNECT
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(libportalconnect,UNXSUFFIX));
	#else
    Name            = "portalconnect.dll";
	#endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libucprmt1,UNXSUFFIX));
        #else
        Name            = "ucprmt1.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libadabas2,UNXSUFFIX));
        #else
        Name            = "adabas2.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libjdbc2,UNXSUFFIX));
        #else
        Name            = "jdbc2.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libodbc2,UNXSUFFIX));
        #else
        Name            = "odbc2.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libmozab2,UNXSUFFIX));
        #else
        Name            = "mozab2.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
        #else
        Name            = "sdbc2.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
        #else
        Name            = "dbpool2.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libcached1,UNXSUFFIX));
        #else
        Name            = "cached1.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libucb1,UNXSUFFIX));
        #else
        Name            = "ucb1.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libsax,UNXSUFFIX));
        #else
        Name            = "sax.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libevtatt,UNXSUFFIX));
        #else
        Name            = "evtatt.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libproxyset,UNXSUFFIX));
        #else
        Name            = "proxyset.dll";
        #endif

        Styles          = (PACKED);
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
        #else
        Name            = "libdb32.dll";
        #endif

        Styles          = (PACKED);
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
        #else
        Name            = "libdb_java32.dll";
        #endif

        BIN_FILE_BODY;
        Styles          = (PACKED);
        Dir             = GID_DIR_PROGRAM;
        Name            = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
End

#endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
        #else
        Name            = "tvhlp1.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libcfgmgr2,UNXSUFFIX));
        #else
        Name            = "cfgmgr2.dll";
        #endif




File GID_FILE_LIB_LOCALEDATA_ASCII
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(liblocaledata_ascii,UNXSUFFIX));
    #else
    Name            = "localedata_ascii.dll";
	#endif

File GID_FILE_LIB_LOCALEDATA_CJK
	BIN_FILE_BODY;
	#ifdef UNX
    Name            = STRING(CONCAT2(liblocaledata_CJK,UNXSUFFIX));
    #else
    Name            = "localedata_CJK.dll";
	#endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libcfgmgr2l,UNXSUFFIX));
        #else
        Name            = "cfgmgr2l.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libsrtrs1,UNXSUFFIX));
        #else
        Name            = "srtrs1.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libsax,UNXSUFFIX));
        #else
        Name            = "sax.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libtcv,UNXSUFFIX));
        #else
        Name            = "tcv.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libucb1,UNXSUFFIX));
        #else
        Name            = "ucb1.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libucpfile1,UNXSUFFIX));
        #else
        Name            = "ucpfile1.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libucpdav1,UNXSUFFIX));
        #else
        Name            = "ucpdav1.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libucppkg1,UNXSUFFIX));
        #else
        Name            = "ucppkg1.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libpackage2,UNXSUFFIX));
        #else
        Name            = "package2.dll";
        #endif

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libdnd,UNXSUFFIX));
        #else
        Name            = "dnd.dll";
        #endif

File GID_FILE_LIB_SUNPRO5_UNO
        BIN_FILE_BODY;
        Styles                  = (PACKED);
        Name            = STRING(CONCAT2(libsunpro5_uno,UNXSUFFIX));
		Dir				= GCFG_BINARY_DIR;
End


File GID_FILE_LIB_GCC2_UNO
        BIN_FILE_BODY;
        Styles                  = (PACKED);
        Name            = STRING(CONCAT2(libgcc2_uno,UNXSUFFIX));
		Dir				= GCFG_BINARY_DIR;
End


Lines 93-99 Link Here

(-)source/psprint/files_psprint.scp (-1 / +1 lines)
93	#ifdef WNT	93	#ifdef WNT
94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))	94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
95	#else	95	#else
96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))	96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
97	#endif	97	#endif
98		98
99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \	99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \

Return to issue 6078

Lines 421-427 Link Here

(-)source/player/player.scp (-14 / +14 lines)
421	File GID_FILE_LIB_LOCALEDATA_ASCII	421	File GID_FILE_LIB_LOCALEDATA_ASCII
422	BIN_FILE_BODY;	422	BIN_FILE_BODY;
423	#ifdef UNX	423	#ifdef UNX
424	Name = "liblocaledata_ascii.so";	424	Name = STRING(CONCAT2(liblocaledata_ascii,UNXSUFFIX));
425	#else	425	#else
426	Name = "localedata_ascii.dll";	426	Name = "localedata_ascii.dll";
427	#endif	427	#endif
Lines 432-438 Link Here
432	File GID_FILE_LIB_LOCALEDATA_CJK	432	File GID_FILE_LIB_LOCALEDATA_CJK
433	BIN_FILE_BODY;	433	BIN_FILE_BODY;
434	#ifdef UNX	434	#ifdef UNX
435	Name = "liblocaledata_CJK.so";	435	Name = STRING(CONCAT2(liblocaledata_CJK,UNXSUFFIX));
436	#else	436	#else
437	Name = "localedata_CJK.dll";	437	Name = "localedata_CJK.dll";
438	#endif	438	#endif
Lines 448-454 Link Here
448	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	448	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
449	Dir = GCFG_BINARY_DIR;	449	Dir = GCFG_BINARY_DIR;
450	#ifdef UNX	450	#ifdef UNX
451	Name = "libcfgmgr2l.so";	451	Name = STRING(CONCAT2(libcfgmgr2l,UNXSUFFIX));
452	#else	452	#else
453	Name = "cfgmgr2l.dll";	453	Name = "cfgmgr2l.dll";
454	#endif	454	#endif
Lines 462-468 Link Here
462	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	462	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
463	Dir = GCFG_BINARY_DIR;	463	Dir = GCFG_BINARY_DIR;
464	#ifdef UNX	464	#ifdef UNX
465	Name = "libsrtrs1.so";	465	Name = STRING(CONCAT2(libsrtrs1,UNXSUFFIX));
466	#else	466	#else
467	Name = "srtrs1.dll";	467	Name = "srtrs1.dll";
468	#endif	468	#endif
Lines 475-481 Link Here
475	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	475	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
476	Dir = GCFG_BINARY_DIR;	476	Dir = GCFG_BINARY_DIR;
477	#ifdef UNX	477	#ifdef UNX
478	Name = "libsax.so";	478	Name = STRING(CONCAT2(libsax,UNXSUFFIX));
479	#else	479	#else
480	Name = "sax.dll";	480	Name = "sax.dll";
481	#endif	481	#endif
Lines 487-493 Link Here
487	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	487	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
488	Dir = GCFG_BINARY_DIR;	488	Dir = GCFG_BINARY_DIR;
489	#ifdef UNX	489	#ifdef UNX
490	Name = "libtcv.so";	490	Name = STRING(CONCAT2(libtcv,UNXSUFFIX));
491	#else	491	#else
492	Name = "tcv.dll";	492	Name = "tcv.dll";
493	#endif	493	#endif
Lines 499-505 Link Here
499	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	499	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
500	Dir = GCFG_BINARY_DIR;	500	Dir = GCFG_BINARY_DIR;
501	#ifdef UNX	501	#ifdef UNX
502	Name = "libucb1.so";	502	Name = STRING(CONCAT2(libucb1,UNXSUFFIX));
503	#else	503	#else
504	Name = "ucb1.dll";	504	Name = "ucb1.dll";
505	#endif	505	#endif
Lines 511-517 Link Here
511	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	511	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
512	Dir = GCFG_BINARY_DIR;	512	Dir = GCFG_BINARY_DIR;
513	#ifdef UNX	513	#ifdef UNX
514	Name = "libucpfile1.so";	514	Name = STRING(CONCAT2(libucpfile1,UNXSUFFIX));
515	#else	515	#else
516	Name = "ucpfile1.dll";	516	Name = "ucpfile1.dll";
517	#endif	517	#endif
Lines 523-529 Link Here
523	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	523	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
524	Dir = GCFG_BINARY_DIR;	524	Dir = GCFG_BINARY_DIR;
525	#ifdef UNX	525	#ifdef UNX
526	Name = "libucpdav1.so";	526	Name = STRING(CONCAT2(libucpdav1,UNXSUFFIX));
527	#else	527	#else
528	Name = "ucpdav1.dll";	528	Name = "ucpdav1.dll";
529	#endif	529	#endif
Lines 535-541 Link Here
535	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	535	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
536	Dir = GCFG_BINARY_DIR;	536	Dir = GCFG_BINARY_DIR;
537	#ifdef UNX	537	#ifdef UNX
538	Name = "libucppkg1.so";	538	Name = STRING(CONCAT2(libucppkg1,UNXSUFFIX));
539	#else	539	#else
540	Name = "ucppkg1.dll";	540	Name = "ucppkg1.dll";
541	#endif	541	#endif
Lines 547-553 Link Here
547	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	547	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
548	Dir = GCFG_BINARY_DIR;	548	Dir = GCFG_BINARY_DIR;
549	#ifdef UNX	549	#ifdef UNX
550	Name = "libpackage2.so";	550	Name = STRING(CONCAT2(libpackage2,UNXSUFFIX));
551	#else	551	#else
552	Name = "package2.dll";	552	Name = "package2.dll";
553	#endif	553	#endif
Lines 1259-1265 Link Here
1259	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	1259	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
1260	Dir = GCFG_BINARY_DIR;	1260	Dir = GCFG_BINARY_DIR;
1261	#ifdef UNX	1261	#ifdef UNX
1262	Name = "libdnd.so";	1262	Name = STRING(CONCAT2(libdnd,UNXSUFFIX));
1263	#else	1263	#else
1264	Name = "dnd.dll";	1264	Name = "dnd.dll";
1265	#endif	1265	#endif
Lines 1301-1307 Link Here
1301	File GID_FILE_LIB_SUNPRO5_UNO	1301	File GID_FILE_LIB_SUNPRO5_UNO
1302	BIN_FILE_BODY;	1302	BIN_FILE_BODY;
1303	Styles = (PACKED);	1303	Styles = (PACKED);
1304	Name = "libsunpro5_uno.so";	1304	Name = STRING(CONCAT2(libsunpro5_uno,UNXSUFFIX));
1305	Dir = GCFG_BINARY_DIR;	1305	Dir = GCFG_BINARY_DIR;
1306	End	1306	End
1307		1307
Lines 1312-1318 Link Here
1312	File GID_FILE_LIB_GCC2_UNO	1312	File GID_FILE_LIB_GCC2_UNO
1313	BIN_FILE_BODY;	1313	BIN_FILE_BODY;
1314	Styles = (PACKED);	1314	Styles = (PACKED);
1315	Name = "libgcc2_uno.so";	1315	Name = STRING(CONCAT2(libgcc2_uno,UNXSUFFIX));
1316	Dir = GCFG_BINARY_DIR;	1316	Dir = GCFG_BINARY_DIR;
1317	End	1317	End
1318		1318

Lines 10-16 Link Here

(-)source/global/setupzip.scp (-14 / +39 lines)
10	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	10	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
11	Dir = GCFG_BINARY_DIR;	11	Dir = GCFG_BINARY_DIR;
12	#ifdef UNX	12	#ifdef UNX
13	Name = "libmcnttype.so";	13	Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
14	#else	14	#else
15	Name = "mcnttype.dll";	15	Name = "mcnttype.dll";
16	#endif	16	#endif
Lines 38-44 Link Here
38	Dir = GCFG_BINARY_DIR;	38	Dir = GCFG_BINARY_DIR;
39	#endif	39	#endif
40	#ifdef UNX	40	#ifdef UNX
41	Name = STRING(CONCAT4(libvcl,SUPD,DLLSUFFIX,.so));	41	Name = STRING(CONCAT4(libvcl,SUPD,DLLSUFFIX,UNXSUFFIX));
42	#else	42	#else
43	Name = STRING(CONCAT4(vcl,SUPD,DLLSUFFIX,.dll));	43	Name = STRING(CONCAT4(vcl,SUPD,DLLSUFFIX,.dll));
44	#endif	44	#endif
Lines 55-61 Link Here
55	Styles = (PACKED, SETUPZIP);	55	Styles = (PACKED, SETUPZIP);
56	Dir = GCFG_BINARY_DIR;	56	Dir = GCFG_BINARY_DIR;
57	#ifdef UNX	57	#ifdef UNX
58	Name = "libasv.so";	58	Name = STRING(CONCAT2(libasv,UNXSUFFIX));
59	#else	59	#else
60	Name = "asv.dll";	60	Name = "asv.dll";
61	#endif	61	#endif
Lines 92-98 Link Here
92	File GID_FILE_LIB_LOCALEDATA_ASCII	92	File GID_FILE_LIB_LOCALEDATA_ASCII
93	BIN_FILE_BODY;	93	BIN_FILE_BODY;
94	#ifdef UNX	94	#ifdef UNX
95	Name = "liblocaledata_ascii.so";	95	Name = STRING(CONCAT2(liblocaledata_ascii,UNXSUFFIX));
96	#else	96	#else
97	Name = "localedata_ascii.dll";	97	Name = "localedata_ascii.dll";
98	#endif	98	#endif
Lines 103-109 Link Here
103	File GID_FILE_LIB_LOCALEDATA_CJK	103	File GID_FILE_LIB_LOCALEDATA_CJK
104	BIN_FILE_BODY;	104	BIN_FILE_BODY;
105	#ifdef UNX	105	#ifdef UNX
106	Name = "liblocaledata_CJK.so";	106	Name = STRING(CONCAT2(liblocaledata_CJK,UNXSUFFIX));
107	#else	107	#else
108	Name = "localedata_CJK.dll";	108	Name = "localedata_CJK.dll";
109	#endif	109	#endif
Lines 136-147 Link Here
136	Dir = GCFG_BINARY_DIR;	136	Dir = GCFG_BINARY_DIR;
137	#ifdef UNX	137	#ifdef UNX
138	#if defined(_gcc3) \|\| defined(_GCC)	138	#if defined(_gcc3) \|\| defined(_GCC)
139	Name = STRING(CONCAT3(libstlport_,gcc,.so));	139	Name = STRING(CONCAT3(libstlport_,gcc,UNXSUFFIX));
140	#else	140	#else
141	#ifdef SOLARIS	141	#ifdef SOLARIS
142	Name = STRING(CONCAT3(libstlport_,sunpro,.so));	142	Name = STRING(CONCAT3(libstlport_,sunpro,UNXSUFFIX));
143	#else	143	#else
144	Name = STRING(CONCAT3(libstlport_,COMNAME,.so));	144	Name = STRING(CONCAT3(libstlport_,COMNAME,UNXSUFFIX));
145	#endif	145	#endif
146	#endif	146	#endif
147	#else	147	#else
Lines 156-162 Link Here
156	File GID_FILE_LIB_COLLATOR	156	File GID_FILE_LIB_COLLATOR
157	BIN_FILE_BODY;	157	BIN_FILE_BODY;
158	#ifdef UNX	158	#ifdef UNX
159	Name = "libcollator.so";	159	Name = STRING(CONCAT2(libcollator,UNXSUFFIX));
160	#else	160	#else
161	Name = "collator.dll";	161	Name = "collator.dll";
162	#endif	162	#endif
Lines 173-179 Link Here
173	Dir = GCFG_BINARY_DIR;	173	Dir = GCFG_BINARY_DIR;
174	Styles = (PACKED, SETUPZIP);	174	Styles = (PACKED, SETUPZIP);
175	#ifdef UNX	175	#ifdef UNX
176	Name = STRING(CONCAT3(libucbhelper1,COMID,.so));	176	Name = STRING(CONCAT3(libucbhelper1,COMID,UNXSUFFIX));
177	#else	177	#else
178	Name = STRING(CONCAT3(ucbhelper1,COMID,.dll));	178	Name = STRING(CONCAT3(ucbhelper1,COMID,.dll));
179	#endif	179	#endif
Lines 283-289 Link Here
283	File GID_FILE_LIB_J	283	File GID_FILE_LIB_J
284	BIN_FILE_BODY;	284	BIN_FILE_BODY;
285	#ifdef UNX	285	#ifdef UNX
286	Name = STRING(CONCAT6(lib,j,SUPD,DLLSUFFIX,_g,.so));	286	Name = STRING(CONCAT6(lib,j,SUPD,DLLSUFFIX,_g,UNXSUFFIX));
287	#else	287	#else
288	Name = STRING(CONCAT5(j,SUPD,DLLSUFFIX,_g,.dll));	288	Name = STRING(CONCAT5(j,SUPD,DLLSUFFIX,_g,.dll));
289	#endif	289	#endif
Lines 300-306 Link Here
300	File GID_FILE_LIB_COMPHELPER2	300	File GID_FILE_LIB_COMPHELPER2
301	BIN_FILE_BODY;	301	BIN_FILE_BODY;
302	#ifdef UNX	302	#ifdef UNX
303	Name = "libcomphelp2.so";	303	Name = STRING(CONCAT2(libcomphelp2,UNXSUFFIX));
304	#else	304	#else
305	Name = "comphelp2.dll";	305	Name = "comphelp2.dll";
306	#endif	306	#endif
Lines 316-322 Link Here
316	File GID_FILE_LIB_VOS	316	File GID_FILE_LIB_VOS
317	BIN_FILE_BODY;	317	BIN_FILE_BODY;
318	#ifdef UNX	318	#ifdef UNX
319	Name = STRING(CONCAT3(libvos2,COMID,.so));	319	Name = STRING(CONCAT3(libvos2,COMID,UNXSUFFIX));
320	#else	320	#else
321	Name = STRING(CONCAT3(vos2,COMID,.dll));	321	Name = STRING(CONCAT3(vos2,COMID,.dll));
322	#endif	322	#endif
Lines 392-398 Link Here
392	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	392	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
393	Dir = GCFG_BINARY_DIR;	393	Dir = GCFG_BINARY_DIR;
394	#ifdef UNX	394	#ifdef UNX
395	Name = STRING(CONCAT4(libdtransX11,SUPD,DLLSUFFIX,.so));	395	Name = STRING(CONCAT4(libdtransX11,SUPD,DLLSUFFIX,UNXSUFFIX));
396	#else	396	#else
397	Name = "sysdtrans.dll";	397	Name = "sysdtrans.dll";
398	#endif	398	#endif
Lines 417-420 Link Here
417		417
418	#endif	418	#endif
419		419
		420	#ifdef MACOSX
		421
		422	File GID_FILE_LIB_STATIC
		423	BIN_FILE_BODY;
		424	Styles = (PACKED, SETUPZIP);
		425	#ifdef SRV_PRODUCT
		426	Dir = GID_DIR_PROGRAM_LOCAL;
		427	#else
		428	Dir = GCFG_BINARY_DIR;
		429	#endif
		430	Name = STRING(CONCAT3(libstatic,DLLSUFFIX,UNXSUFFIX));
		431	End
		432
		433	File GID_FILE_LIB_DL
		434	BIN_FILE_BODY;
		435	Styles = (PACKED, SETUPZIP);
		436	#ifdef SRV_PRODUCT
		437	Dir = GID_DIR_PROGRAM_LOCAL;
		438	#else
		439	Dir = GCFG_BINARY_DIR;
		440	#endif
		441	Name = STRING(CONCAT2(libdl.0,UNXSUFFIX));
		442	End
		443
		444	#endif
420		445

Lines 93-99 Link Here

(-)source/office/files.scp (-29 / +29 lines)
93	#ifdef WNT	93	#ifdef WNT
94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))	94	#define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
95	#else	95	#else
96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))	96	#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
97	#endif	97	#endif
98		98
99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \	99	#define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
Lines 402-408 Link Here
402	File GID_FILE_LIB_DTRANS	402	File GID_FILE_LIB_DTRANS
403	BIN_FILE_BODY;	403	BIN_FILE_BODY;
404	#ifdef UNX	404	#ifdef UNX
405	Name = "libdtrans.so";	405	Name = STRING(CONCAT2(libdtrans,UNXSUFFIX));
406	#else	406	#else
407	Name = "dtrans.dll";	407	Name = "dtrans.dll";
408	#endif	408	#endif
Lines 429-435 Link Here
429	File GID_FILE_LIB_UCPCHELP1	429	File GID_FILE_LIB_UCPCHELP1
430	BIN_FILE_BODY;	430	BIN_FILE_BODY;
431	#ifdef UNX	431	#ifdef UNX
432	Name = "libucpchelp1.so";	432	Name = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
433	#else	433	#else
434	Name = "ucpchelp1.dll";	434	Name = "ucpchelp1.dll";
435	#endif	435	#endif
Lines 453-459 Link Here
453	File GID_FILE_LIB_DBT	453	File GID_FILE_LIB_DBT
454	BIN_FILE_BODY;	454	BIN_FILE_BODY;
455	#ifdef UNX	455	#ifdef UNX
456	Name = "libdbtools2.so";	456	Name = STRING(CONCAT2(libdbtools2,UNXSUFFIX));
457	#else	457	#else
458	Name = "dbtools2.dll";	458	Name = "dbtools2.dll";
459	#endif	459	#endif
Lines 466-482 Link Here
466	File GID_FILE_LIB_DBODBCBASE	466	File GID_FILE_LIB_DBODBCBASE
467	BIN_FILE_BODY;	467	BIN_FILE_BODY;
468	#ifdef UNX	468	#ifdef UNX
469	Name = "libodbcbase2.so";	469	Name = STRING(CONCAT2(libodbcbase2,UNXSUFFIX));
470	#else	470	#else
471	Name = "odbcbase2.dll";	471	Name = "odbcbase2.dll";
472	#endif	472	#endif
473	Dir = GID_DIR_PROGRAM;	473	Dir = GID_DIR_PROGRAM;
474	Styles = (PACKED);	474	Styles = (PACKED);
475	End	475	End
		476
476	File GID_FILE_LIB_MOZABDRV	477	File GID_FILE_LIB_MOZABDRV
477	BIN_FILE_BODY;	478	BIN_FILE_BODY;
478	#ifdef UNX	479	#ifdef UNX
479	Name = "libmozabdrv2.so";	480	Name = STRING(CONCAT2(libmozabdrv2,UNXSUFFIX));
480	#else	481	#else
481	Name = "mozabdrv2.dll";	482	Name = "mozabdrv2.dll";
482	#endif	483	#endif
Lines 484-490 Link Here
484	Styles = (PACKED);	485	Styles = (PACKED);
485	End	486	End
486		487
487
488	STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )	488	STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
489	STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)	489	STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
490		490
Lines 552-558 Link Here
552	File GID_FILE_LIB_DICT_JA_JP	552	File GID_FILE_LIB_DICT_JA_JP
553	BIN_FILE_BODY;	553	BIN_FILE_BODY;
554	#ifdef UNX	554	#ifdef UNX
555	Name = "libdict_ja_JP.so";	555	Name = STRING(CONCAT2(libdict_ja_JP,UNXSUFFIX));
556	#else	556	#else
557	Name = "dict_ja_JP.dll";	557	Name = "dict_ja_JP.dll";
558	#endif	558	#endif
Lines 563-569 Link Here
563	File GID_FILE_LIB_DICT_ZH_CN	563	File GID_FILE_LIB_DICT_ZH_CN
564	BIN_FILE_BODY;	564	BIN_FILE_BODY;
565	#ifdef UNX	565	#ifdef UNX
566	Name = "libdict_zh_CN.so";	566	Name = STRING(CONCAT2(libdict_zh_CN,UNXSUFFIX));
567	#else	567	#else
568	Name = "dict_zh_CN.dll";	568	Name = "dict_zh_CN.dll";
569	#endif	569	#endif
Lines 574-580 Link Here
574	File GID_FILE_LIB_DICT_ZH_TW	574	File GID_FILE_LIB_DICT_ZH_TW
575	BIN_FILE_BODY;	575	BIN_FILE_BODY;
576	#ifdef UNX	576	#ifdef UNX
577	Name = "libdict_zh_TW.so";	577	Name = STRING(CONCAT2(libdict_zh_TW,UNXSUFFIX));
578	#else	578	#else
579	Name = "dict_zh_TW.dll";	579	Name = "dict_zh_TW.dll";
580	#endif	580	#endif
Lines 601-607 Link Here
601	Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);	601	Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
602	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	602	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
603	#ifdef UNX	603	#ifdef UNX
604	Name = "libportal.so";	604	Name = STRING(CONCAT2(libportal,UNXSUFFIX));
605	#else	605	#else
606	Name = "portal.dll";	606	Name = "portal.dll";
607	#endif	607	#endif
Lines 611-617 Link Here
611	File GID_PORTAL_FILE_LIB_PORTALCONNECT	611	File GID_PORTAL_FILE_LIB_PORTALCONNECT
612	BIN_FILE_BODY;	612	BIN_FILE_BODY;
613	#ifdef UNX	613	#ifdef UNX
614	Name = "libportalconnect.so";	614	Name = STRING(CONCAT2(libportalconnect,UNXSUFFIX));
615	#else	615	#else
616	Name = "portalconnect.dll";	616	Name = "portalconnect.dll";
617	#endif	617	#endif
Lines 629-635 Link Here
629	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	629	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
630	Dir = GID_DIR_PROGRAM;	630	Dir = GID_DIR_PROGRAM;
631	#ifdef UNX	631	#ifdef UNX
632	Name = "libucprmt1.so";	632	Name = STRING(CONCAT2(libucprmt1,UNXSUFFIX));
633	#else	633	#else
634	Name = "ucprmt1.dll";	634	Name = "ucprmt1.dll";
635	#endif	635	#endif
Lines 840-846 Link Here
840	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	840	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
841	Dir = GID_DIR_PROGRAM;	841	Dir = GID_DIR_PROGRAM;
842	#ifdef UNX	842	#ifdef UNX
843	Name = "libadabas2.so";	843	Name = STRING(CONCAT2(libadabas2,UNXSUFFIX));
844	#else	844	#else
845	Name = "adabas2.dll";	845	Name = "adabas2.dll";
846	#endif	846	#endif
Lines 854-860 Link Here
854	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	854	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
855	Dir = GID_DIR_PROGRAM;	855	Dir = GID_DIR_PROGRAM;
856	#ifdef UNX	856	#ifdef UNX
857	Name = "libjdbc2.so";	857	Name = STRING(CONCAT2(libjdbc2,UNXSUFFIX));
858	#else	858	#else
859	Name = "jdbc2.dll";	859	Name = "jdbc2.dll";
860	#endif	860	#endif
Lines 866-872 Link Here
866	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	866	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
867	Dir = GID_DIR_PROGRAM;	867	Dir = GID_DIR_PROGRAM;
868	#ifdef UNX	868	#ifdef UNX
869	Name = "libodbc2.so";	869	Name = STRING(CONCAT2(libodbc2,UNXSUFFIX));
870	#else	870	#else
871	Name = "odbc2.dll";	871	Name = "odbc2.dll";
872	#endif	872	#endif
Lines 878-884 Link Here
878	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	878	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
879	Dir = GID_DIR_PROGRAM;	879	Dir = GID_DIR_PROGRAM;
880	#ifdef UNX	880	#ifdef UNX
881	Name = "libmozab2.so";	881	Name = STRING(CONCAT2(libmozab2,UNXSUFFIX));
882	#else	882	#else
883	Name = "mozab2.dll";	883	Name = "mozab2.dll";
884	#endif	884	#endif
Lines 890-896 Link Here
890	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	890	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
891	Dir = GID_DIR_PROGRAM;	891	Dir = GID_DIR_PROGRAM;
892	#ifdef UNX	892	#ifdef UNX
893	Name = "libsdbc2.so";	893	Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
894	#else	894	#else
895	Name = "sdbc2.dll";	895	Name = "sdbc2.dll";
896	#endif	896	#endif
Lines 902-908 Link Here
902	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	902	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
903	Dir = GID_DIR_PROGRAM;	903	Dir = GID_DIR_PROGRAM;
904	#ifdef UNX	904	#ifdef UNX
905	Name = "libdbpool2.so";	905	Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
906	#else	906	#else
907	Name = "dbpool2.dll";	907	Name = "dbpool2.dll";
908	#endif	908	#endif
Lines 957-963 Link Here
957	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	957	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
958	Dir = GID_DIR_PROGRAM;	958	Dir = GID_DIR_PROGRAM;
959	#ifdef UNX	959	#ifdef UNX
960	Name = "libcached1.so";	960	Name = STRING(CONCAT2(libcached1,UNXSUFFIX));
961	#else	961	#else
962	Name = "cached1.dll";	962	Name = "cached1.dll";
963	#endif	963	#endif
Lines 969-975 Link Here
969	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	969	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
970	Dir = GID_DIR_PROGRAM;	970	Dir = GID_DIR_PROGRAM;
971	#ifdef UNX	971	#ifdef UNX
972	Name = "libucb1.so";	972	Name = STRING(CONCAT2(libucb1,UNXSUFFIX));
973	#else	973	#else
974	Name = "ucb1.dll";	974	Name = "ucb1.dll";
975	#endif	975	#endif
Lines 981-987 Link Here
981	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	981	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
982	Dir = GID_DIR_PROGRAM;	982	Dir = GID_DIR_PROGRAM;
983	#ifdef UNX	983	#ifdef UNX
984	Name = "libsax.so";	984	Name = STRING(CONCAT2(libsax,UNXSUFFIX));
985	#else	985	#else
986	Name = "sax.dll";	986	Name = "sax.dll";
987	#endif	987	#endif
Lines 993-999 Link Here
993	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	993	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
994	Dir = GID_DIR_PROGRAM;	994	Dir = GID_DIR_PROGRAM;
995	#ifdef UNX	995	#ifdef UNX
996	Name = "libevtatt.so";	996	Name = STRING(CONCAT2(libevtatt,UNXSUFFIX));
997	#else	997	#else
998	Name = "evtatt.dll";	998	Name = "evtatt.dll";
999	#endif	999	#endif
Lines 1005-1011 Link Here
1005	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	1005	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
1006	Dir = GID_DIR_PROGRAM;	1006	Dir = GID_DIR_PROGRAM;
1007	#ifdef UNX	1007	#ifdef UNX
1008	Name = "libproxyset.so";	1008	Name = STRING(CONCAT2(libproxyset,UNXSUFFIX));
1009	#else	1009	#else
1010	Name = "proxyset.dll";	1010	Name = "proxyset.dll";
1011	#endif	1011	#endif
Lines 1037-1043 Link Here
1037	Styles = (PACKED);	1037	Styles = (PACKED);
1038	Dir = GID_DIR_PROGRAM;	1038	Dir = GID_DIR_PROGRAM;
1039	#ifdef UNX	1039	#ifdef UNX
1040	Name = "libdb-3.2.so";	1040	Name = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
1041	#else	1041	#else
1042	Name = "libdb32.dll";	1042	Name = "libdb32.dll";
1043	#endif	1043	#endif
Lines 1050-1056 Link Here
1050	Styles = (PACKED);	1050	Styles = (PACKED);
1051	Dir = GID_DIR_PROGRAM;	1051	Dir = GID_DIR_PROGRAM;
1052	#ifdef UNX	1052	#ifdef UNX
1053	Name = "libdb_java-3.2.so";	1053	Name = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
1054	#else	1054	#else
1055	Name = "libdb_java32.dll";	1055	Name = "libdb_java32.dll";
1056	#endif	1056	#endif
Lines 1064-1070 Link Here
1064	BIN_FILE_BODY;	1064	BIN_FILE_BODY;
1065	Styles = (PACKED);	1065	Styles = (PACKED);
1066	Dir = GID_DIR_PROGRAM;	1066	Dir = GID_DIR_PROGRAM;
1067	Name = "libdb_cxx-3.2.so";	1067	Name = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
1068	End	1068	End
1069		1069
1070	#endif	1070	#endif
Lines 1344-1350 Link Here
1344	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	1344	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
1345	Dir = GID_DIR_PROGRAM;	1345	Dir = GID_DIR_PROGRAM;
1346	#ifdef UNX	1346	#ifdef UNX
1347	Name = "libtvhlp1.so";	1347	Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
1348	#else	1348	#else
1349	Name = "tvhlp1.dll";	1349	Name = "tvhlp1.dll";
1350	#endif	1350	#endif
Lines 1516-1522 Link Here
1516	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	1516	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
1517	Dir = GID_DIR_PROGRAM;	1517	Dir = GID_DIR_PROGRAM;
1518	#ifdef UNX	1518	#ifdef UNX
1519	Name = "libcfgmgr2.so";	1519	Name = STRING(CONCAT2(libcfgmgr2,UNXSUFFIX));
1520	#else	1520	#else
1521	Name = "cfgmgr2.dll";	1521	Name = "cfgmgr2.dll";
1522	#endif	1522	#endif