diff --git a/.gitignore b/.gitignore index adf3063..cae3cea 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz /eclipse-cdt-fetched-src-CDT_8_0_1.tar.bz2 /eclipse-cdt-fetched-src-libhover-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz /eclipse-cdt-fetched-src-autotools-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz +/eclipse-cdt-fetched-src-libhover-c0b3d2d372997aa721ea7a58837600f6ce916973.tar.gz +/org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b.tar.gz diff --git a/eclipse-cdt-tycho-build.patch b/eclipse-cdt-tycho-build.patch new file mode 100644 index 0000000..8a86042 --- /dev/null +++ b/eclipse-cdt-tycho-build.patch @@ -0,0 +1,515 @@ +diff --git a/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF +index f3e334d..6cc3dd1 100644 +--- a/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF ++++ b/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF +@@ -29,5 +29,5 @@ Bundle-Vendor: %provider + Export-Package: org.eclipse.cdt.autotools.core, + org.eclipse.cdt.internal.autotools.core, + org.eclipse.cdt.internal.autotools.core.configure +-nt: J2SE-1.5 ++nt: JavaSE-1.6 + Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml +index 2653716..addc121 100644 +--- a/build/org.eclipse.cdt.autotools.docs/pom.xml ++++ b/build/org.eclipse.cdt.autotools.docs/pom.xml +@@ -19,7 +19,7 @@ + + + +- com.google.code.tycho-eclipserun-plugin ++ org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho-version} + +@@ -50,4 +50,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/build/org.eclipse.cdt.autotools.tests/pom.xml b/build/org.eclipse.cdt.autotools.tests/pom.xml +index e924d72..18d8ff5 100644 +--- a/build/org.eclipse.cdt.autotools.tests/pom.xml ++++ b/build/org.eclipse.cdt.autotools.tests/pom.xml +@@ -15,14 +15,6 @@ + org.eclipse.cdt.autotools.tests + eclipse-test-plugin + +- +- +- cdt.repo +- file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository +- p2 +- +- +- + + + +diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml +index f95d830..3c25a9c 100644 +--- a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml ++++ b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml +@@ -15,14 +15,6 @@ + org.eclipse.cdt.managedbuilder.core.tests + eclipse-test-plugin + +- +- +- cdt.repo +- file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository +- p2 +- +- +- + + + +diff --git a/codan/org.eclipse.cdt.codan.examples/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.examples/META-INF/MANIFEST.MF +index 481af5b..39ffaa2 100644 +--- a/codan/org.eclipse.cdt.codan.examples/META-INF/MANIFEST.MF ++++ b/codan/org.eclipse.cdt.codan.examples/META-INF/MANIFEST.MF +@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime, + org.eclipse.cdt.core, + org.eclipse.core.resources, + org.eclipse.cdt.codan.ui;bundle-version="1.0.0" +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Bundle-ActivationPolicy: lazy + Export-Package: org.eclipse.cdt.codan.examples, + org.eclipse.cdt.codan.examples.checkers, +diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml +index d8b56d0..eca9614 100644 +--- a/core/org.eclipse.cdt.core.tests/pom.xml ++++ b/core/org.eclipse.cdt.core.tests/pom.xml +@@ -15,14 +15,6 @@ + org.eclipse.cdt.core.tests + eclipse-test-plugin + +- +- +- cdt.repo +- file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository +- p2 +- +- +- + + + +diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml +index d382d72..f419935 100644 +--- a/core/org.eclipse.cdt.ui.tests/pom.xml ++++ b/core/org.eclipse.cdt.ui.tests/pom.xml +@@ -15,14 +15,6 @@ + org.eclipse.cdt.ui.tests + eclipse-test-plugin + +- +- +- cdt.repo +- file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository +- p2 +- +- +- + + + +diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml +index cc479d5..2598624 100644 +--- a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml ++++ b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml +@@ -4,9 +4,7 @@ + label="%featureName" + version="1.1.0.qualifier" + provider-name="%providerName" +- plugin="org.eclipse.cdt.build.crossgcc" +- license-feature="org.eclipse.cdt.license" +- license-feature-version="1.0.0.qualifier"> ++ plugin="org.eclipse.cdt.build.crossgcc"> + + + %description +diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml +index e350efe..2f54b2e 100644 +--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml ++++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml +@@ -3,9 +3,7 @@ + id="org.eclipse.cdt.launch.remote" + label="%featureName" + version="6.0.0.qualifier" +- provider-name="%providerName" +- license-feature="org.eclipse.cdt.license" +- license-feature-version="1.0.0.qualifier"> ++ provider-name="%providerName"> + + + %description +diff --git a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml b/cross/org.eclipse.cdt.launch.remote-feature/pom.xml +index 7ef4eb5..0b4d263 100644 +--- a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml ++++ b/cross/org.eclipse.cdt.launch.remote-feature/pom.xml +@@ -12,6 +12,7 @@ + + + 6.0.0-SNAPSHOT ++ org.eclipse.cdt.feature + org.eclipse.cdt.launch.remote + eclipse-feature + +diff --git a/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF b/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF +index 2f7d271..4a7b2f2 100644 +--- a/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF ++++ b/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF +@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)", + Bundle-ActivationPolicy: lazy + Eclipse-LazyStart: true + Bundle-Vendor: %providerName +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Export-Package: org.eclipse.cdt.internal.launch.remote;x-internal:=true, + org.eclipse.cdt.launch.remote;x-internal:=true, + org.eclipse.cdt.launch.remote.launching;x-internal:=true, +diff --git a/cross/org.eclipse.cdt.launch.remote/build.properties b/cross/org.eclipse.cdt.launch.remote/build.properties +index 2b8a801..4c7b6e4 100644 +--- a/cross/org.eclipse.cdt.launch.remote/build.properties ++++ b/cross/org.eclipse.cdt.launch.remote/build.properties +@@ -18,7 +18,6 @@ bin.includes = META-INF/,\ + about.ini,\ + about.mappings,\ + about.properties,\ +- eclipse32.png,\ + plugin.properties,\ + plugin.xml,\ + remotecdt.html,\ +diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml +index 80815e0..372f176 100644 +--- a/doc/org.eclipse.cdt.doc.isv/pom.xml ++++ b/doc/org.eclipse.cdt.doc.isv/pom.xml +@@ -33,7 +33,7 @@ + + + +- com.google.code.tycho-eclipserun-plugin ++ org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho-version} + +diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml +index 58ee57a..a9a648c 100644 +--- a/doc/org.eclipse.cdt.doc.user/pom.xml ++++ b/doc/org.eclipse.cdt.doc.user/pom.xml +@@ -33,7 +33,7 @@ + + + +- com.google.code.tycho-eclipserun-plugin ++ org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho-version} + +diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF +index 62e7564..2c72684 100644 +--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF ++++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF +@@ -22,5 +22,5 @@ Export-Package: org.eclipse.cdt.examples.dsf.pda.ui, + org.eclipse.cdt.examples.dsf.pda.ui.breakpoints, + org.eclipse.cdt.examples.dsf.pda.ui.editor, + org.eclipse.cdt.examples.dsf.pda.ui.launcher +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Bundle-Vendor: %providerName +diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF +index 556e410..bbfea60 100644 +--- a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF ++++ b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF +@@ -19,6 +19,6 @@ Export-Package: org.eclipse.cdt.examples.dsf.pda, + org.eclipse.cdt.examples.dsf.pda.service, + org.eclipse.cdt.examples.dsf.pda.service.commands, + org.eclipse.cdt.examples.dsf.pda.sourcelookup +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Bundle-Vendor: %providerName + Import-Package: com.ibm.icu.text +diff --git a/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF +index e07e6f3..9e71f25 100644 +--- a/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF ++++ b/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF +@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.ui, + org.eclipse.cdt.dsf.ui, + org.apache.ant;bundle-version="1.7.0";resolution:=optional + Eclipse-LazyStart: true +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +diff --git a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF +index 75a63b8..49c72ae 100644 +--- a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF ++++ b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF +@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.core.runtime, + org.eclipse.cdt.core;bundle-version="5.2.0", + org.eclipse.test.performance;bundle-version="3.6.0", + org.junit;bundle-version="3.8.2" +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml +index ee3fed7..bdd58f8 100644 +--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml ++++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml +@@ -4,9 +4,7 @@ + label="%featureName" + version="7.0.0.qualifier" + provider-name="%providerName" +- image="eclipse_update_120.jpg" +- license-feature="org.eclipse.cdt.license" +- license-feature-version="1.0.0.qualifier"> ++ image="eclipse_update_120.jpg"> + + + %description +diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF +index 330cdfc..cbdfd3d 100644 +--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF ++++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF +@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.runtime, + Export-Package: org.eclipse.cdt.core.lrparser.tests + Bundle-Vendor: %Bundle-Vendor.0 + Bundle-Localization: plugin +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +diff --git a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF +index 5bdecab..6d0d2cf 100644 +--- a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF ++++ b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF +@@ -23,6 +23,6 @@ Export-Package: org.eclipse.cdt.core.dom.lrparser, + org.eclipse.cdt.internal.core.dom.lrparser.gpp + Bundle-Localization: plugin + Bundle-Vendor: %Bundle-Vendor.0 +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Bundle-ActivationPolicy: lazy + Bundle-Activator: org.eclipse.cdt.core.dom.lrparser.LRParserPlugin +diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF +index df16640..fc43491 100644 +--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF ++++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF +@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui, + org.eclipse.debug.ui;bundle-version="3.5.0", + org.eclipse.cdt.debug.core;bundle-version="7.0.0", + org.eclipse.cdt.debug.ui;bundle-version="7.0.0" +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Bundle-ActivationPolicy: lazy + Export-Package: org.eclipse.cdt.debug.ui.memory.memorybrowser, + org.eclipse.cdt.debug.ui.memory.memorybrowser.api +diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF +index 3d30555..7f77b0c 100644 +--- a/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF ++++ b/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF +@@ -16,5 +16,5 @@ Eclipse-LazyStart: true + Bundle-Activator: org.eclipse.cdt.debug.ui.memory.search.MemorySearchPlugin + Bundle-Vendor: %providerName + Import-Package: org.eclipse.debug.ui.memory +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Export-Package: org.eclipse.cdt.debug.ui.memory.search +diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/build.properties b/memory/org.eclipse.cdt.debug.ui.memory.search/build.properties +index 464efb7..1e9c1d7 100644 +--- a/memory/org.eclipse.cdt.debug.ui.memory.search/build.properties ++++ b/memory/org.eclipse.cdt.debug.ui.memory.search/build.properties +@@ -15,6 +15,5 @@ bin.includes = META-INF/,\ + plugin.properties,\ + .,\ + plugin.xml,\ +- about.html,\ +- icons/ ++ about.html + src.includes = about.html +diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF +index e229a44..6916e4f 100644 +--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF ++++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF +@@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.debug.core, + Bundle-ActivationPolicy: lazy + Bundle-Activator: org.eclipse.cdt.debug.ui.memory.traditional.TraditionalRenderingPlugin + Bundle-Vendor: %providerName +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Export-Package: org.eclipse.cdt.debug.ui.memory.traditional +diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.transport/META-INF/MANIFEST.MF +index 657438b..c5da1ea 100644 +--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/META-INF/MANIFEST.MF ++++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/META-INF/MANIFEST.MF +@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.debug.core, + org.eclipse.swt, + org.eclipse.jface, + org.eclipse.ui +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Bundle-ActivationPolicy: lazy + Bundle-Activator: org.eclipse.cdt.debug.ui.memory.transport.MemoryTransportPlugin + Export-Package: org.eclipse.cdt.debug.ui.memory.transport, +diff --git a/pom.xml b/pom.xml +index dd54c31..22c0ceb 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -15,7 +15,7 @@ + CDT Parent + + +- 0.13.0 ++ 0.14.0 + 3.8milestones + http://download.eclipse.org/eclipse/updates/${platform-version} + R20110523182458 +@@ -182,21 +182,11 @@ + + + +- +- platform-${platform-version} +- ${platform-site} ++ ++ fedora-rpmbuild ++ file://builddir/build/BUILD/myrepo + p2 +- +- +- orbit-${orbit-version} +- ${orbit-site} +- p2 +- +- +- tm-${tm-version} +- ${tm-site} +- p2 +- ++ + + + +@@ -220,46 +210,6 @@ + gtk + x86 + +- +- linux +- gtk +- x86_64 +- +- +- linux +- gtk +- ppc64 +- +- +- win32 +- win32 +- x86 +- +- +- win32 +- win32 +- x86_64 +- +- +- macosx +- cocoa +- x86 +- +- +- macosx +- cocoa +- x86_64 +- +- +- aix +- gtk +- ppc +- +- +- solaris +- gtk +- sparc +- + + + +diff --git a/upc/org.eclipse.cdt.bupc-feature/feature.xml b/upc/org.eclipse.cdt.bupc-feature/feature.xml +index 07c2c17..46059ab 100644 +--- a/upc/org.eclipse.cdt.bupc-feature/feature.xml ++++ b/upc/org.eclipse.cdt.bupc-feature/feature.xml +@@ -4,9 +4,7 @@ + label="%featureName" + version="1.0.3.qualifier" + provider-name="%providerName" +- plugin="org.eclipse.cdt.managedbuilder.bupc.ui" +- license-feature="org.eclipse.cdt.license" +- license-feature-version="1.0.0.qualifier"> ++ plugin="org.eclipse.cdt.managedbuilder.bupc.ui"> + + + %description +diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF b/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF +index 50fb978..8c18883 100644 +--- a/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF ++++ b/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF +@@ -13,4 +13,4 @@ Require-Bundle: org.eclipse.core.runtime, + org.eclipse.cdt.core.lrparser.tests;bundle-version="4.0.0" + Bundle-Vendor: %Bundle-Vendor.0 + Bundle-Localization: plugin +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +diff --git a/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF b/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF +index 278a7c9..89ec88d 100644 +--- a/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF ++++ b/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF +@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.cdt.core, + org.eclipse.core.resources + Export-Package: org.eclipse.cdt.internal.core.parser.util + Bundle-Localization: plugin +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +diff --git a/visualizer/org.eclipse.cdt.visualizer-feature/build.properties b/visualizer/org.eclipse.cdt.visualizer-feature/build.properties +index 7a4864d..6602cd0 100755 +--- a/visualizer/org.eclipse.cdt.visualizer-feature/build.properties ++++ b/visualizer/org.eclipse.cdt.visualizer-feature/build.properties +@@ -13,5 +13,5 @@ bin.includes = feature.xml,\ + license.html,\ + epl-v10.html,\ + eclipse_update_120.jpg,\ +- About.txt +- +\ No newline at end of file ++ ABOUT.txt ++ +diff --git a/windows/org.eclipse.cdt.msw-feature/feature.xml b/windows/org.eclipse.cdt.msw-feature/feature.xml +index 46a446d..2c613f7 100644 +--- a/windows/org.eclipse.cdt.msw-feature/feature.xml ++++ b/windows/org.eclipse.cdt.msw-feature/feature.xml +@@ -3,9 +3,7 @@ + id="org.eclipse.cdt.msw" + label="CDT Visual C++ Support" + version="1.0.0.qualifier" +- provider-name="Eclipse CDT" +- license-feature="org.eclipse.cdt.license" +- license-feature-version="1.0.0.qualifier"> ++ provider-name="Eclipse CDT"> + + + %description +diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/META-INF/MANIFEST.MF +index 2648654..064be44 100644 +--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/META-INF/MANIFEST.MF ++++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/META-INF/MANIFEST.MF +@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 + Bundle-Name: Tests + Bundle-SymbolicName: org.eclipse.cdt.core.lrparser.xlc.tests + Bundle-Version: 1.0.0.qualifier +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Require-Bundle: org.junit, + org.eclipse.cdt.core.lrparser;bundle-version="5.1.0", + org.eclipse.cdt.core.lrparser.xlc;bundle-version="1.0.0", diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 646b9ed..24bbce7 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -2,14 +2,13 @@ Epoch: 1 -%define run_tests 0 -%define ship_tests 0 %define major 8 -%define minor 0 +%define minor 1 %define majmin %{major}.%{minor} -%define micro 1 +%define micro 0 %define eclipse_base %{_libdir}/eclipse -%define build_id 201109151620 +%define cdt_snapshot org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b +%define build_id 201203191015 # All arches line up except i386 -> x86 @@ -22,34 +21,20 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 5%{?dist} +Release: 0.1.junom6%{?dist} License: EPL and CPL Group: Development/Tools URL: http://www.eclipse.org/cdt Requires: eclipse-platform -# The following tarball was generated using the included fetch-cdt.sh -# script. -Source0: eclipse-cdt-fetched-src-CDT_8_0_1.tar.bz2 +# The following tarball was fetched via: +# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b +Source0: %{cdt_snapshot}.tar.gz -Source1: %{name}-fetched-src-autotools-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz -Source14: make-autotools-tarball.sh - -Source2: %{name}-fetched-src-libhover-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz +Source2: %{name}-fetched-src-libhover-c0b3d2d372997aa721ea7a58837600f6ce916973.tar.gz Source15: make-libhover-tarball.sh -## The following tarball was generated thusly: -## -## mkdir temp && cd temp -## cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r CPPUnit_20061102 \ -## org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit \ -## org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit-feature -## cd org.eclipse.cdt-cppunit -## tar -czvf eclipse-cdt-cppunit-20061102.tar.gz org.eclipse.cdt.cppunit* -# -#Source2: %{name}-cppunit-20061102.tar.gz - # Script to run the tests in Xvnc Source5: %{name}-runtests.sh @@ -64,6 +49,9 @@ Source11: ammacros-1.4-p6.xml Source12: ammacros-1.9.5.xml Source13: ammacros-1.9.6.xml +# Patch so can build with tycho +Patch10: %{name}-tycho-build.patch + # Patch to remove shared license references Patch11: %{name}-remove-shared-license.patch @@ -90,20 +78,18 @@ Patch17: %{name}-ppc64-add_xopen_source-include.patch # in the plugin. Patch19: %{name}-autotools-local.patch -BuildRequires: eclipse-pde >= 1:3.7.0 -BuildRequires: eclipse-rse >= 3.2 +BuildRequires: tycho +BuildRequires: tycho-extras +BuildRequires: eclipse-pde >= 1:3.8.0 +BuildRequires: eclipse-rse >= 3.3 BuildRequires: maven >= 3.0.3 BuildRequires: java-devel >= 1.4.2 BuildRequires: objectweb-asm >= 3.2 BuildRequires: lpg-java-compat -%if %{run_tests} -BuildRequires: vnc-server -BuildRequires: w3m -%endif Requires: gdb make gcc-c++ autoconf automake libtool -Requires: eclipse-platform >= 1:3.7.0-5 -Requires: eclipse-rse >= 3.2 +Requires: eclipse-platform >= 1:3.8.0 +Requires: eclipse-rse >= 3.3 Requires: objectweb-asm >= 3.2 %if 0%{?rhel} >= 6 @@ -133,75 +119,12 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description sdk Source for Eclipse CDT for use within Eclipse. -%if %{ship_tests} -%package tests -Summary: Test suite for Eclipse C/C++ Development Tools (CDT) -Group: Text Editors/Integrated Development Environments (IDE) -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: vnc-server - -%description tests -Test suite for Eclipse C/C++ Development Tools (CDT). -%endif - %prep %setup -q -c -pushd "org.eclipse.cdt.releng" - -pushd results/plugins -%patch13 -popd - -pushd results/features -%patch11 -%patch12 -popd - -# Only build the sdk -offset=0; -for line in $(grep -no "value=.*platform" build.xml); do - linenum=$(echo "$line" | cut -d : -f 1) - sed --in-place -e "$(expr $linenum - 1 - $offset ),$(expr $linenum + 1 - $offset)d" build.xml - offset=$(expr $offset + 3) -done -# Only build for the platform on which we're building -sed --in-place -e "s:linux.gtk.x86/:linux.gtk.%{eclipse_arch}/:g" build.xml -pushd sdk -sed --in-place -e "74,82d" build.properties -sed --in-place -e "s:configs=\\\:configs=linux,gtk,%{eclipse_arch}:" build.properties -popd -pushd master -sed --in-place -e "81,89d" build.properties -sed --in-place -e "s:configs= \\\:configs=linux,gtk,%{eclipse_arch}:" build.properties -popd -pushd platform -sed --in-place -e "74,82d" build.properties -sed --in-place -e "s:configs=.*\\\:configs=linux,gtk,%{eclipse_arch}:" build.properties -popd - -# build.xml assumes we build all configs, but we only build one so update -# build.xml directory reference to be accurate. -sed --in-place -e "s:linux.gtk.x86/:linux.gtk.%{eclipse_arch}/:g" build.xml - -popd - -## Autotools stuff -mkdir autotools -pushd autotools -tar -xzf %{SOURCE1} -%patch19 -p0 -pushd org.eclipse.linuxtools.cdt.autotools.core -mkdir macros -pushd macros -cp %{SOURCE8} . -cp %{SOURCE9} . -cp %{SOURCE10} . -cp %{SOURCE11} . -cp %{SOURCE12} . -cp %{SOURCE13} . -popd -popd +pushd %{cdt_snapshot} +%patch10 -p1 +sed -i -e 's/x86<\/arch>/%{eclipse_arch}<\/arch>/g' pom.xml popd ## Libhover stuff @@ -221,17 +144,6 @@ popd popd popd -## Cppunit stuff -# -#mkdir cppunit -#pushd cppunit -#tar -xzf %{SOURCE2} -#%patch8 -p0 -#%patch9 -p0 -#%patch10 -p0 -#%patch11 -p0 -#popd - %ifarch ppc64 pushd org.eclipse.cdt.releng/results/plugins echo "fragmentName.linux.%{eclipse_arch} = C/C++ Development Tools Core for Linux (%{eclipse_arch})" \ @@ -256,11 +168,29 @@ export PATH=%{java_bin}:/usr/bin:$PATH ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar SDK=$(cd SDK >/dev/null && pwd) -# Eclipse may try to write to the home directory. +pushd SDK +ln -s /usr/share/java javadir +popd + +mkdir repo +repodir=$(cd repo >/dev/null && pwd) + +%{_bindir}/eclipse -debug -consolelog -nosplash -verbose -application \ + org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \ + -metadataRepository file:$repodir \ + -artifactRepository file:$repodir \ + -source $SDK -compress -publishArtifacts + + +pushd org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b +sed -i -e "s:/builddir/build/BUILD/myrepo:$repodir:g" pom.xml +popd + mkdir home homedir=$(cd home > /dev/null && pwd) -pushd org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux/library +pushd org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b +pushd core/org.eclipse.cdt.core.linux/library make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE' popd @@ -274,45 +204,10 @@ LAUNCHERJAR=$(ls %{eclipse_base}/plugins \ | grep org.eclipse.equinox.launcher_) LAUNCHER=%{eclipse_base}/plugins/$LAUNCHERJAR -# Call eclipse headless to process CDT releng build scripts -pushd org.eclipse.cdt.releng -java -jar $LAUNCHER \ - -Duser.home=$homedir \ - -DbuildId=%{build_id} \ - -DbranchVersion=%{version} \ - -DforceContextQualifier=%{build_id} \ - org.eclipse.equinox.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DbuildId=%{build_id} \ - -DbranchVersion=%{version} \ - -DforceContextQualifier=%{build_id} \ - -DjavacFailOnError=true \ - -DdontUnzip=true \ - -DbaseLocation=$SDK \ - -Dpde.build.scripts=$PDEDIR/scripts \ - -DdontFetchAnything=true \ - -DskipFetch=true \ - zips -popd - -## Autotools has dependencies on CDT so we must add these to the SDK directory -unzip -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip -d $SDK +mvn-rpmbuild -o -fae clean install -## Autotools build -pushd autotools -java -jar $LAUNCHER \ - -Duser.home=$homedir \ - org.eclipse.equinox.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Duser.home=$homedir \ - -Dtype=feature \ - -Did=org.eclipse.linuxtools.cdt.autotools \ - -DsourceDirectory=$(pwd) \ - -DbaseLocation=$SDK \ - -Dbuilder=$PDEDIR/templates/package-build \ - -f $PDEDIR/scripts/build.xml main +## Libhover has dependencies on CDT so we must add these to the SDK directory +unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip -d $SDK popd ## Libhover build @@ -330,20 +225,6 @@ java -jar $LAUNCHER \ -f $PDEDIR/scripts/build.xml main popd -## Cppunit build -#pushd cppunit -#java -cp $SDK/startup.jar \ -# -Duser.home=$homedir \ -# org.eclipse.core.launcher.Main \ -# -application org.eclipse.ant.core.antRunner \ -# -Dtype=feature \ -# -Did=org.eclipse.cdt.cppunit \ -# -DsourceDirectory=$(pwd) \ -# -DbaseLocation=$SDK \ -# -Dbuilder=$PDEDIR/templates/package-build \ -# -f $PDEDIR/scripts/build.xml -#popd - %install rm -rf ${RPM_BUILD_ROOT} @@ -359,12 +240,9 @@ install -d -m755 $parsersInstallDir install -d -m755 $sdkInstallDir # Unzip contents of the cdt repo, removing all but plugins and features -unzip -q -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip \ +unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip \ -d $installDir/eclipse -rm $installDir/eclipse/site.xml -rm $installDir/eclipse/pack.properties - # Unpack all existing feature jars for x in $installDir/eclipse/features/*.jar; do dirname=`echo $x | sed -e 's:\\(.*\\)\\.jar:\\1:g'` @@ -373,11 +251,6 @@ for x in $installDir/eclipse/features/*.jar; do rm $x done -# Autotools install -pushd autotools -unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.autotools.zip -popd - # Libhover install pushd libhover unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip @@ -474,49 +347,6 @@ org.eclipse.equinox.p2.publisher.EclipseGenerator \ rm -rf repo popd -mkdir -p ${installDir}-tests/plugins -mkdir -p ${installDir}-tests/features -mv ${installDir}/eclipse/plugins/*test* \ - ${installDir}-tests/plugins -mv ${installDir}/eclipse/features/*test* \ - ${installDir}-tests/features -for x in ${installDir}-tests/plugins/*.jar; do - dirname=`echo $x | sed -e 's:\\(.*\\)\\.jar:\\1:g'` - mkdir -p $dirname - unzip -q $x -d $dirname - rm $x -done -cp -p %{SOURCE5} ${installDir}-tests/runtests -chmod 755 ${installDir}-tests/runtests -%if ! %{ship_tests} -%if ! %{run_tests} -rm -rf ${installDir}-tests -%endif -%endif - -%if %{run_tests} -%check -installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt -# Copy the SDK to simulate real system -rm -rf SDK.fortests -cp -rpL %{eclipse_base} SDK.fortests -# Remove any CDT or CDT tests we may have currently installed -rm -rf SDK.fortests/dropins/cdt* -cp -rpL $installDir SDK.fortests/dropins -# The libhover plugin offers lots of completions but these cause issues -# with some of the tests which expect only a few completions. We should -# update the tests or something ... -rm -rf SDK.fortests/dropins/cdt/eclipse/plugins/org.eclipse.linuxtools.libhover.* -cp -rpL ${installDir}-tests SDK.fortests/dropins -# FIXME: I'd like to simulate real life with something like this ... -#chown -R root:root SDK.fortests -SDK.fortests/dropins/cdt-tests/runtests -e $(pwd)/SDK.fortests -w3m -cols 120 -dump results-*/html/org.eclipse.cdt.testing.html -%if ! %{ship_tests} -rm -rf ${installDir}-tests -%endif -%endif - %clean rm -rf ${RPM_BUILD_ROOT} @@ -532,13 +362,13 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root) %{eclipse_base}/dropins/cdt-parsers -%if %{ship_tests} -%files tests -%defattr(-,root,root) -%{eclipse_base}/dropins/cdt-tests -%endif - %changelog +* Tue Apr 17 2012 Jeff Johnston 1:8.1.0-0.1.junom6 +- Update CDT to Juno M6 (8.1.0 pre-release). +- Switch to use tycho to build CDT. +- Remove autotools build since it is now part of CDT. +- Update libhover to Linux Tools 0.10.0 version. + * Tue Feb 14 2012 Sami Wagiaalla 1:8.0.1-4 - Remove calls to reconciler. diff --git a/sources b/sources index cb90dd1..48054c8 100644 --- a/sources +++ b/sources @@ -8,6 +8,5 @@ 4404043432f7f30300139ce39288ba93 ammacros-1.4-p6.xml f6edf5299e6f0d89017bd295a296c2cd ammacros-1.9.5.xml f5c671311f49cdb33eaaa64ab6d781fa ammacros-1.9.6.xml -13ff348f8175abfaad04ed059c25aed3 eclipse-cdt-fetched-src-CDT_8_0_1.tar.bz2 -76830e93bcc99a481ab9278d78c38dcf eclipse-cdt-fetched-src-libhover-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz -308329e08d095b2179261bc072e7388a eclipse-cdt-fetched-src-autotools-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz +e8d4bd3270feb76350d6f7cdb0ebb264 eclipse-cdt-fetched-src-libhover-c0b3d2d372997aa721ea7a58837600f6ce916973.tar.gz +36fb8a9ec20d9ae58a254dad50b9c2e5 org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b.tar.gz