View | Details | Raw Unified | Return to bug 69265 | Differences between
and this patch

Collapse All | Expand All

(-)plugin.properties (-2 / +9 lines)
Lines 29-35 Link Here
29
TargetName.cygw.exe=Executable (Gnu on Windows)
29
TargetName.cygw.exe=Executable (Gnu on Windows)
30
TargetName.cygw.so=Shared Library (Gnu on Windows)
30
TargetName.cygw.so=Shared Library (Gnu on Windows)
31
TargetName.cygw.lib=Static Library (Gnu on Windows)
31
TargetName.cygw.lib=Static Library (Gnu on Windows)
32
32
TargetName.macosx.exe=Executable (MacOS X)
33
TargetName.macosx.so=Shared Library (MacOS X)
34
TargetName.macosx.lib=Static Library (MacOS X)
33
35
34
# No longer needed post-2.0
36
# No longer needed post-2.0
35
TargetName.cygw=Cygwin
37
TargetName.cygw=Cygwin
Lines 64-69 Link Here
64
ToolName.archiver.gnu = GCC Archiver
66
ToolName.archiver.gnu = GCC Archiver
65
ToolName.assembler.gnu = GCC Assembler
67
ToolName.assembler.gnu = GCC Assembler
66
68
69
# Mach-O tool names
70
ToolName.linker.macosx.c = MacOS X C Linker
71
ToolName.linker.macosx.cpp = MacOS X C++ Linker
72
67
# Generic Category Names
73
# Generic Category Names
68
OptionCategory.Symbols = Symbols
74
OptionCategory.Symbols = Symbols
69
OptionCategory.Preproc = Preprocessor
75
OptionCategory.Preproc = Preprocessor
Lines 138-141 Link Here
138
Option.Windows.Windres.OutputFormat = Output format
144
Option.Windows.Windres.OutputFormat = Output format
139
Option.Windows.Windres.OutputFormat.Coff = coff (--output-format coff)
145
Option.Windows.Windres.OutputFormat.Coff = coff (--output-format coff)
140
Option.Windows.Windres.OutputFormat.RC = rc (--output-format rc)
146
Option.Windows.Windres.OutputFormat.RC = rc (--output-format rc)
141
Option.Windows.Windres.OutputFormat.Res = res (--output-format res)
147
Option.Windows.Windres.OutputFormat.Res = res (--output-format res)
148
Option.MacOSX.Linker.Shared=Shared (-Wl,-dylib)
(-)plugin.xml (-3 / +446 lines)
Lines 479-484 Link Here
479
               name="%Option.Gnu.Assembler.version"
479
               name="%Option.Gnu.Assembler.version"
480
               id="gnu.both.asm.option.version"/>
480
               id="gnu.both.asm.option.version"/>
481
      </tool>
481
      </tool>
482
      <tool
483
            natureFilter="cnature"
484
            sources="o"
485
            name="%ToolName.linker.macosx.c"
486
            outputFlag="-o"
487
            command="gcc"
488
            dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
489
            id="cdt.managedbuild.tool.macosx.c.linker">
490
         <optionCategory
491
               owner="cdt.managedbuild.tool.macosx.c.linker"
492
               name="%OptionCategory.General"
493
               id="macosx.c.link.category.general">
494
         </optionCategory>
495
         <option
496
               defaultValue="false"
497
               name="%Option.Posix.Linker.NoStartFiles"
498
               category="macosx.c.link.category.general"
499
               command="-nostartfiles"
500
               id="macosx.c.link.option.nostart"
501
               valueType="boolean">
502
         </option>
503
         <option
504
               defaultValue="false"
505
               name="%Option.Posix.Linker.NoDefLibs"
506
               category="macosx.c.link.category.general"
507
               command="-nodefaultlibs"
508
               id="macosx.c.link.option.nodeflibs"
509
               valueType="boolean">
510
         </option>
511
         <option
512
               defaultValue="false"
513
               name="%Option.Posix.Linker.NoStdLibs"
514
               category="macosx.c.link.category.general"
515
               command="-nostdlib"
516
               id="macosx.c.link.option.nostdlibs"
517
               valueType="boolean">
518
         </option>
519
         <option
520
               defaultValue="false"
521
               name="%Option.Posix.Linker.Strip"
522
               category="macosx.c.link.category.general"
523
               command="--strip-all"
524
               id="macosx.c.link.option.strip"
525
               valueType="boolean">
526
         </option>
527
         <option
528
               defaultValue="false"
529
               name="%Option.Posix.Linker.Static"
530
               category="macosx.c.link.category.general"
531
               command="-static"
532
               id="macosx.c.link.option.noshared"
533
               valueType="boolean">
534
         </option>
535
         <optionCategory
536
               owner="cdt.managedbuild.tool.macosx.c.linker"
537
               name="%OptionCategory.Libs"
538
               id="macosx.c.link.category.libs">
539
         </optionCategory>
540
         <option
541
               name="%Option.Posix.Libs"
542
               category="macosx.c.link.category.libs"
543
               command="-l"
544
               id="macosx.c.link.option.libs"
545
               browseType="file"
546
               valueType="libs">
547
         </option>
548
         <option
549
               name="%Option.Posix.Libsearch"
550
               category="macosx.c.link.category.libs"
551
               command="-L"
552
               id="macosx.c.link.option.paths"
553
               browseType="directory"
554
               valueType="stringList">
555
         </option>
556
         <optionCategory
557
               owner="cdt.managedbuild.tool.macosx.c.linker"
558
               name="%OptionCategory.Misc"
559
               id="macosx.c.link.category.other">
560
         </optionCategory>
561
         <option
562
               name="%Option.Posix.Linker.Flags"
563
               category="macosx.c.link.category.other"
564
               valueType="string"
565
               id="macosx.c.link.option.ldflags">
566
         </option>
567
         <option
568
               name="%Option.Posix.Linker.XLinker"
569
               category="macosx.c.link.category.other"
570
               command="-Xlinker,"
571
               valueType="stringList"
572
               id="macosx.c.link.option.other">
573
         </option>
574
         <option
575
               name="%Option.Posix.UserObjs"
576
               category="macosx.c.link.category.other"
577
               browseType="file"
578
               valueType="userObjs"
579
               id="macosx.c.link.option.userobjs">
580
         </option>
581
         <optionCategory
582
               owner="cdt.managedbuild.tool.macosx.c.linker"
583
               name="%OptionCategory.Shared.Settings"
584
               id="macosx.c.link.category.shared">
585
         </optionCategory>
586
         <option
587
               defaultValue="false"
588
               name="%Option.MacOSX.Linker.Shared"
589
               category="macosx.c.link.category.shared"
590
               command="-Wl,-dylib"
591
               id="macosx.c.link.option.shared"
592
               valueType="boolean">
593
         </option>
594
      </tool>
595
      <tool
596
            natureFilter="ccnature"
597
            sources="o"
598
            name="%ToolName.linker.macosx.cpp"
599
            outputFlag="-o"
600
            command="g++"
601
            dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
602
            id="cdt.managedbuild.tool.macosx.cpp.linker">
603
         <optionCategory
604
               owner="cdt.managedbuild.tool.macosx.cpp.linker"
605
               name="%OptionCategory.General"
606
               id="macosx.cpp.link.category.options">
607
         </optionCategory>
608
         <option
609
               defaultValue="false"
610
               name="%Option.Posix.Linker.NoStartFiles"
611
               category="macosx.cpp.link.category.options"
612
               command="-nostartfiles"
613
               id="macosx.cpp.link.option.nostart"
614
               valueType="boolean">
615
         </option>
616
         <option
617
               defaultValue="false"
618
               name="%Option.Posix.Linker.NoDefLibs"
619
               category="macosx.cpp.link.category.options"
620
               command="-nodefaultlibs"
621
               id="macosx.cpp.link.option.nodeflibs"
622
               valueType="boolean">
623
         </option>
624
         <option
625
               defaultValue="false"
626
               name="%Option.Posix.Linker.NoStdLibs"
627
               category="macosx.cpp.link.category.options"
628
               command="-nostdlib"
629
               id="macosx.cpp.link.option.nostdlibs"
630
               valueType="boolean">
631
         </option>
632
         <option
633
               defaultValue="false"
634
               name="%Option.Posix.Linker.Strip"
635
               category="macosx.cpp.link.category.options"
636
               command="--strip-all"
637
               id="macosx.cpp.link.option.strip"
638
               valueType="boolean">
639
         </option>
640
         <optionCategory
641
               owner="cdt.managedbuild.tool.macosx.cpp.linker"
642
               name="%OptionCategory.Libs"
643
               id="macosx.cpp.link.category.libs">
644
         </optionCategory>
645
         <option
646
               name="%Option.Posix.Libs"
647
               category="macosx.cpp.link.category.libs"
648
               command="-l"
649
               id="macosx.cpp.link.option.libs"
650
               browseType="file"
651
               valueType="libs">
652
         </option>
653
         <option
654
               name="%Option.Posix.Libsearch"
655
               category="macosx.cpp.link.category.libs"
656
               command="-L"
657
               id="macosx.cpp.link.option.paths"
658
               browseType="directory"
659
               valueType="stringList">
660
         </option>
661
         <optionCategory
662
               owner="cdt.managedbuild.tool.macosx.cpp.linker"
663
               name="%OptionCategory.Misc"
664
               id="macosx.cpp.link.category.other">
665
         </optionCategory>
666
         <option
667
               name="%Option.Posix.Linker.Flags"
668
               category="macosx.cpp.link.category.other"
669
               valueType="string"
670
               id="macosx.cpp.link.option.flags">
671
         </option>
672
         <option
673
               name="%Option.Posix.Linker.XLinker"
674
               category="macosx.cpp.link.category.other"
675
               command="-Xlinker "
676
               valueType="stringList"
677
               id="macosx.cpp.link.option.other">
678
         </option>
679
         <option
680
               name="%Option.Posix.UserObjs"
681
               category="macosx.cpp.link.category.other"
682
               browseType="file"
683
               valueType="userObjs"
684
               id="macosx.cpp.link.option.userobjs">
685
         </option>
686
         <optionCategory
687
               owner="cdt.managedbuild.tool.macosx.cpp.linker"
688
               name="%OptionCategory.Shared.Settings"
689
               id="macosx.cpp.link.category.shared">
690
         </optionCategory>
691
         <option
692
               defaultValue="false"
693
               name="%Option.MacOSX.Linker.Shared"
694
               category="macosx.cpp.link.category.shared"
695
               command="-Wl,-dylib"
696
               valueType="boolean"
697
               id="macosx.cpp.link.option.shared">
698
         </option>
699
      </tool>
482
      <target
700
      <target
483
            name="%TargetName.gnu"
701
            name="%TargetName.gnu"
484
            id="cdt.managedbuild.target.gnu"
702
            id="cdt.managedbuild.target.gnu"
Lines 959-965 Link Here
959
      </target>
1177
      </target>
960
      <target
1178
      <target
961
            isAbstract="false"
1179
            isAbstract="false"
962
            osList="solaris,linux,hpux,aix,macosx,qnx"
1180
            osList="solaris,linux,hpux,aix,qnx"
963
            scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
1181
            scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
964
            isTest="false"
1182
            isTest="false"
965
            makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
1183
            makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
Lines 1027-1033 Link Here
1027
      </target>
1245
      </target>
1028
      <target
1246
      <target
1029
            isTest="false"
1247
            isTest="false"
1030
            osList="solaris,linux,hpux,aix,macosx,qnx"
1248
            osList="solaris,linux,hpux,aix,qnx"
1031
            scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
1249
            scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
1032
            makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
1250
            makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
1033
            name="%TargetName.gnu.so"
1251
            name="%TargetName.gnu.so"
Lines 1106-1112 Link Here
1106
      </target>
1324
      </target>
1107
      <target
1325
      <target
1108
            isTest="false"
1326
            isTest="false"
1109
            osList="solaris,linux,hpux,aix,macosx,qnx"
1327
            osList="solaris,linux,hpux,aix,qnx"
1110
            scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
1328
            scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
1111
            makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
1329
            makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
1112
            name="%TargetName.gnu.lib"
1330
            name="%TargetName.gnu.lib"
Lines 1363-1368 Link Here
1363
         <configuration
1581
         <configuration
1364
               name="%ConfigName.Rel"
1582
               name="%ConfigName.Rel"
1365
               id="cdt.managedbuild.config.gnu.cygwin.lib.release">
1583
               id="cdt.managedbuild.config.gnu.cygwin.lib.release">
1584
            <toolReference
1585
                  id="cdt.managedbuild.tool.gnu.c.compiler">
1586
               <optionReference
1587
                     defaultValue="gnu.c.optimization.level.most"
1588
                     id="gnu.c.compiler.option.optimization.level">
1589
               </optionReference>
1590
               <optionReference
1591
                     defaultValue="gnu.c.debugging.level.none"
1592
                     id="gnu.c.compiler.option.debugging.level">
1593
               </optionReference>
1594
            </toolReference>
1595
            <toolReference
1596
                  id="cdt.managedbuild.tool.gnu.cpp.compiler">
1597
               <optionReference
1598
                     defaultValue="gnu.cpp.compiler.optimization.level.most"
1599
                     id="gnu.cpp.compiler.option.optimization.level">
1600
               </optionReference>
1601
               <optionReference
1602
                     defaultValue="gnu.cpp.compiler.debugging.level.none"
1603
                     id="gnu.cpp.compiler.option.debugging.level">
1604
               </optionReference>
1605
            </toolReference>
1606
         </configuration>
1607
         <toolReference
1608
               outputPrefix="lib"
1609
               outputs="a"
1610
               id="cdt.managedbuild.tool.gnu.archiver">
1611
         </toolReference>
1612
      </target>
1613
      <target
1614
            name="%TargetName.macosx.exe"
1615
            id="cdt.managedbuild.target.macosx.exe"
1616
            isTest="false"
1617
            scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
1618
            makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
1619
            isAbstract="false"
1620
            binaryParser="org.eclipse.cdt.core.MachO"
1621
            parent="cdt.managedbuild.target.gnu"
1622
            osList="macosx">
1623
         <configuration
1624
               name="%ConfigName.Dbg"
1625
               id="cdt.managedbuild.config.gnu.macosx.exe.debug">
1626
            <toolReference
1627
                  id="cdt.managedbuild.tool.gnu.c.compiler">
1628
               <optionReference
1629
                     defaultValue="gnu.c.optimization.level.none"
1630
                     id="gnu.c.compiler.option.optimization.level">
1631
               </optionReference>
1632
               <optionReference
1633
                     defaultValue="gnu.c.debugging.level.max"
1634
                     id="gnu.c.compiler.option.debugging.level">
1635
               </optionReference>
1636
            </toolReference>
1637
            <toolReference
1638
                  id="cdt.managedbuild.tool.gnu.cpp.compiler">
1639
               <optionReference
1640
                     defaultValue="gnu.cpp.compiler.optimization.level.none"
1641
                     id="gnu.cpp.compiler.option.optimization.level">
1642
               </optionReference>
1643
               <optionReference
1644
                     defaultValue="gnu.cpp.compiler.debugging.level.max"
1645
                     id="gnu.cpp.compiler.option.debugging.level">
1646
               </optionReference>
1647
            </toolReference>
1648
         </configuration>
1649
         <configuration
1650
               name="%ConfigName.Rel"
1651
               id="cdt.managedbuild.config.macosx.exe.release">
1652
            <toolReference
1653
                  id="cdt.managedbuild.tool.gnu.c.compiler">
1654
               <optionReference
1655
                     defaultValue="gnu.c.optimization.level.most"
1656
                     id="gnu.c.compiler.option.optimization.level">
1657
               </optionReference>
1658
               <optionReference
1659
                     defaultValue="gnu.c.debugging.level.none"
1660
                     id="gnu.c.compiler.option.debugging.level">
1661
               </optionReference>
1662
            </toolReference>
1663
            <toolReference
1664
                  id="cdt.managedbuild.tool.gnu.cpp.compiler">
1665
               <optionReference
1666
                     defaultValue="gnu.cpp.compiler.optimization.level.most"
1667
                     id="gnu.cpp.compiler.option.optimization.level">
1668
               </optionReference>
1669
               <optionReference
1670
                     defaultValue="gnu.cpp.compiler.debugging.level.none"
1671
                     id="gnu.cpp.compiler.option.debugging.level">
1672
               </optionReference>
1673
            </toolReference>
1674
         </configuration>
1675
         <toolReference
1676
               outputs="exe"
1677
               id="cdt.managedbuild.tool.macosx.c.linker">
1678
         </toolReference>
1679
         <toolReference
1680
               outputs="exe"
1681
               id="cdt.managedbuild.tool.macosx.cpp.linker">
1682
         </toolReference>
1683
       </target>
1684
      <target
1685
            name="%TargetName.macosx.so"
1686
            id="cdt.managedbuild.target.macosx.so"
1687
            isTest="false"
1688
            defaultExtension="dylib"
1689
            scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
1690
            makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
1691
            isAbstract="false"
1692
            binaryParser="org.eclipse.cdt.core.MachO"
1693
            parent="cdt.managedbuild.target.gnu"
1694
            osList="macosx">
1695
         <configuration
1696
               name="%ConfigName.Dbg"
1697
               id="cdt.managedbuild.config.macosx.so.debug">
1698
            <toolReference
1699
                  id="cdt.managedbuild.tool.gnu.c.compiler">
1700
               <optionReference
1701
                     defaultValue="gnu.c.optimization.level.none"
1702
                     id="gnu.c.compiler.option.optimization.level">
1703
               </optionReference>
1704
               <optionReference
1705
                     defaultValue="gnu.c.debugging.level.max"
1706
                     id="gnu.c.compiler.option.debugging.level">
1707
               </optionReference>
1708
            </toolReference>
1709
            <toolReference
1710
                  id="cdt.managedbuild.tool.gnu.cpp.compiler">
1711
               <optionReference
1712
                     defaultValue="gnu.cpp.compiler.optimization.level.none"
1713
                     id="gnu.cpp.compiler.option.optimization.level">
1714
               </optionReference>
1715
               <optionReference
1716
                     defaultValue="gnu.cpp.compiler.debugging.level.max"
1717
                     id="gnu.cpp.compiler.option.debugging.level">
1718
               </optionReference>
1719
            </toolReference>
1720
         </configuration>
1721
         <configuration
1722
               name="%ConfigName.Rel"
1723
               id="cdt.managedbuild.config.macosx.so.release">
1724
            <toolReference
1725
                  id="cdt.managedbuild.tool.gnu.c.compiler">
1726
               <optionReference
1727
                     defaultValue="gnu.c.optimization.level.most"
1728
                     id="gnu.c.compiler.option.optimization.level">
1729
               </optionReference>
1730
               <optionReference
1731
                     defaultValue="gnu.c.debugging.level.none"
1732
                     id="gnu.c.compiler.option.debugging.level">
1733
               </optionReference>
1734
            </toolReference>
1735
            <toolReference
1736
                  id="cdt.managedbuild.tool.gnu.cpp.compiler">
1737
               <optionReference
1738
                     defaultValue="gnu.cpp.compiler.optimization.level.most"
1739
                     id="gnu.cpp.compiler.option.optimization.level">
1740
               </optionReference>
1741
               <optionReference
1742
                     defaultValue="gnu.cpp.compiler.debugging.level.none"
1743
                     id="gnu.cpp.compiler.option.debugging.level">
1744
               </optionReference>
1745
            </toolReference>
1746
         </configuration>
1747
         <toolReference
1748
               outputs="dylib"
1749
               outputPrefix="lib"
1750
               id="cdt.managedbuild.tool.macosx.c.linker">
1751
            <optionReference
1752
                  defaultValue="true"
1753
                  id="macosx.c.link.option.shared"/>
1754
            <optionReference
1755
            		 defaultValue="true"
1756
            		 id="macosx.c.link.option.nostart"/>
1757
            <optionReference
1758
                  defaultValue="true"
1759
                  id="macosx.c.link.option.nodeflibs"/>
1760
         </toolReference>
1761
         <toolReference
1762
               outputs="dylib"
1763
               id="cdt.managedbuild.tool.macosx.cpp.linker">
1764
            <optionReference
1765
                  defaultValue="true"
1766
                  id="macosx.cpp.link.option.shared"/>
1767
         </toolReference>
1768
      </target>
1769
      <target
1770
            name="%TargetName.macosx.lib"
1771
            id="cdt.managedbuild.target.macosx.lib"
1772
            isTest="false"
1773
            makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
1774
            defaultExtension="a"
1775
            scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
1776
            isAbstract="false"
1777
            binaryParser="org.eclipse.cdt.core.MachO"
1778
            parent="cdt.managedbuild.target.gnu"
1779
            osList="macosx">
1780
         <configuration
1781
               name="%ConfigName.Dbg"
1782
               id="cdt.managedbuild.config.macosx.lib.debug">
1783
            <toolReference
1784
                  id="cdt.managedbuild.tool.gnu.c.compiler">
1785
               <optionReference
1786
                     defaultValue="gnu.c.optimization.level.none"
1787
                     id="gnu.c.compiler.option.optimization.level">
1788
               </optionReference>
1789
               <optionReference
1790
                     defaultValue="gnu.c.debugging.level.max"
1791
                     id="gnu.c.compiler.option.debugging.level">
1792
               </optionReference>
1793
            </toolReference>
1794
            <toolReference
1795
                  id="cdt.managedbuild.tool.gnu.cpp.compiler">
1796
               <optionReference
1797
                     defaultValue="gnu.cpp.compiler.optimization.level.none"
1798
                     id="gnu.cpp.compiler.option.optimization.level">
1799
               </optionReference>
1800
               <optionReference
1801
                     defaultValue="gnu.cpp.compiler.debugging.level.max"
1802
                     id="gnu.cpp.compiler.option.debugging.level">
1803
               </optionReference>
1804
            </toolReference>
1805
         </configuration>
1806
         <configuration
1807
               name="%ConfigName.Rel"
1808
               id="cdt.managedbuild.config.macosxlib.release">
1366
            <toolReference
1809
            <toolReference
1367
                  id="cdt.managedbuild.tool.gnu.c.compiler">
1810
                  id="cdt.managedbuild.tool.gnu.c.compiler">
1368
               <optionReference
1811
               <optionReference

Return to bug 69265