Attachment #2038 for issue #5900

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




File gid_File_Lib_Sal
    BIN_FILE_BODY;
    #ifdef UNX
		Name	= STRING(CONCAT7(libsal,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
    #else
		Name	= STRING(CONCAT3(sal,UDK_MAJOR,.dll));
    #endif

Shortcut gid_Shortcut_Lib_Sal
    FileID		= gid_File_Lib_Sal;
    Dir			= GCFG_BINARY_DIR;
    Name		= STRING(CONCAT3(libsal,UNXSUFFIX,UDK_MAJOR));
    Styles		= (NETWORK,RELATIVE);
End
#endif

File gid_File_Lib_Sto
    BIN_FILE_BODY;
    #ifdef UNX
		Name	= STRING(CONCAT7(libstore,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
    #else
		Name	= STRING(CONCAT3(store,UDK_MAJOR,.dll));
    #endif

Shortcut gid_Shortcut_Lib_Sto
    FileID      = gid_File_Lib_Sto;
    Dir         = GCFG_BINARY_DIR;
    Name        = STRING(CONCAT4(libstore,UNXSUFFIX,.,UDK_MAJOR));
    Styles      = (NETWORK,RELATIVE);
End
#endif

File gid_File_Lib_Reg
    BIN_FILE_BODY;
    #ifdef UNX
		Name	= STRING(CONCAT7(libreg,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
    #else
		Name	= STRING(CONCAT3(reg,UDK_MAJOR,.dll));
    #endif

Shortcut gid_Shortcut_Lib_Reg
    FileID      = gid_File_Lib_Reg;
    Dir         = GCFG_BINARY_DIR;
    Name        = STRING(CONCAT4(libreg,UNXSUFFIX,.,UDK_MAJOR));
    Styles      = (NETWORK,RELATIVE);
End
#endif

File gid_File_Lib_Cppu
    BIN_FILE_BODY;
    #ifdef UNX
		Name	= STRING(CONCAT7(libcppu,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
    #else
		Name	= STRING(CONCAT3(cppu,UDK_MAJOR,.dll));
    #endif

Shortcut gid_Shortcut_Lib_Cppu
    FileID      = gid_File_Lib_Cppu;
    Dir         = GCFG_BINARY_DIR;
    Name        = STRING(CONCAT4(libcppu,UNXSUFFIX,.,UDK_MAJOR));
    Styles      = (NETWORK,RELATIVE);
End
#endif

    Styles		= (PACKED, SETUPZIP);
    Dir			= GCFG_BINARY_DIR;
    #ifdef UNX
        Name	= STRING(CONCAT5(libsalhelper,UDK_MAJOR,COMID,.,UNXSUFFIX));
    #else		
        Name	= STRING(CONCAT5(salhelper,UDK_MAJOR,COMID,.,dll));
    #endif

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

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

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

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

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

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

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

	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
	Dir			= GCFG_BINARY_DIR;
	#ifdef UNX
	Name		= STRING(CONCAT2("libstm",UNXSUFFIX));
	#else
	Name		= "stm.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             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libcorefl,UNXSUFFIX));
        #else
        Name            = "corefl.dll";
        #endif

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

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

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

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

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

        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
        Dir             = GID_DIR_PROGRAM;
        #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(libstm,UNXSUFFIX));
        #else
        Name            = "stm.dll";
        #endif




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

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

        Styles          = (PACKED);
        Dir             = GID_DIR_PROGRAM;
        #ifdef UNX
        Name            = STRING(CONCAT2(libjava_uno,UNXSUFFIX));
        #else
        Name            = "java_uno.dll";
        #endif




        Styles          = (PACKED);
        Dir             = GCFG_BINARY_DIR;
	#ifdef UNX
        Name            = STRING(CONCAT8(librmcxt,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
    #else
        Name            = STRING(CONCAT3(rmcxt,UDK_MAJOR,.dll));
    #endif

Shortcut gid_Shortcut_Lib_Rmcxt
    FileID      = gid_File_Lib_Rmcxt;
    Dir         = GCFG_BINARY_DIR;
    Name        = STRING(CONCAT4(librmcxt,UNXSUFFIX,.,UDK_MAJOR));
    Styles      = (NETWORK,RELATIVE);
End
#endif

        Styles          = (PACKED,DONT_OVERWRITE);
        Dir             = GCFG_BINARY_DIR;
        #ifdef UNX
        Name            = STRING(CONCAT2(libiiop_uno,UNXSUFFIX));
        #else
        Name            = "iiop_uno.dll";
        #endif

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

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

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

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

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

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




# UNX ONLY
#####################
DLLOUT=$(SOLARLIBDIR)
.IF "$(OS)"=="MACOSX"
MY_DLLPOSTFIX=.dylib
MY_VERSION_DLLPOSTFIX=.dylib.$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO)
MY_VERSION_LINKPOSTFIX=.dylib.$(UDK_MAJOR)
MY_VERSION_LINKTARGETPOSTFIX=.$(UDK_MINOR).$(UDK_MICRO)
.ELSE
MY_DLLPOSTFIX=.so
MY_VERSION_DLLPOSTFIX=.so.$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO)
MY_VERSION_LINKPOSTFIX=.so.$(UDK_MAJOR)
MY_VERSION_LINKTARGETPOSTFIX=.$(UDK_MINOR).$(UDK_MICRO)
.ENDIF
MY_MAJOR=
MY_DLLPREFIX=lib
EXEPOSTFIX=

#.ENDIF

STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)

.IF "$(STLPORT4)" != ""
# in OOo build environment
.IF "$(STLPORT4)" != "NO_STLPORT4"
.IF "$(OS)"=="WNT"
STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
.ELSE   # "$(OS)"=="WNT"

$(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb
	$(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@

# [ed] 6/16/02 The OS X build is complaining about not finding libstlport_gcc.dylib within the
# solver output directory...I'm not sure what's going on, but let's just insert a rule to copy
# it there and hope nothing bad happens as a result.

.IF "$(OS)"=="MACOSX"
.IF "$(STLPORT4)"!=""
.IF "$(STLPORT4)"!="NO_STLPORT4"
$(SOLARVER)$/$(UPD)$/$(INPATH)$/lib$/$(STLPORTLIBNAME) : $(STLPORT4)$/lib/$(STLPORTLIBNAME)
    $(GNUCOPY) -p $(STLPORT4)$/lib/$(STLPORTLIBNAME) $(SOLARVER)$/$(UPD)$/$(INPATH)$/lib$/$(STLPORTLIBNAME)
.ENDIF
.ENDIF
.ENDIF

.IF "$(STLPORTDEST)" != ""
#OOo build environment
$(STLPORTDEST) : $(STLPORTOUT)

	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@

$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST)
	-$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@

$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST)
	+-rm -f $@ >& $(NULLDEV)

	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@

$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README
	-$(GNUCOPY) -p $(PRJ)$/examples$/README $@

$(DESTDIRIDL)$/% : $(IDLOUT)$/%
	+-rm -f $@

Return to issue 5900

Lines 48-54 Link Here

(-)inc/scp/udk_basefiles.scp (-18 / +18 lines)
48	File gid_File_Lib_Sal	48	File gid_File_Lib_Sal
49	BIN_FILE_BODY;	49	BIN_FILE_BODY;
50	#ifdef UNX	50	#ifdef UNX
51	Name = STRING(CONCAT6(libsal.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));	51	Name = STRING(CONCAT7(libsal,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
52	#else	52	#else
53	Name = STRING(CONCAT3(sal,UDK_MAJOR,.dll));	53	Name = STRING(CONCAT3(sal,UDK_MAJOR,.dll));
54	#endif	54	#endif
Lines 60-66 Link Here
60	Shortcut gid_Shortcut_Lib_Sal	60	Shortcut gid_Shortcut_Lib_Sal
61	FileID = gid_File_Lib_Sal;	61	FileID = gid_File_Lib_Sal;
62	Dir = GCFG_BINARY_DIR;	62	Dir = GCFG_BINARY_DIR;
63	Name = STRING(CONCAT2(libsal.so.,UDK_MAJOR));	63	Name = STRING(CONCAT3(libsal,UNXSUFFIX,UDK_MAJOR));
64	Styles = (NETWORK,RELATIVE);	64	Styles = (NETWORK,RELATIVE);
65	End	65	End
66	#endif	66	#endif
Lines 68-74 Link Here
68	File gid_File_Lib_Sto	68	File gid_File_Lib_Sto
69	BIN_FILE_BODY;	69	BIN_FILE_BODY;
70	#ifdef UNX	70	#ifdef UNX
71	Name = STRING(CONCAT6(libstore.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));	71	Name = STRING(CONCAT7(libstore,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
72	#else	72	#else
73	Name = STRING(CONCAT3(store,UDK_MAJOR,.dll));	73	Name = STRING(CONCAT3(store,UDK_MAJOR,.dll));
74	#endif	74	#endif
Lines 80-86 Link Here
80	Shortcut gid_Shortcut_Lib_Sto	80	Shortcut gid_Shortcut_Lib_Sto
81	FileID = gid_File_Lib_Sto;	81	FileID = gid_File_Lib_Sto;
82	Dir = GCFG_BINARY_DIR;	82	Dir = GCFG_BINARY_DIR;
83	Name = STRING(CONCAT2(libstore.so.,UDK_MAJOR));	83	Name = STRING(CONCAT4(libstore,UNXSUFFIX,.,UDK_MAJOR));
84	Styles = (NETWORK,RELATIVE);	84	Styles = (NETWORK,RELATIVE);
85	End	85	End
86	#endif	86	#endif
Lines 88-94 Link Here
88	File gid_File_Lib_Reg	88	File gid_File_Lib_Reg
89	BIN_FILE_BODY;	89	BIN_FILE_BODY;
90	#ifdef UNX	90	#ifdef UNX
91	Name = STRING(CONCAT6(libreg.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));	91	Name = STRING(CONCAT7(libreg,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
92	#else	92	#else
93	Name = STRING(CONCAT3(reg,UDK_MAJOR,.dll));	93	Name = STRING(CONCAT3(reg,UDK_MAJOR,.dll));
94	#endif	94	#endif
Lines 100-106 Link Here
100	Shortcut gid_Shortcut_Lib_Reg	100	Shortcut gid_Shortcut_Lib_Reg
101	FileID = gid_File_Lib_Reg;	101	FileID = gid_File_Lib_Reg;
102	Dir = GCFG_BINARY_DIR;	102	Dir = GCFG_BINARY_DIR;
103	Name = STRING(CONCAT2(libreg.so.,UDK_MAJOR));	103	Name = STRING(CONCAT4(libreg,UNXSUFFIX,.,UDK_MAJOR));
104	Styles = (NETWORK,RELATIVE);	104	Styles = (NETWORK,RELATIVE);
105	End	105	End
106	#endif	106	#endif
Lines 108-114 Link Here
108	File gid_File_Lib_Cppu	108	File gid_File_Lib_Cppu
109	BIN_FILE_BODY;	109	BIN_FILE_BODY;
110	#ifdef UNX	110	#ifdef UNX
111	Name = STRING(CONCAT6(libcppu.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));	111	Name = STRING(CONCAT7(libcppu,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
112	#else	112	#else
113	Name = STRING(CONCAT3(cppu,UDK_MAJOR,.dll));	113	Name = STRING(CONCAT3(cppu,UDK_MAJOR,.dll));
114	#endif	114	#endif
Lines 120-126 Link Here
120	Shortcut gid_Shortcut_Lib_Cppu	120	Shortcut gid_Shortcut_Lib_Cppu
121	FileID = gid_File_Lib_Cppu;	121	FileID = gid_File_Lib_Cppu;
122	Dir = GCFG_BINARY_DIR;	122	Dir = GCFG_BINARY_DIR;
123	Name = STRING(CONCAT2(libcppu.so.,UDK_MAJOR));	123	Name = STRING(CONCAT4(libcppu,UNXSUFFIX,.,UDK_MAJOR));
124	Styles = (NETWORK,RELATIVE);	124	Styles = (NETWORK,RELATIVE);
125	End	125	End
126	#endif	126	#endif
Lines 142-148 Link Here
142	Styles = (PACKED, SETUPZIP);	142	Styles = (PACKED, SETUPZIP);
143	Dir = GCFG_BINARY_DIR;	143	Dir = GCFG_BINARY_DIR;
144	#ifdef UNX	144	#ifdef UNX
145	Name = STRING(CONCAT3(libsalhelper,UDK_MAJOR,COMID.so));	145	Name = STRING(CONCAT5(libsalhelper,UDK_MAJOR,COMID,.,UNXSUFFIX));
146	#else	146	#else
147	Name = STRING(CONCAT5(salhelper,UDK_MAJOR,COMID,.,dll));	147	Name = STRING(CONCAT5(salhelper,UDK_MAJOR,COMID,.,dll));
148	#endif	148	#endif
Lines 154-160 Link Here
154	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	154	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
155	Dir = GCFG_BINARY_DIR;	155	Dir = GCFG_BINARY_DIR;
156	#ifdef UNX	156	#ifdef UNX
157	Name = "libcpld.so";	157	Name = STRING(CONCAT2("libcpld",UNXSUFFIX));
158	#else	158	#else
159	Name = "cpld.dll";	159	Name = "cpld.dll";
160	#endif	160	#endif
Lines 166-172 Link Here
166	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	166	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
167	Dir = GCFG_BINARY_DIR;	167	Dir = GCFG_BINARY_DIR;
168	#ifdef UNX	168	#ifdef UNX
169	Name = "libdefreg.so";	169	Name = STRING(CONCAT2("libdefreg",UNXSUFFIX));
170	#else	170	#else
171	Name = "defreg.dll";	171	Name = "defreg.dll";
172	#endif	172	#endif
Lines 178-184 Link Here
178	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	178	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
179	Dir = GCFG_BINARY_DIR;	179	Dir = GCFG_BINARY_DIR;
180	#ifdef UNX	180	#ifdef UNX
181	Name = "libimpreg.so";	181	Name = STRING(CONCAT2("libimpreg",UNXSUFFIX));
182	#else	182	#else
183	Name = "impreg.dll";	183	Name = "impreg.dll";
184	#endif	184	#endif
Lines 190-196 Link Here
190	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	190	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
191	Dir = GCFG_BINARY_DIR;	191	Dir = GCFG_BINARY_DIR;
192	#ifdef UNX	192	#ifdef UNX
193	Name = "librdbtdp.so";	193	Name = STRING(CONCAT2("librdbtdp",UNXSUFFIX));
194	#else	194	#else
195	Name = "rdbtdp.dll";	195	Name = "rdbtdp.dll";
196	#endif	196	#endif
Lines 202-208 Link Here
202	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	202	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
203	Dir = GCFG_BINARY_DIR;	203	Dir = GCFG_BINARY_DIR;
204	#ifdef UNX	204	#ifdef UNX
205	Name = "libsimreg.so";	205	Name = STRING(CONCAT2("libsimreg",UNXSUFFIX));
206	#else	206	#else
207	Name = "simreg.dll";	207	Name = "simreg.dll";
208	#endif	208	#endif
Lines 214-220 Link Here
214	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	214	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
215	Dir = GCFG_BINARY_DIR;	215	Dir = GCFG_BINARY_DIR;
216	#ifdef UNX	216	#ifdef UNX
217	Name = "libsmgr.so";	217	Name = STRING(CONCAT2("libsmgr",UNXSUFFIX));
218	#else	218	#else
219	Name = "smgr.dll";	219	Name = "smgr.dll";
220	#endif	220	#endif
Lines 226-232 Link Here
226	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	226	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
227	Dir = GCFG_BINARY_DIR;	227	Dir = GCFG_BINARY_DIR;
228	#ifdef UNX	228	#ifdef UNX
229	Name = "libtdmgr.so";	229	Name = STRING(CONCAT2("libtdmgr",UNXSUFFIX));
230	#else	230	#else
231	Name = "tdmgr.dll";	231	Name = "tdmgr.dll";
232	#endif	232	#endif
Lines 249-255 Link Here
249	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	249	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
250	Dir = GCFG_BINARY_DIR;	250	Dir = GCFG_BINARY_DIR;
251	#ifdef UNX	251	#ifdef UNX
252	Name = "libstm.so";	252	Name = STRING(CONCAT2("libstm",UNXSUFFIX));
253	#else	253	#else
254	Name = "stm.dll";	254	Name = "stm.dll";
255	#endif	255	#endif
Lines 261-267 Link Here
261	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	261	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
262	Dir = GCFG_BINARY_DIR;	262	Dir = GCFG_BINARY_DIR;
263	#ifdef UNX	263	#ifdef UNX
264	Name = "libtcv.so";	264	Name = STRING(CONCAT2("libtcv",UNXSUFFIX));
265	#else	265	#else
266	Name = "tcv.dll";	266	Name = "tcv.dll";
267	#endif	267	#endif

Lines 6-12 Link Here

(-)inc/scp/udk_completefiles.scp (-8 / +8 lines)
6	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	6	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
7	Dir = GID_DIR_PROGRAM;	7	Dir = GID_DIR_PROGRAM;
8	#ifdef UNX	8	#ifdef UNX
9	Name = "libcorefl.so";	9	Name = STRING(CONCAT2(libcorefl,UNXSUFFIX));
10	#else	10	#else
11	Name = "corefl.dll";	11	Name = "corefl.dll";
12	#endif	12	#endif
Lines 18-24 Link Here
18	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	18	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
19	Dir = GID_DIR_PROGRAM;	19	Dir = GID_DIR_PROGRAM;
20	#ifdef UNX	20	#ifdef UNX
21	Name = "libinsp.so";	21	Name = STRING(CONCAT2(libinsp,UNXSUFFIX));
22	#else	22	#else
23	Name = "insp.dll";	23	Name = "insp.dll";
24	#endif	24	#endif
Lines 30-36 Link Here
30	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	30	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
31	Dir = GID_DIR_PROGRAM;	31	Dir = GID_DIR_PROGRAM;
32	#ifdef UNX	32	#ifdef UNX
33	Name = "libinv.so";	33	Name = STRING(CONCAT2(libinv,UNXSUFFIX));
34	#else	34	#else
35	Name = "inv.dll";	35	Name = "inv.dll";
36	#endif	36	#endif
Lines 42-48 Link Here
42	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	42	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
43	Dir = GID_DIR_PROGRAM;	43	Dir = GID_DIR_PROGRAM;
44	#ifdef UNX	44	#ifdef UNX
45	Name = "libinvadp.so";	45	Name = STRING(CONCAT2(libinvadp,UNXSUFFIX));
46	#else	46	#else
47	Name = "invadp.dll";	47	Name = "invadp.dll";
48	#endif	48	#endif
Lines 54-60 Link Here
54	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	54	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
55	Dir = GCFG_BINARY_DIR;	55	Dir = GCFG_BINARY_DIR;
56	#ifdef UNX	56	#ifdef UNX
57	Name = "libnamingservice.so";	57	Name = STRING(CONCAT2(libnamingservice,UNXSUFFIX));
58	#else	58	#else
59	Name = "namingservice.dll";	59	Name = "namingservice.dll";
60	#endif	60	#endif
Lines 66-72 Link Here
66	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	66	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
67	Dir = GID_DIR_PROGRAM;	67	Dir = GID_DIR_PROGRAM;
68	#ifdef UNX	68	#ifdef UNX
69	Name = "libproxyfac.so";	69	Name = STRING(CONCAT2(libproxyfac,UNXSUFFIX));
70	#else	70	#else
71	Name = "proxyfac.dll";	71	Name = "proxyfac.dll";
72	#endif	72	#endif
Lines 78-84 Link Here
78	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	78	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
79	Dir = GID_DIR_PROGRAM;	79	Dir = GID_DIR_PROGRAM;
80	#ifdef UNX	80	#ifdef UNX
81	Name = "libtcv.so";	81	Name = STRING(CONCAT2(libtcv,UNXSUFFIX));
82	#else	82	#else
83	Name = "tcv.dll";	83	Name = "tcv.dll";
84	#endif	84	#endif
Lines 91-97 Link Here
91	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	91	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
92	Dir = GCFG_BINARY_DIR;	92	Dir = GCFG_BINARY_DIR;
93	#ifdef UNX	93	#ifdef UNX
94	Name = "libstm.so";	94	Name = STRING(CONCAT2(libstm,UNXSUFFIX));
95	#else	95	#else
96	Name = "stm.dll";	96	Name = "stm.dll";
97	#endif	97	#endif

Lines 5-11 Link Here

(-)inc/scp/udk_remotefiles.scp (-9 / +9 lines)
5	Styles = (PACKED);	5	Styles = (PACKED);
6	Dir = GCFG_BINARY_DIR;	6	Dir = GCFG_BINARY_DIR;
7	#ifdef UNX	7	#ifdef UNX
8	Name = STRING(CONCAT6(librmcxt.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));	8	Name = STRING(CONCAT8(librmcxt,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
9	#else	9	#else
10	Name = STRING(CONCAT3(rmcxt,UDK_MAJOR,.dll));	10	Name = STRING(CONCAT3(rmcxt,UDK_MAJOR,.dll));
11	#endif	11	#endif
Lines 15-21 Link Here
15	Shortcut gid_Shortcut_Lib_Rmcxt	15	Shortcut gid_Shortcut_Lib_Rmcxt
16	FileID = gid_File_Lib_Rmcxt;	16	FileID = gid_File_Lib_Rmcxt;
17	Dir = GCFG_BINARY_DIR;	17	Dir = GCFG_BINARY_DIR;
18	Name = STRING(CONCAT2(librmcxt.so.,UDK_MAJOR));	18	Name = STRING(CONCAT4(librmcxt,UNXSUFFIX,.,UDK_MAJOR));
19	Styles = (NETWORK,RELATIVE);	19	Styles = (NETWORK,RELATIVE);
20	End	20	End
21	#endif	21	#endif
Lines 25-31 Link Here
25	Styles = (PACKED,DONT_OVERWRITE);	25	Styles = (PACKED,DONT_OVERWRITE);
26	Dir = GCFG_BINARY_DIR;	26	Dir = GCFG_BINARY_DIR;
27	#ifdef UNX	27	#ifdef UNX
28	Name = "libiiop_uno.so";	28	Name = STRING(CONCAT2(libiiop_uno,UNXSUFFIX));
29	#else	29	#else
30	Name = "iiop_uno.dll";	30	Name = "iiop_uno.dll";
31	#endif	31	#endif
Lines 37-43 Link Here
37	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	37	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
38	Dir = GCFG_BINARY_DIR;	38	Dir = GCFG_BINARY_DIR;
39	#ifdef UNX	39	#ifdef UNX
40	Name = "libremotebridge.so";	40	Name = STRING(CONCAT2(libremotebridge,UNXSUFFIX));
41	#else	41	#else
42	Name = "remotebridge.dll";	42	Name = "remotebridge.dll";
43	#endif	43	#endif
Lines 49-55 Link Here
49	Styles = (PACKED);	49	Styles = (PACKED);
50	Dir = GCFG_BINARY_DIR;	50	Dir = GCFG_BINARY_DIR;
51	#ifdef UNX	51	#ifdef UNX
52	Name = "liburp_uno.so";	52	Name = STRING(CONCAT2(liburp_uno,UNXSUFFIX));
53	#else	53	#else
54	Name = "urp_uno.dll";	54	Name = "urp_uno.dll";
55	#endif	55	#endif
Lines 61-67 Link Here
61	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	61	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
62	Dir = GCFG_BINARY_DIR;	62	Dir = GCFG_BINARY_DIR;
63	#ifdef UNX	63	#ifdef UNX
64	Name = "libacceptor.so";	64	Name = STRING(CONCAT2(libacceptor,UNXSUFFIX));
65	#else	65	#else
66	Name = "acceptor.dll";	66	Name = "acceptor.dll";
67	#endif	67	#endif
Lines 73-79 Link Here
73	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	73	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
74	Dir = GCFG_BINARY_DIR;	74	Dir = GCFG_BINARY_DIR;
75	#ifdef UNX	75	#ifdef UNX
76	Name = "libbrdgfctr.so";	76	Name = STRING(CONCAT2(libbrdgfctr,UNXSUFFIX));
77	#else	77	#else
78	Name = "brdgfctr.dll";	78	Name = "brdgfctr.dll";
79	#endif	79	#endif
Lines 85-91 Link Here
85	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	85	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
86	Dir = GCFG_BINARY_DIR;	86	Dir = GCFG_BINARY_DIR;
87	#ifdef UNX	87	#ifdef UNX
88	Name = "libconnectr.so";	88	Name = STRING(CONCAT2(libconnectr,UNXSUFFIX));
89	#else	89	#else
90	Name = "connectr.dll";	90	Name = "connectr.dll";
91	#endif	91	#endif
Lines 97-103 Link Here
97	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	97	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
98	Dir = GCFG_BINARY_DIR;	98	Dir = GCFG_BINARY_DIR;
99	#ifdef UNX	99	#ifdef UNX
100	Name = "libuuresolver.so";	100	Name = STRING(CONCAT2(libuuresolver,UNXSUFFIX));
101	#else	101	#else
102	Name = "uuresolver.dll";	102	Name = "uuresolver.dll";
103	#endif	103	#endif

Lines 58-67 Link Here

(-)util/makefile.mk (-3 / +24 lines)
58	# UNX ONLY	58	# UNX ONLY
59	#####################	59	#####################
60	DLLOUT=$(SOLARLIBDIR)	60	DLLOUT=$(SOLARLIBDIR)
		61	.IF "$(OS)"=="MACOSX"
		62	MY_DLLPOSTFIX=.dylib
		63	MY_VERSION_DLLPOSTFIX=.dylib.$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO)
		64	MY_VERSION_LINKPOSTFIX=.dylib.$(UDK_MAJOR)
		65	MY_VERSION_LINKTARGETPOSTFIX=.$(UDK_MINOR).$(UDK_MICRO)
		66	.ELSE
61	MY_DLLPOSTFIX=.so	67	MY_DLLPOSTFIX=.so
62	MY_VERSION_DLLPOSTFIX=.so.$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO)	68	MY_VERSION_DLLPOSTFIX=.so.$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO)
63	MY_VERSION_LINKPOSTFIX=.so.$(UDK_MAJOR)	69	MY_VERSION_LINKPOSTFIX=.so.$(UDK_MAJOR)
64	MY_VERSION_LINKTARGETPOSTFIX=.$(UDK_MINOR).$(UDK_MICRO)	70	MY_VERSION_LINKTARGETPOSTFIX=.$(UDK_MINOR).$(UDK_MICRO)
		71	.ENDIF
65	MY_MAJOR=	72	MY_MAJOR=
66	MY_DLLPREFIX=lib	73	MY_DLLPREFIX=lib
67	EXEPOSTFIX=	74	EXEPOSTFIX=
Lines 204-212 Link Here
204	#.ENDIF	211	#.ENDIF
205		212
206	STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)	213	STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
		214
207	.IF "$(STLPORT4)" != ""	215	.IF "$(STLPORT4)" != ""
208	# in OOo build environment	216	# in OOo build environment
209	.IF "($STLPORT4)" != "NO_STLPORT4"	217	.IF "$(STLPORT4)" != "NO_STLPORT4"
210	.IF "$(OS)"=="WNT"	218	.IF "$(OS)"=="WNT"
211	STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)	219	STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
212	.ELSE # "$(OS)"=="WNT"	220	.ELSE # "$(OS)"=="WNT"
Lines 473-478 Link Here
473	$(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb	481	$(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb
474	$(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@	482	$(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@
475		483
		484	# [ed] 6/16/02 The OS X build is complaining about not finding libstlport_gcc.dylib within the
		485	# solver output directory...I'm not sure what's going on, but let's just insert a rule to copy
		486	# it there and hope nothing bad happens as a result.
		487
		488	.IF "$(OS)"=="MACOSX"
		489	.IF "$(STLPORT4)"!=""
		490	.IF "$(STLPORT4)"!="NO_STLPORT4"
		491	$(SOLARVER)$/$(UPD)$/$(INPATH)$/lib$/$(STLPORTLIBNAME) : $(STLPORT4)$/lib/$(STLPORTLIBNAME)
		492	$(GNUCOPY) -p $(STLPORT4)$/lib/$(STLPORTLIBNAME) $(SOLARVER)$/$(UPD)$/$(INPATH)$/lib$/$(STLPORTLIBNAME)
		493	.ENDIF
		494	.ENDIF
		495	.ENDIF
		496
476	.IF "$(STLPORTDEST)" != ""	497	.IF "$(STLPORTDEST)" != ""
477	#OOo build environment	498	#OOo build environment
478	$(STLPORTDEST) : $(STLPORTOUT)	499	$(STLPORTDEST) : $(STLPORTOUT)
Lines 538-544 Link Here
538	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@	559	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@
539		560
540	$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST)	561	$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST)
541	$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@	562	-$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@
542		563
543	$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST)	564	$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST)
544	+-rm -f $@ >& $(NULLDEV)	565	+-rm -f $@ >& $(NULLDEV)
Lines 550-556 Link Here
550	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@	571	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@
551		572
552	$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README	573	$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README
553	$(GNUCOPY) -p $(PRJ)$/examples$/README $@	574	-$(GNUCOPY) -p $(PRJ)$/examples$/README $@
554		575
555	$(DESTDIRIDL)$/% : $(IDLOUT)$/%	576	$(DESTDIRIDL)$/% : $(IDLOUT)$/%
556	+-rm -f $@	577	+-rm -f $@

Lines 6-12 Link Here

(-)inc/scp/udk_javafiles.scp (-3 / +3 lines)
6	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	6	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
7	Dir = GID_DIR_PROGRAM;	7	Dir = GID_DIR_PROGRAM;
8	#ifdef UNX	8	#ifdef UNX
9	Name = "libjavaloader.so";	9	Name = STRING(CONCAT2(libjavaloader,UNXSUFFIX));
10	#else	10	#else
11	Name = "javaloader.dll";	11	Name = "javaloader.dll";
12	#endif	12	#endif
Lines 18-24 Link Here
18	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;	18	RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
19	Dir = GID_DIR_PROGRAM;	19	Dir = GID_DIR_PROGRAM;
20	#ifdef UNX	20	#ifdef UNX
21	Name = "libjen.so";	21	Name = STRING(CONCAT2(libjen,UNXSUFFIX));
22	#else	22	#else
23	Name = "jen.dll";	23	Name = "jen.dll";
24	#endif	24	#endif
Lines 28-34 Link Here
28	Styles = (PACKED);	28	Styles = (PACKED);
29	Dir = GID_DIR_PROGRAM;	29	Dir = GID_DIR_PROGRAM;
30	#ifdef UNX	30	#ifdef UNX
31	Name = "libjava_uno.so";	31	Name = STRING(CONCAT2(libjava_uno,UNXSUFFIX));
32	#else	32	#else
33	Name = "java_uno.dll";	33	Name = "java_uno.dll";
34	#endif	34	#endif