[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. debian/8.1.0+dfsg-2-7-ge403525
Jakub Adam
jakub.adam at ktknet.cz
Thu Dec 20 12:27:52 UTC 2012
The following commit has been merged in the master branch:
commit 7737124465596e0a3937e137d374f5f8c7df6f28
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Thu Dec 20 12:26:31 2012 +0100
Rewritten obsolete d/fetch-cdt.sh
diff --git a/debian/changelog b/debian/changelog
index 20d1729..ef55850 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
eclipse-cdt (8.1.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Rewritten obsolete d/fetch-cdt.sh.
-- Jakub Adam <jakub.adam at ktknet.cz> Thu, 20 Dec 2012 12:29:49 +0100
diff --git a/debian/copyright b/debian/copyright
index ff4f884..bf0bb11 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -86,11 +86,6 @@ Files: debian/*
Copyright: 2010-2012, Debian Orbital Alignment Team <pkg-java-maintainers at lists.alioth.debian.org>
License: EPL-1.0
-Files: debian/fetch-cdt.sh
-Copyright: 2008, Andrew Overholt
- 2008-2010, Jeff Johnston
-License: Fedora-contribution
-
Files: debian/docs/src/autoconf/*
Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
License: GFDL-NIV
@@ -134,139 +129,6 @@ License: BSD-like
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-License: Fedora-contribution
- The file was downloaded from Fedora's CVS repository; all committers
- are required to sign a license agreement with Fedora, which puts
- contributions without a license under the license included below.
- .
- At the time Debian acquired these files, the "default" Fedora license
- was:
- .
- The Fedora Project Individual Contributor License Agreement
- .
- The Fedora Project
- .
- Individual Contributor License Agreement (CLA)
- .
- http://fedoraproject.org/wiki/Legal/Licenses/CLA
- .
- Thank you for your interest in The Fedora Project (the "Project"). In
- order to clarify the intellectual property license granted with
- Contributions from any person or entity, Red Hat, Inc. ("Red Hat"),
- as maintainer of the Project, must have a Contributor License
- Agreement (CLA) on file that has been signed by each Contributor,
- indicating agreement to the license terms below. This license is for
- Your protection as a Contributor as well as the protection of the
- Project and its users; it does not change your rights to use your own
- Contributions for any other purpose.
- .
- You and the Project hereby accept and agree to the following terms
- and conditions:
- .
- * 1. Contributors and Contributions.
- .
- * A. The Project and any individual or legal entity that
- voluntarily submits to the Project a Contribution are
- collectively addressed herein as "Contributors". For legal
- entities, the entity making a Contribution and all other entities
- that control, are controlled by, or are under common control with
- that entity are considered to be a single Contributor. For the
- purposes of this definition, "control" means (i) the power,
- direct or indirect, to cause the direction or management of such
- entity, whether by contract or otherwise, or (ii) ownership of
- fifty percent (50%) or more of the outstanding shares, or (iii)
- beneficial ownership of such entity.
- .
- * B. A "Contribution" is any original work, including any
- modification or addition to an existing work, that has been
- submitted for inclusion in, or documentation of, any of the
- products owned or managed by the Project, where such work
- originates from that particular Contributor or from some entity
- acting on behalf of that Contributor.
- .
- * C. A Contribution is "submitted" when any form of electronic,
- verbal, or written communication is sent to the Project,
- including but not limited to communication on electronic mailing
- lists, source code control systems, and issue tracking systems
- that are managed by, or on behalf of, the Project for the purpose
- of discussing or improving software or documentation of the
- Project, but excluding communication that is conspicuously marked
- or otherwise designated in writing by you as "Not a
- Contribution."
- .
- * D. Any Contribution submitted by you to the Project shall be
- under the terms and conditions of this License, without any
- additional terms or conditions, unless you explicitly state
- otherwise in the submission.
- .
- * 2. Contributor Grant of License. You hereby grant to Red Hat, Inc.,
- on behalf of the Project, and to recipients of software distributed
- by the Project:
- .
- * (a) a perpetual, non-exclusive, worldwide, fully paid-up, royalty
- free, irrevocable copyright license to reproduce, prepare
- derivative works of, publicly display, publicly perform,
- sublicense, and distribute your Contribution and such derivative
- works; and,
- .
- * (b) a perpetual, non-exclusive, worldwide, fully paid-up, royalty
- free, irrevocable (subject to Section 3) patent license to make,
- have made, use, offer to sell, sell, import, and otherwise
- transfer your Contribution and derivative works thereof, where
- such license applies only to those patent claims licensable by
- you that are necessarily infringed by your Contribution alone or
- by combination of your Contribution with the work to which you
- submitted the Contribution. Except for the license granted in
- this section, you reserve all right, title and interest in and to
- your Contributions.
- .
- * 3. Reciprocity. As of the date any such litigation is filed, your
- patent grant shall immediately terminate with respect to any party
- that institutes patent litigation against you (including a
- cross-claim or counterclaim in a lawsuit) alleging that your
- Contribution, or the work to which you have contributed,
- constitutes direct or contributory patent infringement.
- .
- * 4. You represent that you are legally entitled to grant the above
- license. If your employer(s) has rights to intellectual property
- that you create that includes your Contributions, you represent
- that you have received permission to make Contributions on behalf
- of that employer, that your employer has waived such rights for
- your Contributions to the Project, or that your employer has
- executed a separate Corporate CLA with the Project.
- .
- * 5. You represent that each of your Contributions is your original
- creation (see section 7 for submissions on behalf of others). You
- represent that your Contribution submission(s) include complete
- details of any third-party license or other restriction (including,
- but not limited to, related copyright, patents and trademarks) of
- which you are personally aware and which are associated with any
- part of your Contribution.
- .
- * 6. You are not expected to provide support for your Contributions,
- except to the extent you desire to provide support. You may provide
- support for free, for a fee, or not at all. Your Contributions are
- provided on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY KIND, either express or implied, including, without limitation,
- any warranties or conditions of NON-INFRINGEMENT, MERCHANTABILITY,
- or FITNESS FOR A PARTICULAR PURPOSE.
- .
- * 7. Should you wish to submit work that is not your original
- creation, you may submit it to the Project separately from any
- Contribution, identifying the complete details of its source and of
- any license or other restriction (including, but not limited to,
- related patents, trademarks, and license agreements) of which you
- are personally aware, and conspicuously marking the work as
- "Submitted on behalf of a third-party: [named here] ".
- .
- * 8. You agree to notify the Project of any facts or circumstances of
- which you become aware that would make these representations
- inaccurate in any respect.
- .
- * 9. The Project is under no obligations to accept and include every
- contribution..
-
-
License: EPL-1.0
Eclipse Public License - v 1.0
.
diff --git a/debian/fetch-cdt.sh b/debian/fetch-cdt.sh
index 9b5c7e9..fee7ebf 100755
--- a/debian/fetch-cdt.sh
+++ b/debian/fetch-cdt.sh
@@ -1,66 +1,65 @@
#!/bin/sh
-# This file has been obtained from:
-# http://cvs.fedoraproject.org/viewvc/rpms/eclipse-cdt/devel/
-#
-# The author list below is not from the original file, but has been
-# written based on the CVS commit log (in case the CVS should some day
-# be unavailable).
-#
-# Written by: 2008, Andrew Overholt
-# Modified by: 2008-2010, Jeff Johnston
set -e
-CDTTAG=v201002161416
-UPSTREAM_VERSION=6.0.2
-ECLIPSEBASE=/usr/lib/eclipse
-
-mkdir -p temp && cd temp
-mkdir -p home
-mkdir -p ws
-rm -rf org.eclipse.cdt-releng
-cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r $CDTTAG org.eclipse.cdt-releng/org.eclipse.cdt.releng
-cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
-
-# The build.xml doesn't fetch master or testing features so we must add this ourselves.
-sed --in-place -e'91,91i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
-sed --in-place -e'91,91i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
-sed --in-place -e'71,71i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
-sed --in-place -e'71,71i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
-
-# Remove copying of binary jar in build.xml. We remove this jar so this operation will fail.
-sed --in-place -e "/copy file=\"\${buildDirectory}.*net\.sourceforge\.lpg/,/\/>/"d build.xml
-
-sed --in-place -e "s,eclipse.cdt/mylyn,eclipse.cdt-old/mylyn,g" maps/cdt.map
-
-
-PDEBUILDVERSION=$(ls $ECLIPSEBASE/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-java -cp /usr/lib/eclipse/startup.jar \
- -Duser.home=../../home \
--XX:CompileCommand="exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" \
--XX:CompileCommand="exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" \
--XX:CompileCommand="exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" \
--XX:CompileCommand="exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" \
- org.eclipse.core.launcher.Main \
- -Dpde.build.scripts=$ECLIPSEBASE/plugins/org.eclipse.pde.build_$PDEBUILDVERSION/scripts \
- -application org.eclipse.ant.core.antRunner \
- -buildfile build.xml -DbaseLocation=$ECLIPSEBASE \
- -Dpde.build.scripts=$ECLIPSEBASE/plugins/org.eclipse.pde.build_$PDEBUILDVERSION/scripts \
- -DcdtTag=$CDTTAG \
- -DdontUnzip=true fetch
+NAME=eclipse-cdt
+VERSION=8.1.1
+DEB_VERSION=${VERSION}
+
+CDT_GIT_WEB=http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/
+
+OUT_DIR=${NAME}-${VERSION}
+
+downloadSnapshot() {
+ VERSION_UNDERSCORE=$(echo $VERSION | sed "s/\./_/g")
+ SRC_DIR=org.eclipse.cdt-CDT_$VERSION_UNDERSCORE
+ TARBALL=$SRC_DIR.tar.bz2
+
+ rm -rf $OUT_DIR
+ wget "$CDT_GIT_WEB/snapshot/$TARBALL"
+ tar xf $TARBALL
+ rm -f $TARBALL
+ mv $SRC_DIR $OUT_DIR
+}
+
+downloadSnapshot
+
+cd $OUT_DIR
+
+find -type f -name .gitignore -delete
+
+# Remove files generated from texi documentation
+rm -rf build/org.eclipse.cdt.autotools.ui/macros
+
+# Remove precompiled binaries
+rm -rf core/org.eclipse.cdt.core.aix/os \
+ core/org.eclipse.cdt.core.aix/cdtaix.jar
+rm -rf core/org.eclipse.cdt.core.linux.ia64/os \
+ core/org.eclipse.cdt.core.linux.ppc/os \
+ core/org.eclipse.cdt.core.linux.ppc64/os \
+ core/org.eclipse.cdt.core.linux.x86/os \
+ core/org.eclipse.cdt.core.linux.x86_64/os \
+ core/org.eclipse.cdt.core.linux/cdt_linux.jar
+rm -rf core/org.eclipse.cdt.core.macosx/os \
+ core/org.eclipse.cdt.core.macosx/cdt_macosx.jar
+rm -rf core/org.eclipse.cdt.core.qnx/os
+rm -rf core/org.eclipse.cdt.core.solaris/os \
+ core/org.eclipse.cdt.core.solaris/cdt_solaris.jar
+rm -rf core/org.eclipse.cdt.core.win32.x86/os \
+ core/org.eclipse.cdt.core.win32.x86_64/os \
+ core/org.eclipse.cdt.core.win32/cdt_win32.jar
+
+find core/org.eclipse.cdt.core.tests/resources/exe -type f \
+ \( -name exe -o -name exe_g -o -name *.o \) -delete
+find core/org.eclipse.cdt.core.tests/resources/exebig -type f \
+ \( -name exebig_g -o -name *.o \) -delete
+find core/org.eclipse.cdt.core.tests/resources/testlib/x86 -type f \
+ \( -name *.a -o -name *.o -o -name *.so \) -delete
cd ..
-mv org.eclipse.cdt.releng eclipse-cdt-${UPSTREAM_VERSION}
-find eclipse-cdt-${UPSTREAM_VERSION} -type f -a \
- \( -name '*.so' -o -name '*.o' -o -name 'net.*.jar' -o -name '*.dll' -o \
- -name '*.exe' -o -name 'exe' -o -name '*_g' -o -name '*.zip' -o \
- -name '*.a' -o -name '*.jnilib' \
- \) \
- -a -delete
-find eclipse-cdt-${UPSTREAM_VERSION} -depth -type d -empty -delete
-sed -i s/^#.*//g eclipse-cdt-${UPSTREAM_VERSION}/results/pluginVersions.properties \
- eclipse-cdt-${UPSTREAM_VERSION}/results/featureVersions.properties
-
-tar jcf ../../../eclipse-cdt_${UPSTREAM_VERSION}.orig.tar.bz2 eclipse-cdt-${UPSTREAM_VERSION}
-cd ../../
-rm -fr temp/
+
+echo "Creating tarball '${NAME}_${DEB_VERSION}.orig.tar.bz2'..."
+tar -cjf ../${NAME}_${DEB_VERSION}.orig.tar.bz2 $OUT_DIR
+
+rm -rf $OUT_DIR
+
--
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.
More information about the pkg-java-commits
mailing list