Attachment #3694 for issue #7458

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

Lines 28-34 Link Here

(-)bootstrap.2 (-1 / +6 lines)
28		28
29	# setup ENVCDEFS, SOLARINC and SOLARLIB for bootstrap	29	# setup ENVCDEFS, SOLARINC and SOLARLIB for bootstrap
30		30
31	setenv ENVCDEFS -DBOOTSTRAPPER	31	if ($platform == "Darwin") then
		32	setenv ENVCDEFS "-DBOOTSTRAPPER $ENVCDEFS"
		33	else
		34	setenv ENVCDEFS -DBOOTSTRAPPER
		35	endif
		36
32	setenv SOLARINC "-I. -I$SRC_ROOT/sal/inc -I$SRC_ROOT/vos/inc ${SOLARINC}"	37	setenv SOLARINC "-I. -I$SRC_ROOT/sal/inc -I$SRC_ROOT/vos/inc ${SOLARINC}"
33	setenv SOLARLIB "-L$SRC_ROOT/external/$INPATH/lib -L$SRC_ROOT/sal/$INPATH/lib -L$SRC_ROOT/vos/$INPATH/lib ${SOLARLIB}"	38	setenv SOLARLIB "-L$SRC_ROOT/external/$INPATH/lib -L$SRC_ROOT/sal/$INPATH/lib -L$SRC_ROOT/vos/$INPATH/lib ${SOLARLIB}"
34		39




                        $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
# [ed] 6/15/02 Add in X11 headers as appropriate for the build
   if ($GUIBASE eq "unx") {
      $SOLARINC      .= $I.$XINC.
                        $I.$XINC.$ds."freetype2".'"';
   } else {
      $SOLARINC      .= '"';
   }

# There may be a better way to do this, like splitting unxmacxp into two, but
# hopefully this hack will work for now...

if ($platform eq "$Macosx")
{
    my $macosxCdefs="\"";
    
    if( ! -e "/usr/bin/osascript" ) {
        # no command line applescript.  Chances are we're on a Darwin system
        
        $macosxCdefs.=" -DBUILD_OS_DARWIN";
        open DARVER, "/usr/bin/uname -v |";
        my $s=<DARVER>;
        chomp $s;
        if ( $s =~ /(\d+?)\.(\d+?)(.*?)/)
        {
            $macosxCdefs.=" -DBUILD_OS_MAJOR=" . $1;
            $macosxCdefs.=" -DBUILD_OS_MINOR=" . $2;
            
            $s=$3;
            if ( $s =~ /(\d+?)/) {
                $macosxCdefs.=" -DBUILD_OS_REV=" . $1;
            } else {
                $macosxCdefs.=" -DBUILD_OS_REV=0";
            }
        }
        close DARVER;
    }
    else
    {
        $macosxCdefs.=" -DBUILD_OS_APPLEOSX";
        
        my $majorScript = <<EOF;
on Num32ToHex(num)
	if num < 0 then
		set num to (2 ^ 32) + num
	end if
	set out to ""
	repeat with idx from 7 to 0 by -1
		set bas to (16 ^ idx) as integer
		if num >= bas then
			set mult to ((num - (num mod bas)) / bas) as integer
			set out to out & character mult of "123456789ABCDEF"
			set num to (num - bas * mult)
		else
			set out to out & "0"
		end if
	end repeat
	return out
end Num32ToHex

tell application "Finder"
	system attribute "sysv"
end tell

Num32ToHex(result)
return (text 5 through 6 of result)
EOF
        open BLECH, ">/tmp/os$$";
        print BLECH $majorScript;
        close BLECH;
        
        open OSXMAJ, "/usr/bin/osascript </tmp/os$$|";
        
        my $tmp=<OSXMAJ>;
        chomp $tmp;
        $macosxCdefs.=" -DBUILD_OS_MAJOR=" . $tmp;
        close OSXMAJ;
        unlink "/tmp/os$$";
        
        my $minorScript = <<EOF;
on Num32ToHex(num)
	if num < 0 then
		set num to (2 ^ 32) + num
	end if
	set out to ""
	repeat with idx from 7 to 0 by -1
		set bas to (16 ^ idx) as integer
		if num >= bas then
			set mult to ((num - (num mod bas)) / bas) as integer
			set out to out & character mult of "123456789ABCDEF"
			set num to (num - bas * mult)
		else
			set out to out & "0"
		end if
	end repeat
	return out
end Num32ToHex

tell application "Finder"
	system attribute "sysv"
end tell

Num32ToHex(result)
return (text 7 through 7 of result)
EOF
        
        open BLECH, ">/tmp/os$$";
        print BLECH $minorScript;
        close BLECH;
        
        open OSXMIN, "/usr/bin/osascript </tmp/os$$|";
        $tmp=<OSXMIN>;
        chomp $tmp;
        $macosxCdefs.=" -DBUILD_OS_MINOR=" . $tmp;
        close OSXMIN;
        unlink "/tmp/os$$";
        
        my $revScript = <<EOF;
on Num32ToHex(num)
	if num < 0 then
		set num to (2 ^ 32) + num
	end if
	set out to ""
	repeat with idx from 7 to 0 by -1
		set bas to (16 ^ idx) as integer
		if num >= bas then
			set mult to ((num - (num mod bas)) / bas) as integer
			set out to out & character mult of "123456789ABCDEF"
			set num to (num - bas * mult)
		else
			set out to out & "0"
		end if
	end repeat
	return out
end Num32ToHex

tell application "Finder"
	system attribute "sysv"
end tell

Num32ToHex(result)
return (text 8 through 8 of result)
EOF
        open BLECH, ">/tmp/os$$";
        print BLECH $revScript;
        close BLECH;
                
        open OSXREV, "/usr/bin/osascript </tmp/os$$|";
        $tmp=<OSXREV>;
        chomp $tmp;
        $macosxCdefs.=" -DBUILD_OS_REV=" . $tmp;
        close OSXREV;
        unlink "/tmp/os$$";
    }
    
    if ( $GUIBASE eq "aqua" ) {
        $macosxCdefs.=" -DQUARTZ";
    }
    
    $macosxCdefs .= "\"";
    ToFile( "ENVCDEFS", $macosxCdefs, "e");
}

ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );

Return to issue 7458

Lines 1332-1338 Link Here

(-)set_soenv.1 (-3 / +151 lines)
1332	$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";	1332	$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
1333	# [ed] 6/15/02 Add in X11 headers as appropriate for the build	1333	# [ed] 6/15/02 Add in X11 headers as appropriate for the build
1334	if ($GUIBASE eq "unx") {	1334	if ($GUIBASE eq "unx") {
1335	$SOLARINC .= $I.$XINC.'"';	1335	$SOLARINC .= $I.$XINC.
		1336	$I.$XINC.$ds."freetype2".'"';
1336	} else {	1337	} else {
1337	$SOLARINC .= '"';	1338	$SOLARINC .= '"';
1338	}	1339	}
Lines 1452-1459 Link Here
1452	# There may be a better way to do this, like splitting unxmacxp into two, but	1453	# There may be a better way to do this, like splitting unxmacxp into two, but
1453	# hopefully this hack will work for now...	1454	# hopefully this hack will work for now...
1454		1455
1455	if ( $GUIBASE eq "aqua" ) {	1456	if ($platform eq "$Macosx")
1456	ToFile( "ENVCDEFS", "-DQUARTZ", "e" );	1457	{
		1458	my $macosxCdefs="\"";
		1459
		1460	if( ! -e "/usr/bin/osascript" ) {
		1461	# no command line applescript. Chances are we're on a Darwin system
		1462
		1463	$macosxCdefs.=" -DBUILD_OS_DARWIN";
		1464	open DARVER, "/usr/bin/uname -v \|";
		1465	my $s=<DARVER>;
		1466	chomp $s;
		1467	if ( $s =~ /(\d+?)\.(\d+?)(.*?)/)
		1468	{
		1469	$macosxCdefs.=" -DBUILD_OS_MAJOR=" . $1;
		1470	$macosxCdefs.=" -DBUILD_OS_MINOR=" . $2;
		1471
		1472	$s=$3;
		1473	if ( $s =~ /(\d+?)/) {
		1474	$macosxCdefs.=" -DBUILD_OS_REV=" . $1;
		1475	} else {
		1476	$macosxCdefs.=" -DBUILD_OS_REV=0";
		1477	}
		1478	}
		1479	close DARVER;
		1480	}
		1481	else
		1482	{
		1483	$macosxCdefs.=" -DBUILD_OS_APPLEOSX";
		1484
		1485	my $majorScript = <<EOF;
		1486	on Num32ToHex(num)
		1487	if num < 0 then
		1488	set num to (2 ^ 32) + num
		1489	end if
		1490	set out to ""
		1491	repeat with idx from 7 to 0 by -1
		1492	set bas to (16 ^ idx) as integer
		1493	if num >= bas then
		1494	set mult to ((num - (num mod bas)) / bas) as integer
		1495	set out to out & character mult of "123456789ABCDEF"
		1496	set num to (num - bas * mult)
		1497	else
		1498	set out to out & "0"
		1499	end if
		1500	end repeat
		1501	return out
		1502	end Num32ToHex
		1503
		1504	tell application "Finder"
		1505	system attribute "sysv"
		1506	end tell
		1507
		1508	Num32ToHex(result)
		1509	return (text 5 through 6 of result)
		1510	EOF
		1511	open BLECH, ">/tmp/os$$";
		1512	print BLECH $majorScript;
		1513	close BLECH;
		1514
		1515	open OSXMAJ, "/usr/bin/osascript </tmp/os$$\|";
		1516
		1517	my $tmp=<OSXMAJ>;
		1518	chomp $tmp;
		1519	$macosxCdefs.=" -DBUILD_OS_MAJOR=" . $tmp;
		1520	close OSXMAJ;
		1521	unlink "/tmp/os$$";
1522
1523	my $minorScript = <<EOF;
1524	on Num32ToHex(num)
1525	if num < 0 then
1526	set num to (2 ^ 32) + num
1527	end if
1528	set out to ""
1529	repeat with idx from 7 to 0 by -1
1530	set bas to (16 ^ idx) as integer
1531	if num >= bas then
1532	set mult to ((num - (num mod bas)) / bas) as integer
1533	set out to out & character mult of "123456789ABCDEF"
1534	set num to (num - bas * mult)
1535	else
1536	set out to out & "0"
1537	end if
1538	end repeat
1539	return out
1540	end Num32ToHex
1541
1542	tell application "Finder"
1543	system attribute "sysv"
1544	end tell
1545
1546	Num32ToHex(result)
1547	return (text 7 through 7 of result)
1548	EOF
1549
1550	open BLECH, ">/tmp/os$$";
1551	print BLECH $minorScript;
1552	close BLECH;
1553
1554	open OSXMIN, "/usr/bin/osascript </tmp/os$$\|";
1555	$tmp=<OSXMIN>;
1556	chomp $tmp;
1557	$macosxCdefs.=" -DBUILD_OS_MINOR=" . $tmp;
1558	close OSXMIN;
1559	unlink "/tmp/os$$";
1560
1561	my $revScript = <<EOF;
1562	on Num32ToHex(num)
1563	if num < 0 then
1564	set num to (2 ^ 32) + num
1565	end if
1566	set out to ""
1567	repeat with idx from 7 to 0 by -1
1568	set bas to (16 ^ idx) as integer
1569	if num >= bas then
1570	set mult to ((num - (num mod bas)) / bas) as integer
1571	set out to out & character mult of "123456789ABCDEF"
1572	set num to (num - bas * mult)
1573	else
1574	set out to out & "0"
1575	end if
1576	end repeat
1577	return out
1578	end Num32ToHex
1579
1580	tell application "Finder"
1581	system attribute "sysv"
1582	end tell
1583
1584	Num32ToHex(result)
1585	return (text 8 through 8 of result)
1586	EOF
1587	open BLECH, ">/tmp/os$$";
1588	print BLECH $revScript;
1589	close BLECH;
1590
1591	open OSXREV, "/usr/bin/osascript </tmp/os$$\|";
1592	$tmp=<OSXREV>;
1593	chomp $tmp;
1594	$macosxCdefs.=" -DBUILD_OS_REV=" . $tmp;
1595	close OSXREV;
1596	unlink "/tmp/os$$";
1597	}
1598
1599	if ( $GUIBASE eq "aqua" ) {
1600	$macosxCdefs.=" -DQUARTZ";
1601	}
1602
1603	$macosxCdefs .= "\"";
1604	ToFile( "ENVCDEFS", $macosxCdefs, "e");
1457	}	1605	}
1458		1606
1459	ToFile( "MKDEPENDSOLVER", "TRUE", "e" );	1607	ToFile( "MKDEPENDSOLVER", "TRUE", "e" );