From 0994b94048f1b1b4befb2a1b86fe6b2c8208d9d7 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Fri, 18 Jul 2008 15:14:32 +0000 Subject: [PATCH] - Un-do crazy config.ini, bundles.info, etc. shuffling - Update patch for building native libraries --- eclipse-compilelibs.patch | 146 +++++++++++++----------- eclipse-copy-JDT.sh | 147 ------------------------ eclipse-copy-Platform.sh | 142 ----------------------- eclipse-mv-Platform.sh | 144 ++++++++++++++++++++++++ eclipse-updateSymlinks.sh | 17 --- eclipse.spec | 229 +++++++++++--------------------------- 6 files changed, 291 insertions(+), 534 deletions(-) delete mode 100644 eclipse-copy-JDT.sh delete mode 100644 eclipse-copy-Platform.sh create mode 100644 eclipse-mv-Platform.sh delete mode 100644 eclipse-updateSymlinks.sh diff --git a/eclipse-compilelibs.patch b/eclipse-compilelibs.patch index 619adf8..62169d6 100644 --- a/eclipse-compilelibs.patch +++ b/eclipse-compilelibs.patch @@ -1,65 +1,81 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.releng.eclipsebuilder -Index: eclipse/buildConfigs/sdk/srcBuild/build.xml -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.xml,v -retrieving revision 1.21 -diff -u -r1.21 build.xml ---- eclipse/buildConfigs/sdk/srcBuild/build.xml 27 May 2008 19:41:03 -0000 1.21 -+++ eclipse/buildConfigs/sdk/srcBuild/build.xml 26 Jun 2008 17:58:02 -0000 -@@ -1,7 +1,7 @@ - - - -- -+ - - - -@@ -71,6 +71,37 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -174,7 +205,7 @@ - - - -- -+ - - - +### Eclipse Workspace Patch 1.0 +#P org.eclipse.releng.eclipsebuilder +Index: eclipse/buildConfigs/sdk/srcBuild/build.xml +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.xml,v +retrieving revision 1.21 +diff -u -r1.21 build.xml +--- eclipse/buildConfigs/sdk/srcBuild/build.xml 27 May 2008 19:41:03 -0000 1.21 ++++ eclipse/buildConfigs/sdk/srcBuild/build.xml 21 Jun 2008 23:43:37 -0000 +@@ -1,7 +1,7 @@ + + + +- ++ + + + +@@ -71,6 +71,53 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -174,7 +221,7 @@ + + + +- ++ + + + diff --git a/eclipse-copy-JDT.sh b/eclipse-copy-JDT.sh deleted file mode 100644 index e12a15a..0000000 --- a/eclipse-copy-JDT.sh +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/sh - -baseDir=$1 - -mkdir -p features plugins -cp -rp $baseDir/about* . -cp -rp $baseDir/configuration/ . -cp -rp $baseDir/eclipse{,.ini} . -cp -rp $baseDir/.eclipseproduct . -cp -rp $baseDir/epl-v10.html . -cp -rp $baseDir/notice.html . -cp -rp $baseDir/readme/ . -cp -rp $baseDir/features/org.eclipse.platform_* features -cp -rp $baseDir/features/org.eclipse.help_* features -cp -rp $baseDir/features/org.eclipse.equinox.p2.user.ui_* features -cp -rp $baseDir/plugins/*linux* plugins -cp -rp $baseDir/plugins/com.jcraft.jsch_* plugins -cp -rp $baseDir/plugins/org.eclipse.compare_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.boot_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.filebuffers_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.filesystem_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.net_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.resources_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.resources.compatibility_* plugins -cp -rp $baseDir/plugins/org.eclipse.osgi.util_* plugins -cp -rp $baseDir/plugins/org.eclipse.debug.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.debug.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.help.appserver_* plugins -cp -rp $baseDir/plugins/org.eclipse.ltk.core.refactoring_* plugins -cp -rp $baseDir/plugins/org.eclipse.ltk.ui.refactoring_* plugins -cp -rp $baseDir/plugins/org.eclipse.platform_* plugins -cp -rp $baseDir/plugins/org.eclipse.platform.doc.user_* plugins -cp -rp $baseDir/plugins/org.eclipse.search_* plugins -cp -rp $baseDir/plugins/org.eclipse.team.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.team.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.text_* plugins -cp -rp $baseDir/plugins/org.eclipse.jface.text_* plugins -cp -rp $baseDir/plugins/org.eclipse.jsch.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.jsch.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.console_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.presentations.r21_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.intro_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.intro.universal_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.cheatsheets_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.browser_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.navigator_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.navigator.resources_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.net_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.workbench.texteditor_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.views_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.editors_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.externaltools_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.ide_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.ide.application_* plugins -cp -rp $baseDir/plugins/org.eclipse.update.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.update.scheduler_* plugins -cp -rp $baseDir/plugins/org.eclipse.update.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.workbench.compatibility_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.views.properties.tabbed_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.security_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.security.ui_* plugins -cp -rp $baseDir/features/org.eclipse.rcp_* features -cp -rp $baseDir/plugins/com.ibm.icu_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.commands_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.databinding_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.databinding.beans_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.jobs_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.expressions_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.runtime_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility.auth_* plugins -cp -rp $baseDir/plugins/org.eclipse.osgi_* plugins -cp -rp $baseDir/plugins/org.eclipse.help_* plugins -cp -rp $baseDir/plugins/org.eclipse.swt_* plugins -cp -rp $baseDir/plugins/org.eclipse.jface_* plugins -cp -rp $baseDir/plugins/org.eclipse.jface.databinding_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.workbench_* plugins -cp -rp $baseDir/plugins/org.eclipse.update.configurator_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.simpleconfigurator_* plugins -cp -rp $baseDir/plugins/org.eclipse.rcp_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.contenttype_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.app_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.common_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.preferences_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.registry_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.launcher_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility.registry_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.variables_* plugins -cp -rp $baseDir/plugins/javax.servlet_* plugins -cp -rp $baseDir/plugins/javax.servlet.jsp_* plugins -cp -rp $baseDir/plugins/org.apache.ant_* plugins -cp -rp $baseDir/plugins/org.apache.commons.el_* plugins -cp -rp $baseDir/plugins/org.apache.commons.logging_* plugins -cp -rp $baseDir/plugins/org.apache.jasper_* plugins -cp -rp $baseDir/plugins/org.apache.lucene_* plugins -cp -rp $baseDir/plugins/org.apache.lucene.analysis_* plugins -cp -rp $baseDir/plugins/org.eclipse.ant.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.filetransfer_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.identity_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.provider.filetransfer_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.ssl_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.frameworkadmin_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.frameworkadmin.equinox_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.http.jetty_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.http.registry_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.http.servlet_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.jsp.jasper_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.jsp.jasper.registry_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.artifact.repository_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.console_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.director_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.director.app_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.directorywatcher_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.engine_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.exemplarysetup_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.extensionlocation_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.garbagecollector_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.jarprocessor_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata.generator_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata.repository_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.reconciler.dropins_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.natives_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.updatechecker_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.updatesite_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* plugins -cp -rp $baseDir/plugins/org.eclipse.help.base_* plugins -cp -rp $baseDir/plugins/org.eclipse.help.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.help.webapp_* plugins -cp -rp $baseDir/plugins/org.eclipse.osgi.services_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.forms_* plugins -cp -rp $baseDir/plugins/org.mortbay.jetty_* plugins -cp -rp $baseDir/plugins/org.sat4j.core_* plugins -cp -rp $baseDir/plugins/org.sat4j.pb_* plugins -cp -rp $baseDir/plugins/org.eclipse.jdt* plugins -cp -rp $baseDir/plugins/org.eclipse.ant.ui_* plugins -cp -rp $baseDir/plugins/org.junit_* plugins -cp -rp $baseDir/plugins/org.junit4_* plugins -rm -rf plugins/*.source_* -sed -i 's/org.eclipse.sdk.ide/org.eclipse.platform.ide/' configuration/config.ini diff --git a/eclipse-copy-Platform.sh b/eclipse-copy-Platform.sh deleted file mode 100644 index 240612a..0000000 --- a/eclipse-copy-Platform.sh +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/sh - -baseDir=$1 - -mkdir -p features plugins -cp -rp $baseDir/about* . -cp -rp $baseDir/configuration/ . -cp -rp $baseDir/eclipse{,.ini} . -cp -rp $baseDir/.eclipseproduct . -cp -rp $baseDir/epl-v10.html . -cp -rp $baseDir/notice.html . -cp -rp $baseDir/readme/ . -cp -rp $baseDir/features/org.eclipse.platform_* features -cp -rp $baseDir/features/org.eclipse.help_* features -cp -rp $baseDir/features/org.eclipse.equinox.p2.user.ui_* features -cp -rp $baseDir/plugins/*linux* plugins -cp -rp $baseDir/plugins/com.jcraft.jsch_* plugins -cp -rp $baseDir/plugins/org.eclipse.compare_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.boot_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.filebuffers_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.filesystem_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.net_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.resources_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.resources.compatibility_* plugins -cp -rp $baseDir/plugins/org.eclipse.osgi.util_* plugins -cp -rp $baseDir/plugins/org.eclipse.debug.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.debug.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.help.appserver_* plugins -cp -rp $baseDir/plugins/org.eclipse.ltk.core.refactoring_* plugins -cp -rp $baseDir/plugins/org.eclipse.ltk.ui.refactoring_* plugins -cp -rp $baseDir/plugins/org.eclipse.platform_* plugins -cp -rp $baseDir/plugins/org.eclipse.platform.doc.user_* plugins -cp -rp $baseDir/plugins/org.eclipse.search_* plugins -cp -rp $baseDir/plugins/org.eclipse.team.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.team.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.text_* plugins -cp -rp $baseDir/plugins/org.eclipse.jface.text_* plugins -cp -rp $baseDir/plugins/org.eclipse.jsch.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.jsch.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.console_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.presentations.r21_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.intro_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.intro.universal_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.cheatsheets_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.browser_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.navigator_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.navigator.resources_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.net_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.workbench.texteditor_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.views_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.editors_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.externaltools_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.ide_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.ide.application_* plugins -cp -rp $baseDir/plugins/org.eclipse.update.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.update.scheduler_* plugins -cp -rp $baseDir/plugins/org.eclipse.update.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.workbench.compatibility_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.views.properties.tabbed_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.security_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.security.ui_* plugins -cp -rp $baseDir/features/org.eclipse.rcp_* features -cp -rp $baseDir/plugins/com.ibm.icu_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.commands_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.databinding_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.databinding.beans_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.jobs_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.expressions_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.runtime_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility.auth_* plugins -cp -rp $baseDir/plugins/org.eclipse.osgi_* plugins -cp -rp $baseDir/plugins/org.eclipse.help_* plugins -cp -rp $baseDir/plugins/org.eclipse.swt_* plugins -cp -rp $baseDir/plugins/org.eclipse.jface_* plugins -cp -rp $baseDir/plugins/org.eclipse.jface.databinding_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.workbench_* plugins -cp -rp $baseDir/plugins/org.eclipse.update.configurator_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.simpleconfigurator_* plugins -cp -rp $baseDir/plugins/org.eclipse.rcp_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.contenttype_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.app_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.common_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.preferences_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.registry_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.launcher_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility.registry_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.variables_* plugins -cp -rp $baseDir/plugins/javax.servlet_* plugins -cp -rp $baseDir/plugins/javax.servlet.jsp_* plugins -cp -rp $baseDir/plugins/org.apache.ant_* plugins -cp -rp $baseDir/plugins/org.apache.commons.el_* plugins -cp -rp $baseDir/plugins/org.apache.commons.logging_* plugins -cp -rp $baseDir/plugins/org.apache.jasper_* plugins -cp -rp $baseDir/plugins/org.apache.lucene_* plugins -cp -rp $baseDir/plugins/org.apache.lucene.analysis_* plugins -cp -rp $baseDir/plugins/org.eclipse.ant.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.filetransfer_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.identity_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.provider.filetransfer_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* plugins -cp -rp $baseDir/plugins/org.eclipse.ecf.ssl_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.frameworkadmin_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.frameworkadmin.equinox_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.http.jetty_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.http.registry_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.http.servlet_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.jsp.jasper_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.jsp.jasper.registry_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.artifact.repository_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.console_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.core_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.director_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.director.app_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.directorywatcher_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.engine_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.exemplarysetup_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.extensionlocation_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.garbagecollector_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.jarprocessor_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata.generator_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata.repository_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.reconciler.dropins_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.natives_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.updatechecker_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.p2.updatesite_* plugins -cp -rp $baseDir/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* plugins -cp -rp $baseDir/plugins/org.eclipse.help.base_* plugins -cp -rp $baseDir/plugins/org.eclipse.help.ui_* plugins -cp -rp $baseDir/plugins/org.eclipse.help.webapp_* plugins -cp -rp $baseDir/plugins/org.eclipse.osgi.services_* plugins -cp -rp $baseDir/plugins/org.eclipse.ui.forms_* plugins -cp -rp $baseDir/plugins/org.mortbay.jetty_* plugins -cp -rp $baseDir/plugins/org.sat4j.core_* plugins -cp -rp $baseDir/plugins/org.sat4j.pb_* plugins -sed -i 's/org.eclipse.sdk.ide/org.eclipse.platform.ide/' configuration/config.ini diff --git a/eclipse-mv-Platform.sh b/eclipse-mv-Platform.sh new file mode 100644 index 0000000..693acef --- /dev/null +++ b/eclipse-mv-Platform.sh @@ -0,0 +1,144 @@ +#!/bin/sh + +baseDir=$1 + +mkdir -p features plugins +mv $baseDir/about* . +mv $baseDir/configuration/ . +mv $baseDir/eclipse{,.ini} . +mv $baseDir/.eclipseproduct . +mv $baseDir/epl-v10.html . +mv $baseDir/notice.html . +mv $baseDir/readme/ . +mv $baseDir/features/org.eclipse.platform_* features +mv $baseDir/features/org.eclipse.help_* features +mv $baseDir/features/org.eclipse.equinox.p2.user.ui_* features +mv $baseDir/features/org.fedoraproject* features +mv $baseDir/plugins/org.fedoraproject* plugins +mv $baseDir/plugins/*linux* plugins +mv $baseDir/plugins/com.jcraft.jsch_* plugins +mv $baseDir/plugins/org.eclipse.compare_* plugins +mv $baseDir/plugins/org.eclipse.core.boot_* plugins +mv $baseDir/plugins/org.eclipse.core.filebuffers_* plugins +mv $baseDir/plugins/org.eclipse.core.filesystem_* plugins +mv $baseDir/plugins/org.eclipse.core.net_* plugins +mv $baseDir/plugins/org.eclipse.core.resources_* plugins +mv $baseDir/plugins/org.eclipse.core.resources.compatibility_* plugins +mv $baseDir/plugins/org.eclipse.osgi.util_* plugins +mv $baseDir/plugins/org.eclipse.debug.core_* plugins +mv $baseDir/plugins/org.eclipse.debug.ui_* plugins +mv $baseDir/plugins/org.eclipse.help.appserver_* plugins +mv $baseDir/plugins/org.eclipse.ltk.core.refactoring_* plugins +mv $baseDir/plugins/org.eclipse.ltk.ui.refactoring_* plugins +mv $baseDir/plugins/org.eclipse.platform_* plugins +mv $baseDir/plugins/org.eclipse.platform.doc.user_* plugins +mv $baseDir/plugins/org.eclipse.search_* plugins +mv $baseDir/plugins/org.eclipse.team.core_* plugins +mv $baseDir/plugins/org.eclipse.team.ui_* plugins +mv $baseDir/plugins/org.eclipse.text_* plugins +mv $baseDir/plugins/org.eclipse.jface.text_* plugins +mv $baseDir/plugins/org.eclipse.jsch.core_* plugins +mv $baseDir/plugins/org.eclipse.jsch.ui_* plugins +mv $baseDir/plugins/org.eclipse.ui.console_* plugins +mv $baseDir/plugins/org.eclipse.ui.presentations.r21_* plugins +mv $baseDir/plugins/org.eclipse.ui.intro_* plugins +mv $baseDir/plugins/org.eclipse.ui.intro.universal_* plugins +mv $baseDir/plugins/org.eclipse.ui.cheatsheets_* plugins +mv $baseDir/plugins/org.eclipse.ui.browser_* plugins +mv $baseDir/plugins/org.eclipse.ui.navigator_* plugins +mv $baseDir/plugins/org.eclipse.ui.navigator.resources_* plugins +mv $baseDir/plugins/org.eclipse.ui.net_* plugins +mv $baseDir/plugins/org.eclipse.ui.workbench.texteditor_* plugins +mv $baseDir/plugins/org.eclipse.ui.views_* plugins +mv $baseDir/plugins/org.eclipse.ui.editors_* plugins +mv $baseDir/plugins/org.eclipse.ui.externaltools_* plugins +mv $baseDir/plugins/org.eclipse.ui.ide_* plugins +mv $baseDir/plugins/org.eclipse.ui.ide.application_* plugins +mv $baseDir/plugins/org.eclipse.update.core_* plugins +mv $baseDir/plugins/org.eclipse.update.scheduler_* plugins +mv $baseDir/plugins/org.eclipse.update.ui_* plugins +mv $baseDir/plugins/org.eclipse.ui.workbench.compatibility_* plugins +mv $baseDir/plugins/org.eclipse.ui.views.properties.tabbed_* plugins +mv $baseDir/plugins/org.eclipse.equinox.security_* plugins +mv $baseDir/plugins/org.eclipse.equinox.security.ui_* plugins +mv $baseDir/features/org.eclipse.rcp_* features +mv $baseDir/plugins/com.ibm.icu_* plugins +mv $baseDir/plugins/org.eclipse.core.commands_* plugins +mv $baseDir/plugins/org.eclipse.core.databinding_* plugins +mv $baseDir/plugins/org.eclipse.core.databinding.beans_* plugins +mv $baseDir/plugins/org.eclipse.core.jobs_* plugins +mv $baseDir/plugins/org.eclipse.core.expressions_* plugins +mv $baseDir/plugins/org.eclipse.core.runtime_* plugins +mv $baseDir/plugins/org.eclipse.core.runtime.compatibility.auth_* plugins +mv $baseDir/plugins/org.eclipse.osgi_* plugins +mv $baseDir/plugins/org.eclipse.help_* plugins +mv $baseDir/plugins/org.eclipse.swt_* plugins +mv $baseDir/plugins/org.eclipse.jface_* plugins +mv $baseDir/plugins/org.eclipse.jface.databinding_* plugins +mv $baseDir/plugins/org.eclipse.ui_* plugins +mv $baseDir/plugins/org.eclipse.ui.workbench_* plugins +mv $baseDir/plugins/org.eclipse.update.configurator_* plugins +mv $baseDir/plugins/org.eclipse.equinox.simpleconfigurator_* plugins +mv $baseDir/plugins/org.eclipse.rcp_* plugins +mv $baseDir/plugins/org.eclipse.core.contenttype_* plugins +mv $baseDir/plugins/org.eclipse.equinox.app_* plugins +mv $baseDir/plugins/org.eclipse.equinox.common_* plugins +mv $baseDir/plugins/org.eclipse.equinox.preferences_* plugins +mv $baseDir/plugins/org.eclipse.equinox.registry_* plugins +mv $baseDir/plugins/org.eclipse.equinox.launcher_* plugins +mv $baseDir/plugins/org.eclipse.core.runtime.compatibility.registry_* plugins +mv $baseDir/plugins/org.eclipse.core.variables_* plugins +mv $baseDir/plugins/javax.servlet_* plugins +mv $baseDir/plugins/javax.servlet.jsp_* plugins +mv $baseDir/plugins/org.apache.ant_* plugins +mv $baseDir/plugins/org.apache.commons.el_* plugins +mv $baseDir/plugins/org.apache.commons.logging_* plugins +mv $baseDir/plugins/org.apache.jasper_* plugins +mv $baseDir/plugins/org.apache.lucene_* plugins +mv $baseDir/plugins/org.apache.lucene.analysis_* plugins +mv $baseDir/plugins/org.eclipse.ant.core_* plugins +mv $baseDir/plugins/org.eclipse.core.runtime.compatibility_* plugins +mv $baseDir/plugins/org.eclipse.ecf_* plugins +mv $baseDir/plugins/org.eclipse.ecf.filetransfer_* plugins +mv $baseDir/plugins/org.eclipse.ecf.identity_* plugins +mv $baseDir/plugins/org.eclipse.ecf.provider.filetransfer_* plugins +mv $baseDir/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* plugins +mv $baseDir/plugins/org.eclipse.ecf.ssl_* plugins +mv $baseDir/plugins/org.eclipse.equinox.frameworkadmin_* plugins +mv $baseDir/plugins/org.eclipse.equinox.frameworkadmin.equinox_* plugins +mv $baseDir/plugins/org.eclipse.equinox.http.jetty_* plugins +mv $baseDir/plugins/org.eclipse.equinox.http.registry_* plugins +mv $baseDir/plugins/org.eclipse.equinox.http.servlet_* plugins +mv $baseDir/plugins/org.eclipse.equinox.jsp.jasper_* plugins +mv $baseDir/plugins/org.eclipse.equinox.jsp.jasper.registry_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.artifact.repository_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.console_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.core_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.director_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.director.app_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.directorywatcher_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.engine_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.exemplarysetup_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.extensionlocation_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.garbagecollector_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.jarprocessor_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.metadata_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.metadata.generator_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.metadata.repository_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.reconciler.dropins_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.natives_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.ui_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.updatechecker_* plugins +mv $baseDir/plugins/org.eclipse.equinox.p2.updatesite_* plugins +mv $baseDir/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* plugins +mv $baseDir/plugins/org.eclipse.help.base_* plugins +mv $baseDir/plugins/org.eclipse.help.ui_* plugins +mv $baseDir/plugins/org.eclipse.help.webapp_* plugins +mv $baseDir/plugins/org.eclipse.osgi.services_* plugins +mv $baseDir/plugins/org.eclipse.ui.forms_* plugins +mv $baseDir/plugins/org.mortbay.jetty_* plugins +mv $baseDir/plugins/org.sat4j.core_* plugins +mv $baseDir/plugins/org.sat4j.pb_* plugins +sed -i 's/org.eclipse.sdk.ide/org.eclipse.platform.ide/' configuration/config.ini diff --git a/eclipse-updateSymlinks.sh b/eclipse-updateSymlinks.sh deleted file mode 100644 index c93c035..0000000 --- a/eclipse-updateSymlinks.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -pushd @INSTALLDIR@/configuration -rm org.eclipse.equinox.simpleconfigurator/bundles.info -biggest=$(ls -1 bundleInfos/ | tail -n 1) -ln -s $biggest org.eclipse.equinox.simpleconfigurator/bundles.info -rm config.ini -biggest=$(ls -1 configInis/ | tail -n 1) -ln -s $biggest config.ini -popd - -profilesDir=@INSTALLDIR@/profilesDir -pushd @INSTALLDIR@/p2/org.eclipse.equinox.engine/profileRegistry -rm -rf * -biggest=$(ls -1 $profilesDir | tail -n 1) -ln -s ../../../profilesDir/$biggest $(echo $biggest | cut -c 3-) -popd diff --git a/eclipse.spec b/eclipse.spec index 148a448..77f3cde 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -4,9 +4,11 @@ # - update stuff for building on secondary arches # - get Ganymede update site pre-configured # - investigate bi-arch requirements -# - sub-packages ... do we need config.ini for -rcp? Epoch: 1 +# Prevent brp-java-repack-jars from being run. +%define __jar_repack 0 + %define eclipse_major 3 %define eclipse_minor 4 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} @@ -23,7 +25,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 3%{?dist} +Release: 4%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -66,10 +68,8 @@ Source25: ecf-filetransfer-v20080611-1715.tar.bz2 # Create a simple feature for building ECF's filetransfer plugins Source26: ecf-filetransfer-feature.xml Source27: ecf-filetransfer-build.properties -# These scripts copy sub-sets of the SDK for generating metadata -Source28: %{name}-copy-Platform.sh -Source29: %{name}-copy-JDT.sh -Source30: %{name}-updateSymlinks.sh +# This script copies the platform sub-set of the SDK for generating metadata +Source28: %{name}-mv-Platform.sh # Build swttools.jar # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 @@ -671,59 +671,46 @@ SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/m SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER # Some directories we need -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/features +sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name} +install -d -m 755 $sdkDir +install -d -m 755 $sdkDir/plugins +install -d -m 755 $sdkDir/features install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java # Explode the resulting SDK tarball tar -C $RPM_BUILD_ROOT%{_libdir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz # ECF filetransfer plugins we built -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.ecf*.jar +rm $sdkDir/plugins/org.eclipse.ecf*.jar unzip -d $RPM_BUILD_ROOT%{_libdir} \ org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip # Remove the feature we used for building rm -rf \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.ecf.filetransfer_feature_* + $sdkDir/features/org.eclipse.ecf.filetransfer_feature_* -LAUNCHERVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//') +LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//') # Install the file initializer app cp -p equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins + $sdkDir/plugins # Install the Fedora Eclipse product plugin -unzip -qq -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins %{SOURCE4} +unzip -qq -d $sdkDir/plugins %{SOURCE4} # Install the Fedora Eclipse product feature -unzip -qq -d $RPM_BUILD_ROOT%{_libdir}/%{name}/features %{SOURCE5} +unzip -qq -d $sdkDir/features %{SOURCE5} -scriptDir=`pwd` -cp %{SOURCE28} . -cp %{SOURCE29} . +installDir=$sdkDir-Platform +metadataDir=$installDir/metadata-Platform +provisionDir=$installDir-provisioned +profileId=PlatformProfile -for subPkg in Platform JDT; do -mkdir $RPM_BUILD_ROOT%{_libdir}/%{name}-$subPkg -pushd $RPM_BUILD_ROOT%{_libdir}/%{name}-$subPkg - sh $scriptDir/%{name}-copy-$subPkg.sh $RPM_BUILD_ROOT%{_libdir}/%{name} +# Copy just the platform +mkdir $installDir +pushd $installDir +sh %{SOURCE28} $sdkDir popd -done -ln -s $RPM_BUILD_ROOT%{_libdir}/%{name}{,-SDK} - -bundlesInfoDir=$RPM_BUILD_ROOT%{_libdir}/%{name}-bundleInfos -profilesDir=$RPM_BUILD_ROOT%{_libdir}/%{name}-profiles -configIniDir=$RPM_BUILD_ROOT%{_libdir}/%{name}-configInis -mkdir -p $bundlesInfoDir $profilesDir $configIniDir - -for subPkg in Platform JDT SDK; do - -installDir=$RPM_BUILD_ROOT%{_libdir}/%{name}-$subPkg -metadataDir=$installDir/metadata-$subPkg -installFolder=$RPM_BUILD_ROOT%{_libdir}/%{name}-tmp-$subPkg -SDKinstallFolder=$RPM_BUILD_ROOT%{_libdir}/%{name}-tmp - -# Generate metadata +# Generate metadata for the platform java \ -cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \ org.eclipse.core.launcher.Main \ @@ -732,7 +719,7 @@ org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ -metadataRepository file:$metadataDir \ -artifactRepository file:$metadataDir \ -source $installDir \ --root "Fedora Eclipse $subPkg" \ +-root "Fedora Eclipse Platform" \ -rootVersion %{version} \ -flavor tooling \ -publishArtifacts \ @@ -746,8 +733,6 @@ cp -p %{SOURCE22} $installDir/configuration/config.ini chmod u+x $installDir/eclipse -profileId=${subPkg}Profile - # Debugging? Add -debug and -consolelog # Provision with director $installDir/eclipse \ @@ -755,7 +740,7 @@ $installDir/eclipse \ org.eclipse.equinox.p2.director.app.application \ -nosplash \ -flavor tooling \ --installIU "Fedora Eclipse $subPkg" \ +-installIU "Fedora Eclipse Platform" \ -version %{version} \ -p2.os linux \ -p2.ws gtk \ @@ -765,100 +750,41 @@ org.eclipse.equinox.p2.director.app.application \ -profileProperties org.eclipse.update.install.features=true \ -metadataRepository file:$metadataDir \ -artifactRepository file:$metadataDir \ --destination $installFolder \ --bundlepool $installFolder \ +-destination $provisionDir \ +-bundlepool $provisionDir \ -vmargs \ --Declipse.p2.data.area=$installFolder/p2 +-Declipse.p2.data.area=$provisionDir/p2 -# Copy the sub-bundles.info file -mv $installFolder/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info \ - $bundlesInfoDir/${subPkg}-bundles.info - -# Copy the sub-profile -profileDir=$installFolder/p2/org.eclipse.equinox.p2.engine/profileRegistry -mv $profileDir/* $profilesDir - -# Copy the sub-config.ini (for profile= line) -mv $installFolder/configuration/config.ini \ - $configIniDir/${subPkg}-config.ini - -# Reset config.ini -mv $installDir/configuration/config.ini{.bak,} +# Stuff in JDT, PDE, SDK +for f in about* \.eclipseproduct epl-v10.html notice.html readme; do + mv $installDir/$f $provisionDir done - -# Some extra stuff. installFolder will still be -SDK here -for f in about_files {about,epl-v10,notice}.html readme; do - mv $RPM_BUILD_ROOT%{_libdir}/%{name}/$f $installFolder -done -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/metadata-SDK - -# Ship the provisioned SDK -installDir=$RPM_BUILD_ROOT%{_libdir}/%{name} -rm -rf $installDir -mv $installFolder $installDir -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}*tmp* -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-{Platform,JDT} -rm $RPM_BUILD_ROOT%{_libdir}/%{name}-SDK - -mv $configIniDir $installDir/configuration/configInis -configIniDir=$installDir/configuration/configInis -mv $bundlesInfoDir $installDir/configuration/bundleInfos -bundlesInfoDir=$installDir/configuration/bundleInfos -mv $profilesDir $installDir/profilesDir -profilesDir=$installDir/profilesDir - -pushd $configIniDir - mv Platform-config.ini 0-Platform-config.ini - mv JDT-config.ini 1-JDT-config.ini - mv SDK-config.ini 2-SDK-config.ini - for f in `ls *.ini`; do - sed --in-place "s/plugins\/org.eclipse.platform/plugins\/org.fedoraproject.ide.platform/" $f - sed --in-place "s/eclipse.product=.*/eclipse.product=org.fedoraproject.ide.platform.product/" $f - done -popd -pushd $installDir/configuration - ln -s configInis/2-SDK-config.ini config.ini -popd -pushd $bundlesInfoDir - mv Platform-bundles.info 0-Platform-bundles.info - mv JDT-bundles.info 1-JDT-bundles.info - mv SDK-bundles.info 2-SDK-bundles.info -popd -pushd $installDir/configuration/org.eclipse.equinox.simpleconfigurator - ln -s ../bundleInfos/2-SDK-bundles.info bundles.info -popd -pushd $profilesDir - for f in Platform JDT SDK; do - profileFiles=${f}Profile.profile/* - for g in Platform JDT SDK; do - installFolder=$RPM_BUILD_ROOT%{_libdir}/%{name}-tmp-$g - sed -i "s|$installFolder|%{_libdir}/%{name}|g" $profileFiles - done - done - mv PlatformProfile.profile 0-PlatformProfile.profile - mv JDTProfile.profile 1-JDTProfile.profile - mv SDKProfile.profile 2-SDKProfile.profile - # This is a weird one - extension location? - sed -i "s|$RPM_BUILD_ROOT||g" 2-SDKProfile.profile/* -popd -pushd $installDir/p2/org.eclipse.equinox.p2.engine/profileRegistry - ln -s ../../../profilesDir/2-SDKProfile.profile SDKProfile.profile -popd +mv $sdkDir/features/* $provisionDir/features +mv $sdkDir/plugins/* $provisionDir/plugins +rm -rf $metadataDir $sdkDir $installDir +mv $provisionDir $sdkDir # Fix paths in p2 data -rm -rf $installDir/p2/org.eclipse.equinox.p2.core/cache -rm -rf $installDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml -sed -i "s|file\:$installFolder/\ -\ bundle\ pool|Fedora Eclipse|g" \ - $installDir/artifacts.xml +rm -rf $sdkDir/p2/org.eclipse.equinox.p2.core/cache +rm -rf $sdkDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml +sed -i "s|file\:$provisionDir/\ -\ bundle\ pool|Fedora Eclipse|g" \ + $sdkDir/artifacts.xml +profileDir=$sdkDir/p2/org.eclipse.equinox.p2.engine/profileRegistry +pushd $profileDir + sed -i "s|$provisionDir|%{_libdir}/%{name}|g" \ + PlatformProfile.profile/* + sed -i "s|$RPM_BUILD_ROOT||g" PlatformProfile.profile/* +popd + %ifarch ppc64 sparc sparcv9 sparc64 alpha ia64 -cp -p features/org.eclipse.platform/gtk/eclipse.ini $installDir +cp -p features/org.eclipse.platform/gtk/eclipse.ini $sdkDir %endif cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \ - $installDir/eclipse.ini + $sdkDir/eclipse.ini # Add a compatibility symlink to startup.jar -pushd $installDir +pushd $sdkDir LAUNCHERNAME=$(ls plugins | grep equinox.launcher_) ln -s plugins/$LAUNCHERNAME startup.jar popd @@ -882,20 +808,20 @@ java -Dosgi.sharedConfiguration.area=$libdir_path/configuration \ popd # Remove the unnecessary configuration data -rm -r $installDir/configuration/org.eclipse.update -rm -r $installDir/configuration/org.eclipse.core.runtime -rm -r $installDir/configuration/org.eclipse.equinox.app -rm -r $installDir/configuration/.settings -dataDirs=$(find $installDir/configuration \ +rm -r $sdkDir/configuration/org.eclipse.update +rm -r $sdkDir/configuration/org.eclipse.core.runtime +rm -r $sdkDir/configuration/org.eclipse.equinox.app +rm -r $sdkDir/configuration/.settings +dataDirs=$(find $sdkDir/configuration \ -type d -name data) for dataDir in $dataDirs; do rm -rf `dirname $dataDir` done # Do this again after we've run the file initializer -rm -rf $installDir/p2/org.eclipse.equinox.p2.core/cache -rm -rf $installDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml -pushd $installDir/p2/org.eclipse.equinox.p2.engine/profileRegistry +rm -rf $sdkDir/p2/org.eclipse.equinox.p2.core/cache +rm -rf $sdkDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml +pushd $profileDir sed -i "s|$RPM_BUILD_ROOT||g" *.profile/* popd @@ -1012,12 +938,6 @@ cp -p copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts install -p -D -m0755 %{SOURCE21} \ $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild -# Script to update config.ini, bundles.info, and *.profile -install -p -D -m0755 %{SOURCE30} \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/.updateSymlinks -sed --in-place "s|@INSTALLDIR@|%{_libdir}/eclipse|g" \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/.updateSymlinks - pushd $RPM_BUILD_ROOT%{_libdir}/%{name} rm plugins/org.sat4j* ln -s %{_javadir}/org.sat4j.core_* plugins/ @@ -1129,24 +1049,17 @@ popd %clean rm -rf $RPM_BUILD_ROOT -%post jdt -p %{_libdir}/%{name}/.updateForSubPackages -%postun jdt -p %{_libdir}/%{name}/.updateForSubPackages -%post pde -p %{_libdir}/%{name}/.updateForSubPackages -%postun pde -p %{_libdir}/%{name}/.updateForSubPackages - %post platform touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%{_libdir}/%{name}/.updateForSubPackages %postun platform touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%{_libdir}/%{name}/.updateForSubPackages %files ecj %defattr(-,root,root) @@ -1181,7 +1094,6 @@ fi %{_libdir}/%{name}/configuration/org.eclipse.osgi/.state* %config %{_libdir}/%{name}/configuration/config.ini %config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info -%dir %{_libdir}/%{name}/configuration/configInis %dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator #%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %{_libdir}/%{name}/notice.html @@ -1220,15 +1132,12 @@ fi %defattr(-,root,root) %attr(0755,root,root) %{_bindir}/%{name} %config %{_libdir}/%{name}/eclipse.ini -%{_libdir}/%{name}/configuration/configInis/0-Platform-config.ini -%dir %{_libdir}/%{name}/configuration/bundleInfos -%{_libdir}/%{name}/configuration/bundleInfos/0-Platform-bundles.info +%{_libdir}/%{name}/.eclipseproduct +%{_libdir}/%{name}/configuration/config.ini %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_datadir}/icons/*/*/apps/* %{_libdir}/%{name}/eclipse -%dir %{_libdir}/%{name}/profilesDir -%{_libdir}/%{name}/profilesDir/0-PlatformProfile.profile %{_libdir}/%{name}/features/org.eclipse.platform_* %{_libdir}/%{name}/plugins/com.jcraft.jsch_* %{_libdir}/%{name}/plugins/javax.servlet_* @@ -1347,18 +1256,11 @@ fi %{_libdir}/%{name}/artifacts.xml # FIXME: should we ship content.xml? #%{_libdir}/%{name}/metadata -%dir %{_libdir}/%{name}/p2 -%dir %{_libdir}/%{name}/p2/org.eclipse.equinox.p2.engine -%dir %{_libdir}/%{name}/p2/org.eclipse.equinox.p2.engine/profileRegistry -%config %{_libdir}/%{name}/p2/org.eclipse.equinox.p2.engine/profileRegistry/*.profile -%{_libdir}/%{name}/.updateSymlinks +%{_libdir}/%{name}/p2 %files jdt %defattr(-,root,root) %{_bindir}/efj -%{_libdir}/%{name}/configuration/configInis/1-JDT-config.ini -%{_libdir}/%{name}/profilesDir/1-JDTProfile.profile -%{_libdir}/%{name}/configuration/bundleInfos/1-JDT-bundles.info %{_libdir}/%{name}/features/org.eclipse.jdt_* %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_* %{_libdir}/%{name}/plugins/org.junit_* @@ -1381,9 +1283,6 @@ fi %files pde %defattr(-,root,root) -%{_libdir}/%{name}/configuration/configInis/2-SDK-config.ini -%{_libdir}/%{name}/profilesDir/2-SDKProfile.profile -%{_libdir}/%{name}/configuration/bundleInfos/2-SDK-bundles.info %{_libdir}/%{name}/features/org.eclipse.sdk_* %{_libdir}/%{name}/features/org.eclipse.pde_* %{_libdir}/%{name}/features/org.eclipse.pde.p2_* @@ -1435,6 +1334,10 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_* %changelog +* Fri Jul 18 2008 Andrew Overholt 3.4.0-4 +- Un-do crazy config.ini, bundles.info, etc. shuffling +- Update patch for building native libraries + * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package - Do crazy config.ini, bundles.info, and *.profile shuffling