Attachment #7668 for issue #16853

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

Lines 82-93 Link Here

(-)aqua/source/loader/makefile.mk (-1 / +4 lines)
82		82
83	.ELSE # "$(OS)"!="MACOSX"	83	.ELSE # "$(OS)"!="MACOSX"
84		84
		85	.IF "$(GUIBASE)"=="aqua"
		86
85	OBJFILES = $(OBJ)$/loader.obj	87	OBJFILES = $(OBJ)$/loader.obj
86		88
87	APP1TARGET= $(TARGET)	89	APP1TARGET= $(TARGET)
88	APP1OBJS= $(OBJFILES)	90	APP1OBJS= $(OBJFILES)
89	APP1STDLIBS= $(SVUNZIPLIB) -framework Cocoa	91	APP1STDLIBS= -framework Cocoa $(SVUNZIPLIB)
90		92
		93	.ENDIF
91	.ENDIF # "$(OS)"!="MACOSX"	94	.ENDIF # "$(OS)"!="MACOSX"
92		95
93	# --- Targets ------------------------------------------------------	96	# --- Targets ------------------------------------------------------




	return aExecByteString;
}


DateTime UnixOS::GetDateTime
(
	ByteString const& rFilename
)
{
	DateTime aReturn;
        struct stat aStat;
        tm* pTime;

        stat( rFilename.GetBuffer(), &aStat );
        pTime = gmtime( &aStat.st_mtime );

	if( pTime )
	{
		aReturn.SetYear( pTime->tm_year + 1900 );	
		aReturn.SetMonth( pTime->tm_mon + 1);	
		aReturn.SetDay( pTime->tm_mday  );	
		aReturn.SetHour( pTime->tm_hour + 1 );	
		aReturn.SetMin( pTime->tm_min );	
		aReturn.SetSec( pTime->tm_sec );	
	}
	return aReturn;
}

void UnixOS::ExportFontPath( const ByteString& rPath )
{
    static BOOL bSetFontPath = TRUE;
    if  ( bSetFontPath )
    {
        ByteString aOldEnv, aNewEnv;
        char *pEnv = getenv( "SAL_FONTPATH_PRIVATE" );
        if ( pEnv )
            aOldEnv = ByteString( pEnv );

        SiDirEntry aPath( rPath );
        aPath.ToAbs();

        aNewEnv = aPath.GetFull();
        
        if ( aNewEnv.Len() && aOldEnv.Search( aNewEnv ) == STRING_NOTFOUND )
        {
            ByteString aEnvStr( "SAL_FONTPATH_PRIVATE=" );
            if ( aOldEnv.Len() )
            {
                aEnvStr += aOldEnv;
                aEnvStr += ';';
            }
            aEnvStr += aNewEnv;
            putenv( strdup( aEnvStr.GetBuffer() ) );
        }
        bSetFontPath = FALSE;
    }
}

Lines 79-85 Link Here

(-)aqua/source/system/makefile.mk (-2 / +5 lines)
79	dummy:	79	dummy:
80	@echo "Nothing to build for this platform"	80	@echo "Nothing to build for this platform"
81		81
82	.ELSE # "$(OS)"!="MACOSX"	82	.ELSE
		83
		84	.IF "$(GUIBASE)"=="aqua"
83		85
84	CXXFILES = aquaos.cxx	86	CXXFILES = aquaos.cxx
85		87
Lines 88-94 Link Here
88	LIB1TARGET= $(SLB)$/$(TARGET).lib	90	LIB1TARGET= $(SLB)$/$(TARGET).lib
89	LIB1OBJFILES= $(SLOFILES)	91	LIB1OBJFILES= $(SLOFILES)
90		92
91	.ENDIF # "$(OS)"!="MACOSX"	93	.ENDIF
		94	.ENDIF
92		95
93	# --- Targets ------------------------------------------------------	96	# --- Targets ------------------------------------------------------
94		97

Lines 72-77 Link Here

(-)inc/hashtbl.hxx (+4 lines)
72	#include <tools/debug.hxx>	72	#include <tools/debug.hxx>
73	#endif	73	#endif
74		74
		75	#ifdef MACOSX
		76	#define HashTable su2HashTable
		77	#endif
		78
75	// ADT hash table	79	// ADT hash table
76	//	80	//
77	// Invariante:	81	// Invariante:

Lines 77-83 Link Here

(-)mow/source/loader/loader.c (-13 / +105 lines)
77	#ifdef LINUX	77	#ifdef LINUX
78	# include <sys/vfs.h>	78	# include <sys/vfs.h>
79	# define statvfs statfs	79	# define statvfs statfs
80	#elif defined(NETBSD) \|\| defined(FREEBSD)	80	#elif defined(NETBSD) \|\| defined(FREEBSD) \|\| defined(MACOSX)
81	# include <sys/param.h>	81	# include <sys/param.h>
82	# include <sys/mount.h>	82	# include <sys/mount.h>
83	# define statvfs statfs	83	# define statvfs statfs
Lines 91-96 Link Here
91	#endif	91	#endif
92	#endif	92	#endif
93		93
		94	#ifdef MACOSX
		95	#include <unistd.h>
		96	#define iswspace(c) ((c)==' ' \|\| (c)=='\t' \|\| (c)=='\n')
		97	#define MAX_FILES_IN_DIR 1024
		98	#endif
		99
94	#include "bitmap"	100	#include "bitmap"
95	#include "logo.xpm"	101	#include "logo.xpm"
96		102
Lines 121-127 Link Here
121		127
122	#include <rtl/ustring.h>	128	#include <rtl/ustring.h>
123		129
124	#include <stdio.h>	130	#include <errno.h>
125		131
126	#ifdef UNX	132	#ifdef UNX
127	#define stricmp strcasecmp	133	#define stricmp strcasecmp
Lines 580-586 Link Here
580	#define MAX_LINEBUF 1024	586	#define MAX_LINEBUF 1024
581		587
582	#define KBYTE 1024	588	#define KBYTE 1024
583	#define LD_LIBRARY_PATH "LD_LIBRARY_PATH"	589	/* define LD_LIBRARY_PATH "LD_LIBRARY_PATH" */
584		590
585	#define SETUP_EVENT_TIME_TO_START 1L	591	#define SETUP_EVENT_TIME_TO_START 1L
586	#define SETUP_EVENT_INSTALL_SETUP 2L	592	#define SETUP_EVENT_INSTALL_SETUP 2L
Lines 589-594 Link Here
589	#define SETUP_EVENT_EXIT_LOADER 5L	595	#define SETUP_EVENT_EXIT_LOADER 5L
590	#define SETUP_EVENT_EXPOSE 6L	596	#define SETUP_EVENT_EXPOSE 6L
591		597
		598	#ifdef MACOSX
		599	#define SAL_FILE_PATTERN "libsal.dylib*"
		600	#define STL_FILE_PATTERN "libstlport_gcc.dylib.4.5"
		601	#else
592	#define SAL_FILE_PATTERN "libsal.so*"	602	#define SAL_FILE_PATTERN "libsal.so*"
593	#ifdef LINUX	603	#ifdef LINUX
594	#define GCC_FILE_PATTERN "libgcc_s.so.1"	604	#define GCC_FILE_PATTERN "libgcc_s.so.1"
Lines 599-604 Link Here
599	#else	609	#else
600	#define STL_FILE_PATTERN "libstlport_sunpro.so"	610	#define STL_FILE_PATTERN "libstlport_sunpro.so"
601	#endif	611	#endif
		612	#endif
602		613
603	Display* gpDisplay;	614	Display* gpDisplay;
604	Window gaWin;	615	Window gaWin;
Lines 677-682 Link Here
677	" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \	688	" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
678	" export LD_LIBRARY_PATH\n" \	689	" export LD_LIBRARY_PATH\n" \
679	" ;;\n" \	690	" ;;\n" \
		691	" Darwin)\n" \
		692	" DYLD_LIBRARY_PATH=.:./lib:${DYLD_LIBRARY_PATH}\n" \
		693	" export DYLD_LIBRARY_PATH\n" \
		694	" ;;\n" \
680	" FreeBSD)\n" \	695	" FreeBSD)\n" \
681	" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \	696	" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
682	" export LD_LIBRARY_PATH\n" \	697	" export LD_LIBRARY_PATH\n" \
Lines 774-781 Link Here
774	}	789	}
775	}	790	}
776	fclose( pOut );	791	fclose( pOut );
777		792	#ifdef MACOSX
778	pLDPath = getenv( LD_LIBRARY_PATH );	793	pLDPath = getenv( "DYLD_LIBRARY_PATH" );
		794	#else
		795	pLDPath = getenv( "LD_LIBRARY_PATH" );
		796	#endif
779	if( pLDPath )	797	if( pLDPath )
780	{	798	{
781	char* pToken = strtok( pLDPath, ":" );	799	char* pToken = strtok( pLDPath, ":" );
Lines 1095-1100 Link Here
1095	char pFile[__MAX_PATH];	1113	char pFile[__MAX_PATH];
1096	char * ptr;	1114	char * ptr;
1097	int i = 0;	1115	int i = 0;
		1116	int rv = 0;
1098	char tmp[2];	1117	char tmp[2];
1099	char dest[__MAX_PATH];	1118	char dest[__MAX_PATH];
1100	char src[__MAX_PATH];	1119	char src[__MAX_PATH];
Lines 1279-1292 Link Here
1279	SVUnzip( pEntry->pName, "", (const char)"qq", NULL );	1298	SVUnzip( pEntry->pName, "", (const char)"qq", NULL );
1280		1299
1281	unlink( pEntry->pName );	1300	unlink( pEntry->pName );
1282	}	1301	}
1283	else	1302	else
1284	{	1303	{
1285	ArchDirectory_GetFile( pBigDir, pEntry->pName, strTmpPath );	1304	ArchDirectory_GetFile( pBigDir, pEntry->pName, strTmpPath );
1286	SVUnzipEnumFiles( pEntry->pName, "", (UnzipEnumFilesCallBack) __EnumFilesCallBack, NULL );	1305	SVUnzipEnumFiles( pEntry->pName, "", (UnzipEnumFilesCallBack) __EnumFilesCallBack, NULL );
1287		1306
1288	if ( !bIsSalLib && !bUnpackLib )	1307	if ( !bIsSalLib && !bUnpackLib )
1289	SVUnzip( pEntry->pName, "", (const char)"qq", (UnzipCallBack*) __UnzipCallback );	1308	SVUnzip( pEntry->pName, "", (const char)"qq", (UnzipCallBack*) __UnzipCallback );
1290		1309
1291	unlink( pEntry->pName );	1310	unlink( pEntry->pName );
1292	}	1311	}
Lines 1322-1337 Link Here
1322	SVUnzipEnumFiles( file, "", (UnzipEnumFilesCallBack) __EnumFilesCallBack, NULL );	1341	SVUnzipEnumFiles( file, "", (UnzipEnumFilesCallBack) __EnumFilesCallBack, NULL );
1323		1342
1324	if ( !bIsSalLib && !bUnpackLib )	1343	if ( !bIsSalLib && !bUnpackLib )
1325	SVUnzip( file, "", (const char)"qq", (UnzipCallBack*) __UnzipCallback );	1344	SVUnzip( file, "", (const char)"qq", (UnzipCallBack*) __UnzipCallback );
1326	}	1345	}
		1346	}
1327	}	1347	}
1328	}
1329	closedir( pDir );	1348	closedir( pDir );
1330	}	1349	}
1331		1350
		1351
1332	void InstallSetupFile( ArchDirectory* pBigDir )	1352	void InstallSetupFile( ArchDirectory* pBigDir )
1333	{	1353	{
1334	int nErr = 0;	1354	int nErr = 0;
		1355	int dfd = 0;
1335	char strSetupOrgZIP[__MAX_PATH];	1356	char strSetupOrgZIP[__MAX_PATH];
1336	char strSetupZIP[__MAX_PATH];	1357	char strSetupZIP[__MAX_PATH];
1337	char strSetupINI[__MAX_PATH];	1358	char strSetupINI[__MAX_PATH];
Lines 1382-1387 Link Here
1382	}	1403	}
1383	gbSize = FALSE;	1404	gbSize = FALSE;
1384		1405
		1406	#ifdef MACOSX
		1407
		1408	/* MacOSX readdir will incorrrectly return NULL if enough */
		1409	/* symlinks are added to to the directory readdir is accessing */
		1410	/* So this builds a list of all files first */
		1411	/* and then creates the symlinks to avoid any problems */
		1412	{
		1413	char * fnamelist[MAX_FILES_IN_DIR];
		1414	int nfiles = 0;
		1415	int j;
		1416	pDir = opendir( strTmpPath );
		1417	while( (pDirFile = readdir(pDir)) != NULL )
		1418	if( strcmp(pDirFile->d_name, ".") != 0 &&
		1419	strcmp(pDirFile->d_name, "..") != 0 )
		1420	fnamelist[nfiles++] = strdup(pDirFile->d_name);
		1421	closedir(pDir);
		1422	for (j = 0; j < nfiles; j++) {
		1423	makeSymLink(fnamelist[j]);
		1424	free(fnamelist[j]);
		1425	fnamelist[j] = NULL;
		1426	}
		1427	nfiles = 0;
		1428	}
		1429
		1430	#else
		1431
1385	pDir = opendir( strTmpPath );	1432	pDir = opendir( strTmpPath );
1386	if( pDir )	1433	if( pDir )
1387	{	1434	{
Lines 1392-1397 Link Here
1392	closedir( pDir );	1439	closedir( pDir );
1393	}	1440	}
1394		1441
		1442	#endif
		1443
1395	gbSize = TRUE;	1444	gbSize = TRUE;
1396	if ( !HandlePatch( pBigDir, &bIsPatchMode, TRUE ) && bIsPatchMode )	1445	if ( !HandlePatch( pBigDir, &bIsPatchMode, TRUE ) && bIsPatchMode )
1397	exit( -1 );	1446	exit( -1 );
Lines 1400-1406 Link Here
1400	nMinTempSize /= KBYTE;	1449	nMinTempSize /= KBYTE;
1401		1450
1402	statvfs( strTmpPath, &buf);	1451	statvfs( strTmpPath, &buf);
1403	#if defined(LINUX) \|\| defined(NETBSD) \|\| defined(FREEBSD)	1452	#if defined(LINUX) \|\| defined(NETBSD) \|\| defined(FREEBSD) \|\| defined(MACOSX)
1404	nSize = buf.f_bsize;	1453	nSize = buf.f_bsize;
1405	#else	1454	#else
1406	nSize = (buf.f_frsize ? buf.f_frsize : buf.f_bsize);	1455	nSize = (buf.f_frsize ? buf.f_frsize : buf.f_bsize);
Lines 1424-1429 Link Here
1424	else	1473	else
1425	UnpackBIG2Temp( pBigDir, FALSE );	1474	UnpackBIG2Temp( pBigDir, FALSE );
1426		1475
		1476
1427	if ( !HandlePatch( pBigDir, &bIsPatchMode, FALSE ) )	1477	if ( !HandlePatch( pBigDir, &bIsPatchMode, FALSE ) )
1428	exit( -1 );	1478	exit( -1 );
1429		1479
Lines 1498-1513 Link Here
1498	STRNCAT( strSetupBIN, "/setup", sizeof(strSetupBIN) );	1548	STRNCAT( strSetupBIN, "/setup", sizeof(strSetupBIN) );
1499	chmod( strSetupBIN, S_IRWXU );	1549	chmod( strSetupBIN, S_IRWXU );
1500		1550
		1551	#ifdef MACOSX
		1552
		1553	/* MacOSX readdir will incorrrectly return NULL if enough */
		1554	/* symlinks are added to to the directory readdir is accessing */
		1555	/* So this builds a list of all files first */
		1556	/* and then creates the symlinks to avoid any problems */
		1557	{
		1558	char * fnamelist[MAX_FILES_IN_DIR];
		1559	int nfiles = 0;
		1560	int j;
		1561	pDir = opendir( strTmpPath );
		1562	while( (pDirFile = readdir(pDir)) != NULL )
		1563	if( strcmp(pDirFile->d_name, ".") != 0 &&
		1564	strcmp(pDirFile->d_name, "..") != 0 )
		1565	fnamelist[nfiles++] = strdup(pDirFile->d_name);
		1566	closedir(pDir);
		1567	for (j = 0; j < nfiles; j++) {
		1568	makeSymLink(fnamelist[j]);
		1569	free(fnamelist[j]);
		1570	fnamelist[j] = NULL;
		1571	}
		1572	nfiles = 0;
		1573	}
		1574
		1575	#else
		1576
1501	pDir = opendir( strTmpPath );	1577	pDir = opendir( strTmpPath );
1502	if( pDir )	1578	if( pDir )
1503	{	1579	{
1504	while( (pDirFile = readdir(pDir)) != NULL )	1580	while( (pDirFile = readdir(pDir)) != NULL )
1505	if( strcmp(pDirFile->d_name, ".") != 0 &&	1581	if( strcmp(pDirFile->d_name, ".") != 0 &&
1506	strcmp(pDirFile->d_name, "..") != 0 )	1582	strcmp(pDirFile->d_name, "..") != 0 )
1507	makeSymLink( pDirFile->d_name );	1583	makeSymLink( pDirFile->d_name );
1508	closedir( pDir );	1584	closedir( pDir );
1509	}	1585	}
1510		1586
		1587	#endif
		1588
1511	SendEvent( SETUP_EVENT_KILL_LOADER_WINDOW );	1589	SendEvent( SETUP_EVENT_KILL_LOADER_WINDOW );
1512	}	1590	}
1513		1591
Lines 1735-1757 Link Here
1735		1813
1736	// we need a LD_LIBRARY_PATH with a current directory in it so we can	1814	// we need a LD_LIBRARY_PATH with a current directory in it so we can
1737	// dynamicly load a library ( needed for patching! )	1815	// dynamicly load a library ( needed for patching! )
		1816	#ifdef MACOSX
		1817	pLibPath = getenv("DYLD_LIBRARY_PATH");
		1818	#else
1738	pLibPath = getenv("LD_LIBRARY_PATH");	1819	pLibPath = getenv("LD_LIBRARY_PATH");
		1820	#endif
1739	if ( ! pLibPath \|\| ( strcmp( pLibPath, "." ) != 0 ) &&	1821	if ( ! pLibPath \|\| ( strcmp( pLibPath, "." ) != 0 ) &&
1740	( strncmp( pLibPath, ".:", 2 ) != 0 ) )	1822	( strncmp( pLibPath, ".:", 2 ) != 0 ) )
1741	{	1823	{
1742	char * pNewPath;	1824	char * pNewPath;
1743	if ( pLibPath )	1825	if ( pLibPath )
1744	{	1826	{
		1827	#ifdef MACOSX
		1828	pNewPath = malloc( strlen( "DYLD_LIBRARY_PATH=" ) + strlen( pLibPath ) + 3 );
		1829	strcpy( pNewPath, "DYLD_LIBRARY_PATH=" ); // #100211# - checked
		1830	#else
1745	pNewPath = malloc( strlen( "LD_LIBRARY_PATH=" ) + strlen( pLibPath ) + 3 );	1831	pNewPath = malloc( strlen( "LD_LIBRARY_PATH=" ) + strlen( pLibPath ) + 3 );
1746	strcpy( pNewPath, "LD_LIBRARY_PATH=" ); // #100211# - checked	1832	strcpy( pNewPath, "LD_LIBRARY_PATH=" ); // #100211# - checked
		1833	#endif
1747	strcat( pNewPath, ".:" ); // #100211# - checked	1834	strcat( pNewPath, ".:" ); // #100211# - checked
1748	strcat( pNewPath, pLibPath ); // #100211# - checked	1835	strcat( pNewPath, pLibPath ); // #100211# - checked
1749	putenv( pNewPath );	1836	putenv( pNewPath );
1750	}	1837	}
1751	else	1838	else
1752	{	1839	{
		1840	#ifdef MACOSX
		1841	pNewPath = malloc( strlen( "DYLD_LIBRARY_PATH=" ) + 2 );
		1842	strcpy( pNewPath, "DYLD_LIBRARY_PATH=" ); // #100211# - checked
		1843	#else
1753	pNewPath = malloc( strlen( "LD_LIBRARY_PATH=" ) + 2 );	1844	pNewPath = malloc( strlen( "LD_LIBRARY_PATH=" ) + 2 );
1754	strcpy( pNewPath, "LD_LIBRARY_PATH=" ); // #100211# - checked	1845	strcpy( pNewPath, "LD_LIBRARY_PATH=" ); // #100211# - checked
		1846	#endif
1755	strcat( pNewPath, "." ); // #100211# - checked	1847	strcat( pNewPath, "." ); // #100211# - checked
1756	putenv( pNewPath );	1848	putenv( pNewPath );
1757	}	1849	}





# --- Files --------------------------------------------------------

.IF "$(GUIBASE)"=="aqua"

dummy:
	@echo "Nothing to build for MacOSX aqua"

.ELSE			# "$(GUIBASE)"=="aqua"

.IF "$(OS)$(COMID)"=="SOLARISC52"
LINK=cc

.IF "$(OS)"=="FREEBSD"
APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -lX11
.ELSE
APP1STDLIBS=$(LOADERLIB) -ldl $(SVUNZIPLIB)
.ENDIF

.ENDIF			# "$(OS)"=="MACOSX"

Lines 74-85 Link Here

(-)mow/source/system/makefile.mk (-2 / +2 lines)
74		74
75	# --- Files --------------------------------------------------------	75	# --- Files --------------------------------------------------------
76		76
77	.IF "$(OS)"=="MACOSX"	77	.IF "$(GUIBASE)"=="aqua"
78		78
79	dummy:	79	dummy:
80	@echo "Nothing to build for Mac OS X"	80	@echo "Nothing to build for Mac OS X"
81		81
82	.ELSE # "$(OS)"=="MACOSX"	82	.ELSE # "$(GUIBASE)"=="MACOSX"
83		83
84	CXXFILES = \	84	CXXFILES = \
85	mowos.cxx	85	mowos.cxx




#ifdef LINUX
#include <sys/vfs.h>
#define statvfs statfs
#elif (defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) )
#include <sys/param.h>
#include <sys/mount.h>
#define statvfs statfs

	}

//! warum? erstmal fuer alle Plattformen den selben CODE
#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
	const ULONG nSize = buf.f_bsize;
//#elif defined AIX || defined SCO
//	// immer 512 Byte Bloecke ???

			return 512;
	}

#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
	return buf.f_bsize;
#else
	return (buf.f_frsize ? buf.f_frsize : buf.f_bsize);

Lines 118-123 Link Here

(-)script/setup.sh (+7 lines)
118	LD_LIBRARY_PATH=${sd_archive_path}:.	118	LD_LIBRARY_PATH=${sd_archive_path}:.
119	export LD_LIBRARY_PATH	119	export LD_LIBRARY_PATH
120	;;	120	;;
		121	Darwin)
		122	DYLD_LIBRARY_PATH=${sd_archive_path}:.
		123	export DYLD_LIBRARY_PATH
		124	;;
121	IRIX*)	125	IRIX*)
122	LD_LIBRARYN32_PATH=${sd_archive_path}	126	LD_LIBRARYN32_PATH=${sd_archive_path}
123	export LD_LIBRARYN32_PATH	127	export LD_LIBRARYN32_PATH
Lines 133-138 Link Here
133	java_ld_library_path=`./javaldx`	137	java_ld_library_path=`./javaldx`
134	if [ "$java_ld_library_path" != "" ] ; then	138	if [ "$java_ld_library_path" != "" ] ; then
135	case $sd_platform in	139	case $sd_platform in
		140	Darwin)
		141	DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${java_ld_library_path}
		142	;;
136	IRIX*)	143	IRIX*)
137	LD_LIBRARYN32_PATH=${LD_LIBRARYN32_PATH}:${java_ld_library_path}	144	LD_LIBRARYN32_PATH=${LD_LIBRARYN32_PATH}:${java_ld_library_path}
138	;;	145	;;

Lines 52-62 Link Here

(-)source/custom/update/makefile.mk (-4 / +6 lines)
52	.ENDIF # wnt	52	.ENDIF # wnt
53	.ENDIF # sablot3rdlib	53	.ENDIF # sablot3rdlib
54		54
55	SHL1STDLIBS=$(SABLOT3RDLIB) \	55	SHL1STDLIBS= \
56	$(EXPATASCII3RDLIB) \
57	$(SETUPLIB) \
58	$(TOOLSLIB) \	56	$(TOOLSLIB) \
59	$(SALLIB)	57	$(SALLIB) \
		58	$(EXPATASCII3RDLIB) \
		59	$(SABLOT3RDLIB) \
		60	$(SETUPLIB)
		61	#
60		62
61	SHL1LIBS = $(SLB)$/$(TARGET).lib	63	SHL1LIBS = $(SLB)$/$(TARGET).lib
62		64

Lines 103-109 Link Here

(-)util/makefile.mk (-3 / +15 lines)
103	$(SLB)$/uibase.lib	103	$(SLB)$/uibase.lib
104		104
105	.IF "$(GUI)"=="UNX"	105	.IF "$(GUI)"=="UNX"
106	.IF "$(OS)"=="MACOSX"	106	.IF "$(GUIBASE)"=="aqua"
107	LIB1FILES += $(SLB)$/aquaos.lib	107	LIB1FILES += $(SLB)$/aquaos.lib
108	.ELSE	108	.ELSE
109	LIB1FILES += $(SLB)$/mowos.lib	109	LIB1FILES += $(SLB)$/mowos.lib
Lines 182-187 Link Here
182	.ENDIF # "$(OS)"=="MACOSX"	182	.ENDIF # "$(OS)"=="MACOSX"
183		183
184	APP2STDLIBS=\	184	APP2STDLIBS=\
		185	$(BASICLIB) \
185	$(SVTOOLLIB) \	186	$(SVTOOLLIB) \
186	$(VCLLIB) \	187	$(VCLLIB) \
187	$(TOOLSLIB) \	188	$(TOOLSLIB) \
Lines 190-197 Link Here
190	$(CPPUHELPERLIB) \	191	$(CPPUHELPERLIB) \
191	$(CPPULIB) \	192	$(CPPULIB) \
192	$(VOSLIB) \	193	$(VOSLIB) \
193	$(SALLIB) \	194	$(SVLLIB) \
194	$(UNOTOOLSLIB)	195	$(SALHELPERLIB) \
		196	$(UNOTOOLSLIB) \
		197	$(SALLIB)
		198
195		199
196	.IF "$(GUI)"=="WNT"	200	.IF "$(GUI)"=="WNT"
197	APP2STDLIBS += uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \	201	APP2STDLIBS += uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \
Lines 356-364 Link Here
356	.IF "$(GUI)"!="WNT"	360	.IF "$(GUI)"!="WNT"
357	DOLLAR_SIGN=\$$	361	DOLLAR_SIGN=\$$
358	MY_JAVA_COMPPATH=file://$(SOLARBINDIR)	362	MY_JAVA_COMPPATH=file://$(SOLARBINDIR)
		363	.IF "$(OS)"=="MACOSX"
		364	REGCOMP_ENV=\
		365	setenv CLASSPATH $(REGCOMP_CLASSPATH) && \
		366	setenv DYLD_LIBRARY_PATH $(DYLD_LIBRARY_PATH):$(JDKLIB)
		367	.ELSE
359	REGCOMP_ENV=\	368	REGCOMP_ENV=\
360	setenv CLASSPATH $(REGCOMP_CLASSPATH) && \	369	setenv CLASSPATH $(REGCOMP_CLASSPATH) && \
361	setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)	370	setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)
		371	.ENDIF
362	.ELSE # "$(GUI)" != "WNT"	372	.ELSE # "$(GUI)" != "WNT"
363	.IF "$(USE_SHELL)" != "4nt"	373	.IF "$(USE_SHELL)" != "4nt"
364	DOLLAR_SIGN=\$$	374	DOLLAR_SIGN=\$$
Lines 385-390 Link Here
385	# register the native libraries	395	# register the native libraries
386	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS))"	396	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS))"
387	.IF "$(SOLAR_JAVA)" != ""	397	.IF "$(SOLAR_JAVA)" != ""
		398	.IF "$(OS)"!="MACOSX"
388	.IF "$(JAVANUMVER)" >= "000100040000"	399	.IF "$(JAVANUMVER)" >= "000100040000"
389	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS_JAVA))"	400	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS_JAVA))"
390	# prepare a registry which regcomp can work on (types+java services)	401	# prepare a registry which regcomp can work on (types+java services)
Lines 399-404 Link Here
399	-env:UNO_JAVA_COMPPATH=$(MY_JAVA_COMPPATH) \	410	-env:UNO_JAVA_COMPPATH=$(MY_JAVA_COMPPATH) \
400	$(foreach,i,$(REGISTERJARS) -c vnd.sun.star.expand:$(DOLLAR_SIGN)UNO_JAVA_COMPPATH/$(i))	411	$(foreach,i,$(REGISTERJARS) -c vnd.sun.star.expand:$(DOLLAR_SIGN)UNO_JAVA_COMPPATH/$(i))
401	.ENDIF # "$(JAVANUMVER)" >= "000100040000"	412	.ENDIF # "$(JAVANUMVER)" >= "000100040000"
		413	.ENDIF # "$(OS)" != "MACOSX"
402	.ENDIF # "$(SOLAR_JAVA)" != ""	414	.ENDIF # "$(SOLAR_JAVA)" != ""
403	# to have a transaction, move it now to the final name	415	# to have a transaction, move it now to the final name
404	mv $(BIN)$/setup_services.tmp $@	416	mv $(BIN)$/setup_services.tmp $@

Return to issue 16853

Lines 544-546 Link Here

(-)aqua/source/system/aquaos.cxx (+54 lines)
544	return aExecByteString;	544	return aExecByteString;
545	}	545	}
546		546
		547
		548	DateTime UnixOS::GetDateTime
		549	(
		550	ByteString const& rFilename
		551	)
		552	{
		553	DateTime aReturn;
		554	struct stat aStat;
		555	tm* pTime;
		556
		557	stat( rFilename.GetBuffer(), &aStat );
		558	pTime = gmtime( &aStat.st_mtime );
		559
		560	if( pTime )
		561	{
		562	aReturn.SetYear( pTime->tm_year + 1900 );
		563	aReturn.SetMonth( pTime->tm_mon + 1);
		564	aReturn.SetDay( pTime->tm_mday );
		565	aReturn.SetHour( pTime->tm_hour + 1 );
		566	aReturn.SetMin( pTime->tm_min );
		567	aReturn.SetSec( pTime->tm_sec );
		568	}
		569	return aReturn;
		570	}
		571
		572	void UnixOS::ExportFontPath( const ByteString& rPath )
		573	{
		574	static BOOL bSetFontPath = TRUE;
		575	if ( bSetFontPath )
		576	{
		577	ByteString aOldEnv, aNewEnv;
		578	char *pEnv = getenv( "SAL_FONTPATH_PRIVATE" );
		579	if ( pEnv )
		580	aOldEnv = ByteString( pEnv );
		581
		582	SiDirEntry aPath( rPath );
		583	aPath.ToAbs();
		584
		585	aNewEnv = aPath.GetFull();
		586
		587	if ( aNewEnv.Len() && aOldEnv.Search( aNewEnv ) == STRING_NOTFOUND )
		588	{
		589	ByteString aEnvStr( "SAL_FONTPATH_PRIVATE=" );
		590	if ( aOldEnv.Len() )
		591	{
		592	aEnvStr += aOldEnv;
		593	aEnvStr += ';';
		594	}
		595	aEnvStr += aNewEnv;
		596	putenv( strdup( aEnvStr.GetBuffer() ) );
		597	}
		598	bSetFontPath = FALSE;
		599	}
		600	}

Lines 74-85 Link Here

(-)mow/source/loader/makefile.mk (-4 / +4 lines)
74		74
75	# --- Files --------------------------------------------------------	75	# --- Files --------------------------------------------------------
76		76
77	.IF "$(OS)"=="MACOSX"	77	.IF "$(GUIBASE)"=="aqua"
78		78
79	dummy:	79	dummy:
80	@echo "Nothing to build for Mac OS X"	80	@echo "Nothing to build for MacOSX aqua"
81		81
82	.ELSE # "$(OS)"=="MACOSX"	82	.ELSE # "$(GUIBASE)"=="aqua"
83		83
84	.IF "$(OS)$(COMID)"=="SOLARISC52"	84	.IF "$(OS)$(COMID)"=="SOLARISC52"
85	LINK=cc	85	LINK=cc
Lines 98-104 Link Here
98	.IF "$(OS)"=="FREEBSD"	98	.IF "$(OS)"=="FREEBSD"
99	APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -lX11	99	APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -lX11
100	.ELSE	100	.ELSE
101	APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -ldl	101	APP1STDLIBS=$(LOADERLIB) -ldl $(SVUNZIPLIB)
102	.ENDIF	102	.ENDIF
103		103
104	.ENDIF # "$(OS)"=="MACOSX"	104	.ENDIF # "$(OS)"=="MACOSX"

Lines 84-90 Link Here

(-)mow/source/system/mowos.cxx (-3 / +3 lines)
84	#ifdef LINUX	84	#ifdef LINUX
85	#include <sys/vfs.h>	85	#include <sys/vfs.h>
86	#define statvfs statfs	86	#define statvfs statfs
87	#elif (defined(NETBSD) \|\| defined(FREEBSD))	87	#elif (defined(NETBSD) \|\| defined(FREEBSD) \|\| defined(MACOSX) )
88	#include <sys/param.h>	88	#include <sys/param.h>
89	#include <sys/mount.h>	89	#include <sys/mount.h>
90	#define statvfs statfs	90	#define statvfs statfs
Lines 213-219 Link Here
213	}	213	}
214		214
215	//! warum? erstmal fuer alle Plattformen den selben CODE	215	//! warum? erstmal fuer alle Plattformen den selben CODE
216	#if defined(LINUX) \|\| defined(NETBSD) \|\| defined(FREEBSD)	216	#if defined(LINUX) \|\| defined(NETBSD) \|\| defined(FREEBSD) \|\| defined(MACOSX)
217	const ULONG nSize = buf.f_bsize;	217	const ULONG nSize = buf.f_bsize;
218	//#elif defined AIX \|\| defined SCO	218	//#elif defined AIX \|\| defined SCO
219	// // immer 512 Byte Bloecke ???	219	// // immer 512 Byte Bloecke ???
Lines 240-246 Link Here
240	return 512;	240	return 512;
241	}	241	}
242		242
243	#if defined(LINUX) \|\| defined(NETBSD) \|\| defined(FREEBSD)	243	#if defined(LINUX) \|\| defined(NETBSD) \|\| defined(FREEBSD) \|\| defined(MACOSX)
244	return buf.f_bsize;	244	return buf.f_bsize;
245	#else	245	#else
246	return (buf.f_frsize ? buf.f_frsize : buf.f_bsize);	246	return (buf.f_frsize ? buf.f_frsize : buf.f_bsize);