[pkg-java] r15264 - in trunk/bnd/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Tue Oct 25 23:28:54 UTC 2011
Author: drazzib
Date: 2011-10-25 23:28:53 +0000 (Tue, 25 Oct 2011)
New Revision: 15264
Added:
trunk/bnd/debian/ant.properties
trunk/bnd/debian/bootstrap.xml
trunk/bnd/debian/git-transform.sh
trunk/bnd/debian/patches/
trunk/bnd/debian/patches/build_excludes.diff
trunk/bnd/debian/patches/no_ee_minimum.diff
trunk/bnd/debian/patches/series
trunk/bnd/debian/pom.xml
Removed:
trunk/bnd/debian/TODO
trunk/bnd/debian/build.properties
trunk/bnd/debian/build.xml
trunk/bnd/debian/svn-transform.sh
Modified:
trunk/bnd/debian/bnd.pod
trunk/bnd/debian/bnd.poms
trunk/bnd/debian/changelog
trunk/bnd/debian/control
trunk/bnd/debian/copyright
trunk/bnd/debian/orig-tar.sh
trunk/bnd/debian/rules
Log:
* New upstream version.
* Bump Standards-Version to 3.9.2: no changes needed.
* d/copyright: Upgrade to latest DEP-5 version.
* Use upstream build system:
- d/orig-tar.sh: Rework to use github (Closes: #640839).
- d/build.xml, d/build.properties: Drop.
- d/bootstrap.xml: Build a small bnd.jar just for its own bootstrap.
- Rename d/svn-transform.sh to d/git-transform.sh and remove unneeded bits.
* Enable full OSGi and Eclipse modules (Closes: #565749) :
- d/control: Add Build-Depends on libswt-gtk-3-java, eclipse-rcp,
eclipse-jdt and libosgi-core-java
- d/control: Only Suggests: eclipse-rcp, eclipse-jdt
Deleted: trunk/bnd/debian/TODO
===================================================================
--- trunk/bnd/debian/TODO 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/TODO 2011-10-25 23:28:53 UTC (rev 15264)
@@ -1 +0,0 @@
-* Build the full jar with the OSGi and Eclipse dependencies (runtime and eclipse sub-packages)
Added: trunk/bnd/debian/ant.properties
===================================================================
--- trunk/bnd/debian/ant.properties (rev 0)
+++ trunk/bnd/debian/ant.properties 2011-10-25 23:28:53 UTC (rev 15264)
@@ -0,0 +1 @@
+javac.excludes=**/aQute/bnd/junit/*.java
Modified: trunk/bnd/debian/bnd.pod
===================================================================
--- trunk/bnd/debian/bnd.pod 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/bnd.pod 2011-10-25 23:28:53 UTC (rev 15264)
@@ -49,7 +49,7 @@
C<bnd print -verify *.jar>
-=item build ( -classpath LIST | -eclipse <lt>fileE<gt> | -noeclipse | -output E<lt>fileE<gt> ) * E<lt>fileE<gt>.bnd +
+=item buildx ( -classpath LIST | -eclipse <lt>fileE<gt> | -noeclipse | -output E<lt>fileE<gt> ) * E<lt>fileE<gt>.bnd +
The build function will assemble a bundle from the bnd specification. The default name of the output bundle is the name of the bnd file with a .jar extension.
@@ -97,3 +97,5 @@
Ludovic Claude <ludovic.claude at laposte.net>
+Damien Raude-Morvan <drazzib at debian.org>
+
Modified: trunk/bnd/debian/bnd.poms
===================================================================
--- trunk/bnd/debian/bnd.poms 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/bnd.poms 2011-10-25 23:28:53 UTC (rev 15264)
@@ -1 +1 @@
-src/main/resources/pom.xml
+debian/pom.xml
Copied: trunk/bnd/debian/bootstrap.xml (from rev 15196, trunk/bnd/debian/build.xml)
===================================================================
--- trunk/bnd/debian/bootstrap.xml (rev 0)
+++ trunk/bnd/debian/bootstrap.xml 2011-10-25 23:28:53 UTC (rev 15264)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<project name="bootstrap" default="bootstrap" basedir="..">
+
+ <target name="clean">
+ <delete dir="bootstrap"/>
+ </target>
+
+ <target name="bootstrap">
+ <mkdir dir="bootstrap/build"/>
+ <javac
+ destdir="bootstrap/build"
+ classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar">
+
+ <src path="aQute.libg/src"/>
+ <src path="biz.aQute.bndlib/src"/>
+ <src path="biz.aQute.bnd/src"/>
+ <exclude name="aQute/bnd/plugin/**"/>
+ <exclude name="aQute/bnd/launch/**"/>
+ <exclude name="aQute/bnd/classpath/**"/>
+ <exclude name="aQute/bnd/jareditor/**"/>
+ <exclude name="aQute/bnd/junit/**"/>
+ <exclude name="swing2swt/**"/>
+ <exclude name="biz/aqute/bnd/eclipse/**"/>
+ <exclude name="test/**"/>
+
+ </javac>
+ <copy
+ todir="bootstrap/build/aQute/bnd/ant/"
+ file="biz.aQute.bnd/src/aQute/bnd/ant/taskdef.properties" />
+ <jar destfile="bootstrap/bnd.jar">
+ <fileset dir="bootstrap/build/"/>
+ </jar>
+ </target>
+
+</project>
Deleted: trunk/bnd/debian/build.properties
===================================================================
--- trunk/bnd/debian/build.properties 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/build.properties 2011-10-25 23:28:53 UTC (rev 15264)
@@ -1,12 +0,0 @@
-javadoc.dir=target/api
-build.directory=target
-maven.test.skip=true
-build.javaVersion=1.5
-classpath.compile = \
- /usr/share/java/ant.jar:\
- /usr/share/java/junit.jar:\
- ${basedir}/libg/target/libg-${version}.jar:\
- ${basedir}/runtime/target/runtime-${version}.jar:\
- ${basedir}/core/target/core-${version}.jar:\
- ${basedir}/service/target/service-${version}.jar
-
Deleted: trunk/bnd/debian/build.xml
===================================================================
--- trunk/bnd/debian/build.xml 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/build.xml 2011-10-25 23:28:53 UTC (rev 15264)
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
- <property file="debian/build.properties"/>
- <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
- <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
- <macrodef name="cleanmodule">
- <attribute name="dir"/>
- <sequential>
- <ant target="clean" antfile="${maven.build}" dir="@{dir}">
- <property name="debian.dir" location="debian" />
- <property name="project.dir" value="@{dir}" />
- </ant>
- </sequential>
- </macrodef>
-
- <macrodef name="packagemodule">
- <attribute name="dir"/>
- <sequential>
- <ant target="package" antfile="${maven.build}" dir="@{dir}">
- <property name="debian.dir" location="debian" />
- <property name="project.dir" value="@{dir}" />
- </ant>
- </sequential>
- </macrodef>
-
- <target name="clean">
- <cleanmodule dir=""/>
- <cleanmodule dir="libg"/>
- <cleanmodule dir="service"/>
- <!--cleanmodule dir="runtime"/-->
- <cleanmodule dir="core"/>
- <!--cleanmodule dir="eclipse"/-->
- </target>
-
- <target name="package">
- <packagemodule dir=""/>
- <packagemodule dir="libg"/>
- <packagemodule dir="service"/>
- <!--packagemodule dir="runtime"/-->
- <packagemodule dir="core"/>
- <!--packagemodule dir="eclipse"/-->
- <mkdir dir="target/bnd-jar/OSGI-OPT/src" />
- <unjar src="libg/target/libg-${version}.jar" dest="target/bnd-jar">
- <patternset>
- <exclude name="aQute/libg/asn1/**" />
- <exclude name="aQute/libg/classdump/**" />
- <exclude name="aQute/libg/clauses/**" />
- <exclude name="aQute/libg/log/**" />
- <exclude name="META-INF/**" />
- </patternset>
- </unjar>
- <unjar src="service/target/service-${version}.jar" dest="target/bnd-jar">
- </unjar>
- <unjar src="core/target/core-${version}.jar" dest="target/bnd-jar">
- <patternset>
- <exclude name="DefaultPackage.class" />
- <exclude name="aQute/lib/signing/**" />
- <exclude name="aQute/lib/spring/**" />
- <exclude name="META-INF/**" />
- </patternset>
- </unjar>
- <copy todir="target/bnd-jar/OSGI-OPT/src">
- <fileset dir="libg/src/main/java">
- <patternset>
- <exclude name="aQute/libg/asn1/**" />
- <exclude name="aQute/libg/classdump/**" />
- <exclude name="aQute/libg/clauses/**" />
- <exclude name="aQute/libg/log/**" />
- <exclude name="META-INF/**" />
- </patternset>
- </fileset>
- <fileset dir="service/src/main/java">
- </fileset>
- <fileset dir="core/src/main/java">
- <patternset>
- <exclude name="DefaultPackage.java" />
- <exclude name="aQute/lib/signing/**" />
- <exclude name="aQute/lib/spring/**" />
- <exclude name="META-INF/**" />
- </patternset>
- </fileset>
- </copy>
- <copy todir="target/bnd-jar/OSGI-OPT" file="core/src/main/bnd/bnd.bnd" />
- <copy todir="target/bnd-jar" file="LICENSE" />
- <copy todir="target/bnd-jar">
- <fileset dir="src/main/resources">
- <include name="*.xml" />
- </fileset>
- </copy>
- <jar destfile="target/bnd.jar"
- manifest="core/src/main/resources/META-INF/MANIFEST.MF" >
- <fileset dir="target/bnd-jar" />
- </jar>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="libg/src/main/java/"/>
- <packageset dir="service/src/main/java/"/>
- <packageset dir="runtime/src/main/java/"/>
- <packageset dir="core/src/main/java/"/>
- <packageset dir="eclipse/src/main/java/"/>
- </javadoc>
- </target>
-
-</project>
Modified: trunk/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/changelog 2011-10-25 23:28:53 UTC (rev 15264)
@@ -1,3 +1,20 @@
+bnd (1.44.0-1) unstable; urgency=low
+
+ * New upstream version.
+ * Bump Standards-Version to 3.9.2: no changes needed.
+ * d/copyright: Upgrade to latest DEP-5 version.
+ * Use upstream build system:
+ - d/orig-tar.sh: Rework to use github (Closes: #640839).
+ - d/build.xml, d/build.properties: Drop.
+ - d/bootstrap.xml: Build a small bnd.jar just for its own bootstrap.
+ - Rename d/svn-transform.sh to d/git-transform.sh and remove unneeded bits.
+ * Enable full OSGi and Eclipse modules (Closes: #565749) :
+ - d/control: Add Build-Depends on libswt-gtk-3-java, eclipse-rcp,
+ eclipse-jdt and libosgi-core-java
+ - d/control: Only Suggests: eclipse-rcp, eclipse-jdt
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 26 Oct 2011 00:59:39 +0200
+
bnd (0.0.384-2) unstable; urgency=low
* Team upload.
Modified: trunk/bnd/debian/control
===================================================================
--- trunk/bnd/debian/control 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/control 2011-10-25 23:28:53 UTC (rev 15264)
@@ -2,30 +2,47 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional, maven-ant-helper
-Build-Depends-Indep: maven-repo-helper, junit
-Standards-Version: 3.9.1
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
+ Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: ant,
+ ant-optional,
+ cdbs,
+ debhelper (>= 7),
+ default-jdk,
+ eclipse-jdt,
+ eclipse-rcp,
+ javahelper,
+ junit,
+ libosgi-compendium-java,
+ libosgi-core-java,
+ libswt-gtk-3-java,
+ maven-ant-helper,
+ maven-repo-helper
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bnd
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bnd
Homepage: http://www.aQute.biz/Bnd
Package: bnd
Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless | openjdk-6-jdk, java-wrappers
-Description: A tool to create and diagnose OSGi R4 bundles
+Depends: default-jre-headless | java5-runtime-headless | openjdk-6-jdk,
+ java-wrappers,
+ libosgi-compendium-java,
+ libosgi-core-java,
+ ${misc:Depends}
+Suggests: eclipse-jdt, eclipse-rcp
+Description: tool to create and diagnose OSGi R4 bundles
The bnd tool helps you create and diagnose OSGi R4 bundles.
The key functions are:
.
* Show the manifest and JAR contents of a bundle
* Wrap a JAR so that it becomes a bundle
* Create a Bundle from a specification and a class path
- * Verify the validity of the manifest entries
+ * Verify the validity of the manifest entries
.
The tool is capable of acting as:
.
* Command line tool
* Eclipse Plugin
* Maven Plugin
- * Ant Plugin
-
+ * Ant Plugin
Modified: trunk/bnd/debian/copyright
===================================================================
--- trunk/bnd/debian/copyright 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/copyright 2011-10-25 23:28:53 UTC (rev 15264)
@@ -1,24 +1,254 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: BND
-Maintainer: Peter Kriens, aQute SARL
-Source: http://www.aqute.biz/Code/Bnd
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: BND
+Upstream-Contact: Peter Kriens, aQute SARL
+Source: https://github.com/bnd/bnd
Files: *
Copyright: 2006-2009, aQute SARL
License: Apache-2.0
-Files: eclipse/src/main/java/swing2swt/layout/AWTLayout.java eclipse/src/main/java/swing2swt/layout/GridLayout.java
-Copyright: 2003, IBM Corp.
+Files: biz.aQute.bnd/src/swing2swt/layout/AWTLayout.java
+ biz.aQute.bnd/src/swing2swt/layout/GridLayout.java
+Copyright: Copyright (c) 2003 IBM Corporation and others.
License: IBM-License
-Files: libg/src/main/java/aQute/libg/clauses/Selector.java
-Copyright: 2006, OSGi Alliance
+Files: aQute.libg/src/aQute/libg/clauses/Selector.java
+ biz.aQute.bndlib/src/aQute/bnd/compatibility/Signatures.java
+Copyright: Copyright (c) 2006-2010, OSGi Alliance.
License: Apache-2.0
+Files: biz.aQute.bndlib/src/test/lib/deployer/obr/NanoHTTPD.java
+Copyright: Copyright (C) 2001,2005-2011 by Jarno Elonen <elonen at iki.fi>
+Copyright: Copyright (C) 2010 by Konstantinos Togias <info at ktogias.gr>
+License: BSD-3-clause
+
Files: debian/*
-Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>.
+Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>
+Copyright: 2011, Damien Raude-Morvan <drazzib at debian.org>
License: Apache-2.0
+Files: biz.aQute.junit/src/aQute/junit/runtime/Operation.java
+ biz.aQute.junit/src/aQute/junit/runtime/OSGiTestCase.java
+ biz.aQute.junit/src/aQute/junit/runtime/VoidOperation.java
+Copyright: Copyright (c) 2010 Neil Bartlett.
+License:
+ Eclipse Public License - v 1.0
+ .
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE
+ PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ .
+ 1. DEFINITIONS
+ .
+ "Contribution" means:
+ .
+ a) in the case of the initial Contributor, the initial code and documentation
+ distributed under this Agreement, and
+ b) in the case of each subsequent Contributor:
+ .
+ i) changes to the Program, and
+ .
+ ii) additions to the Program;
+ .
+ where such changes and/or additions to the Program originate from and are
+ distributed by that particular Contributor. A Contribution 'originates'
+ from a Contributor if it was added to the Program by such Contributor itself
+ or anyone acting on such Contributor's behalf. Contributions do not include
+ additions to the Program which: (i) are separate modules of software
+ distributed in conjunction with the Program under their own license
+ agreement, and (ii) are not derivative works of the Program.
+ .
+ "Contributor" means any person or entity that distributes the Program.
+ .
+ "Licensed Patents " mean patent claims licensable by a Contributor which are
+ necessarily infringed by the use or sale of its Contribution alone or when
+ combined with the Program.
+ .
+ "Program" means the Contributions distributed in accordance with this
+ Agreement.
+ .
+ "Recipient" means anyone who receives the Program under this Agreement,
+ including all Contributors.
+ .
+ 2. GRANT OF RIGHTS
+ .
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly perform,
+ distribute and sublicense the Contribution of such Contributor, if any,
+ and such derivative works, in source code and object code form.
+ .
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of
+ the Contribution and the Program if, at the time the Contribution is added
+ by the Contributor, such addition of the Contribution causes such
+ combination to be covered by the Licensed Patents. The patent license shall
+ not apply to any other combinations which include the Contribution. No
+ hardware per se is licensed hereunder.
+ .
+ c) Recipient understands that although each Contributor grants the licenses
+ to its Contributions set forth herein, no assurances are provided by any
+ Contributor that the Program does not infringe the patent or other
+ intellectual property rights of any other entity. Each Contributor disclaims
+ any liability to Recipient for claims brought by any other entity based on
+ infringement of intellectual property rights or otherwise. As a condition to
+ exercising the rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual property rights
+ needed, if any. For example, if a third party patent license is required to
+ allow Recipient to distribute the Program, it is Recipient's responsibility
+ to acquire that license before distributing the Program.
+ .
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright license
+ set forth in this Agreement.
+ .
+ 3. REQUIREMENTS
+ .
+ A Contributor may choose to distribute the Program in object code form under
+ its own license agreement, provided that:
+ .
+ a) it complies with the terms and conditions of this Agreement; and
+ .
+ b) its license agreement:
+ .
+ i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of title
+ and non-infringement, and implied warranties or conditions of merchantability
+ and fitness for a particular purpose;
+ .
+ ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and consequential
+ damages, such as lost profits;
+ .
+ iii) states that any provisions which differ from this Agreement are offered
+ by that Contributor alone and not by any other party; and
+ .
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable manner on
+ or through a medium customarily used for software exchange.
+ .
+ When the Program is made available in source code form:
+ .
+ a) it must be made available under this Agreement; and
+ .
+ b) a copy of this Agreement must be included with each copy of the Program.
+ .
+ Contributors may not remove or alter any copyright notices contained within
+ the Program.
+ .
+ Each Contributor must identify itself as the originator of its Contribution,
+ if any, in a manner that reasonably allows subsequent Recipients to identify
+ the originator of the Contribution.
+ .
+ 4. COMMERCIAL DISTRIBUTION
+ .
+ Commercial distributors of software may accept certain responsibilities with
+ respect to end users, business partners and the like. While this license is
+ intended to facilitate the commercial use of the Program, the Contributor who
+ includes the Program in a commercial product offering should do so in a manner
+ which does not create potential liability for other Contributors. Therefore,
+ if a Contributor includes the Program in a commercial product offering, such
+ Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+ every other Contributor ("Indemnified Contributor") against any losses,
+ damages and costs (collectively "Losses") arising from claims, lawsuits and
+ other legal actions brought by a third party against the Indemnified
+ Contributor to the extent caused by the acts or omissions of such Commercial
+ Contributor in connection with its distribution of the Program in a commercial
+ product offering. The obligations in this section do not apply to any claims
+ or Losses relating to any actual or alleged intellectual property
+ infringement. In order to qualify, an Indemnified Contributor must:
+ a) promptly notify the Commercial Contributor in writing of such claim, and
+ b) allow the Commercial Contributor to control, and cooperate with the
+ Commercial Contributor in, the defense and any related settlement
+ negotiations. The Indemnified Contributor may participate in any such claim
+ at its own expense.
+ .
+ For example, a Contributor might include the Program in a commercial product
+ offering, Product X. That Contributor is then a Commercial Contributor. If
+ that Commercial Contributor then makes performance claims, or offers
+ warranties related to Product X, those performance claims and warranties are
+ such Commercial Contributor's responsibility alone. Under this section, the
+ Commercial Contributor would have to defend claims against the other
+ Contributors related to those performance claims and warranties, and if a
+ court requires any other Contributor to pay any damages as a result, the
+ Commercial Contributor must pay those damages.
+ .
+ 5. NO WARRANTY
+ .
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS 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 TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
+ PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
+ appropriateness of using and distributing the Program and assumes all
+ risks associated with its exercise of rights under this Agreement ,
+ including but not limited to the risks and costs of program errors,
+ compliance with applicable laws, damage to or loss of data, programs or
+ equipment, and unavailability or interruption of operations.
+ .
+ 6. DISCLAIMER OF LIABILITY
+ .
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+ CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+ LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+ EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. GENERAL
+ .
+ If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this Agreement, and without further action by
+ the parties hereto, such provision shall be reformed to the minimum extent
+ necessary to make such provision valid and enforceable.
+ .
+ If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipient's patent(s), then such Recipient's rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+ .
+ All Recipient's rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and
+ does not cure such failure in a reasonable period of time after becoming
+ aware of such noncompliance. If all Recipient's rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program as
+ soon as reasonably practicable. However, Recipient's obligations under this
+ Agreement and any licenses granted by Recipient relating to the Program
+ shall continue and survive.
+ .
+ Everyone is permitted to copy and distribute copies of this Agreement, but
+ in order to avoid inconsistency the Agreement is copyrighted and may only
+ be modified in the following manner. The Agreement Steward reserves the
+ right to publish new versions (including revisions) of this Agreement from
+ time to time. No one other than the Agreement Steward has the right to
+ modify this Agreement. The Eclipse Foundation is the initial Agreement
+ Steward. The Eclipse Foundation may assign the responsibility to serve as
+ the Agreement Steward to a suitable separate entity. Each new version of
+ the Agreement will be given a distinguishing version number. The Program
+ (including Contributions) may always be distributed subject to the version
+ of the Agreement under which it was received. In addition, after a new
+ version of the Agreement is published, Contributor may elect to distribute
+ the Program (including its Contributions) under the new version. Except as
+ expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+ rights or licenses to the intellectual property of any Contributor under
+ this Agreement, whether expressly, by implication, estoppel or otherwise.
+ All rights in the Program not expressly granted under this Agreement are
+ reserved.
+ .
+ This Agreement is governed by the laws of the State of New York and the
+ intellectual property laws of the United States of America. No party to
+ this Agreement will bring a legal action under this Agreement more than
+ one year after the cause of action arose. Each party waives its rights to
+ a jury trial in any resulting litigation.
+
+
License: Apache-2.0
On Debian GNU/Linux system you can find the complete text of the
Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
@@ -46,3 +276,27 @@
Each copy of any portion of this/these sample program(s) or any derivative
work, must include the above copyright notice and disclaimer of warranty.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer. Redistributions in
+ binary form must reproduce the above copyright notice, this list of
+ conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution. The name of the author may not
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
Copied: trunk/bnd/debian/git-transform.sh (from rev 15196, trunk/bnd/debian/svn-transform.sh)
===================================================================
--- trunk/bnd/debian/git-transform.sh (rev 0)
+++ trunk/bnd/debian/git-transform.sh 2011-10-25 23:28:53 UTC (rev 15264)
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Usage: git-transform src dest
+
+set -e
+
+SRC=$1
+DEST=$2
+SRC=${SRC:-bnd-git}
+DEST=${DEST:-bnd-clean}
+VERSION=$(dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' '| cut -d: -f2- | cut -d'-' -f 1)
+
+rm -rf $DEST
+
+echo "Copy files..."
+rsync --cvs-exclude -r --exclude '**/*.class' --exclude '**/*.jar' --exclude '.git*' $SRC/ $DEST/
+
+echo "Cleanup..."
+
+# Remove all JARs
+find $DEST/cnf/repo/ -name "*.jar" -delete
+rm -rf $DEST/biz.aQute.bndlib/maven/org/apache
+rm -rf $DEST/biz.aQute.bndlib/jar/
+
+# Remove Eclipse compiler, not needed and under EPL-v1
+rm -rf $DEST/biz.aQute.eclipse.compiler
+
+# Cleanup of binary blobs
+rm -rf $DEST/biz.aQute.bndlib/test/maven-repo/
+rm -rf $DEST/biz.aQute.bndlib/src/test/*.jclass
+rm -rf $DEST/biz.aQute.bndlib/src/test/*.clazz
+rm -rf $DEST/biz.aQute.bndlib/test/beasymock.bar
+rm -rf $DEST/biz.aQute.bndlib/test/eclipse/plugins/beasymock.bar
Modified: trunk/bnd/debian/orig-tar.sh
===================================================================
--- trunk/bnd/debian/orig-tar.sh 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/orig-tar.sh 2011-10-25 23:28:53 UTC (rev 15264)
@@ -3,23 +3,20 @@
VERSION=$2
TAR=../bnd_$VERSION.orig.tar.gz
DIR=bnd-$VERSION
+GIT_DIR=/home/drazzib/incoming/bnd-git
-DATE=20091209
-cvs -z3 -d:pserver:anonymous at bnd.cvs.sourceforge.net:/cvsroot/bnd checkout -D $DATE -d bnd-cvs .
+DATE=2011-07-01
+git clone git://github.com/bnd/bnd.git $GIT_DIR
+(
+ cd $GIT_DIR
+ git checkout `git rev-list -n 1 --before="$DATE" master`
+)
-# Use a script to transform the current codebase.
-# Hopefully the next release of BND will adopt this layout
-chmod +x debian/svn-transform.sh
-debian/svn-transform.sh bnd-cvs $DIR
-rm -r bnd-cvs
+# Bnd git cleanup
+chmod +x debian/git-transform.sh
+debian/git-transform.sh $GIT_DIR $DIR
tar -c -z -f $TAR $DIR
-#rm -rf $DIR ../$TAG
+rm -rf $DIR
+#rm -rf $GIT_DIR
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
-
Added: trunk/bnd/debian/patches/build_excludes.diff
===================================================================
--- trunk/bnd/debian/patches/build_excludes.diff (rev 0)
+++ trunk/bnd/debian/patches/build_excludes.diff 2011-10-25 23:28:53 UTC (rev 15264)
@@ -0,0 +1,18 @@
+Description: Add a way to exclude some source file from build using
+ javac.excludes property (used in debian/ant.properties)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-10-26
+Forwarded: no
+Index: b/cnf/build.xml
+===================================================================
+--- a/cnf/build.xml
++++ b/cnf/build.xml
+@@ -49,7 +49,7 @@
+ -->
+ <target name="compile" depends="dependencies" if="project.sourcepath">
+ <mkdir dir="${project.output}" />
+- <javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" />
++ <javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" excludes="${javac.excludes}" />
+ <!--
+ The eclipse compiler copies resources but the Javac compiler does not
+ If ${src} == ${bin} then this is not necessary, but unfortunately, now
Added: trunk/bnd/debian/patches/no_ee_minimum.diff
===================================================================
--- trunk/bnd/debian/patches/no_ee_minimum.diff (rev 0)
+++ trunk/bnd/debian/patches/no_ee_minimum.diff 2011-10-25 23:28:53 UTC (rev 15264)
@@ -0,0 +1,39 @@
+Description: Don't request ee.minimum since we have a full
+ blown JVM.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-10-26
+Forwarded: no
+Index: b/biz.aQute.junit/bnd.bnd
+===================================================================
+--- a/biz.aQute.junit/bnd.bnd
++++ b/biz.aQute.junit/bnd.bnd
+@@ -1,5 +1,4 @@
+ -buildpath: com.springsource.junit,\
+- ee.minimum;version=1.2.1,\
+ osgi.cmpn;version=4.2.1,\
+ biz.aQute.bndlib;version=project,\
+ aQute.libg;version=project,\
+Index: b/demo/bnd.bnd
+===================================================================
+--- a/demo/bnd.bnd
++++ b/demo/bnd.bnd
+@@ -2,9 +2,7 @@
+ Bundle-Activator: com.example.demo.Activator
+ Bundle-SymbolicName: demo
+
+--buildpath: osgi.core,\
+- ee.minimum;version=1.2.1
+-
++-buildpath: osgi.core
+
+ -testpath: \
+ biz.aQute.junit; version=snapshot
+@@ -25,6 +23,5 @@
+ *
+
+ -buildpath: osgi.core,\
+- ee.minimum;version=1.2.1,\
+ junit.osgi
+-
+\ No newline at end of file
++
Added: trunk/bnd/debian/patches/series
===================================================================
--- trunk/bnd/debian/patches/series (rev 0)
+++ trunk/bnd/debian/patches/series 2011-10-25 23:28:53 UTC (rev 15264)
@@ -0,0 +1,2 @@
+build_excludes.diff
+no_ee_minimum.diff
Added: trunk/bnd/debian/pom.xml
===================================================================
--- trunk/bnd/debian/pom.xml (rev 0)
+++ trunk/bnd/debian/pom.xml 2011-10-25 23:28:53 UTC (rev 15264)
@@ -0,0 +1,74 @@
+
+<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
+ <modelVersion>
+ 4.0.0
+ </modelVersion>
+ <groupId>
+ biz.aQute
+ </groupId>
+ <artifactId>
+ bndlib
+ </artifactId>
+ <version>
+ 1.43.0
+ </version>
+ <description>
+ A library for manipulating and generating bundles
+ </description>
+ <name>
+ aQute Bundle Tool Library
+ </name>
+ <url>
+ http://www.aQute.biz/Code/Bnd
+ </url>
+ <scm>
+ <url>
+ git://github.com/bnd/bnd.git
+ </url>
+ <connection>
+ git://github.com/bnd/bnd.git
+ </connection>
+ <developerConnection>
+ git://github.com/bnd/bnd.git
+ </developerConnection>
+ </scm>
+ <organization>
+ <name>
+ aQute SARL
+ </name>
+ <url>
+ http://www.aQute.biz
+ </url>
+ </organization>
+ <developers>
+ <developer>
+ <id>
+ Peter.Kriens at aQute.biz
+ </id>
+ <name>
+ Peter.Kriens
+ </name>
+ <email>
+ Peter.Kriens at aQute.biz
+ </email>
+ <organization>
+ aQute
+ </organization>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>
+ All files contained in this JAR are licensed under the Apache
+ 2.0 license, unless noted differently in their source (see
+ swing2swt).
+ </name>
+ <url>
+ http://www.opensource.org/licenses/apache2.0.php
+ </url>
+ <distribution>
+ repo
+ </distribution>
+ </license>
+ </licenses>
+</project>
\ No newline at end of file
Modified: trunk/bnd/debian/rules
===================================================================
--- trunk/bnd/debian/rules 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/rules 2011-10-25 23:28:53 UTC (rev 15264)
@@ -3,29 +3,124 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
+MAVEN_REPO := http://repo1.maven.org/maven2/biz/aQute/bndlib/
+MAVEN_VERSION := 1.43.0
+
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := ant-nodeps ant junit
-DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
+DEB_ANT_BUILD_TARGET := build
+### Bootstrap build
+pre-build:: debian/stamp-bootstrap
+bootstrap: debian/stamp-bootstrap
+debian/stamp-bootstrap: DEB_BUILDDIR=$(CURDIR)
+debian/stamp-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
+debian/stamp-bootstrap:
+ $(DEB_ANT_INVOKE)
+ mkdir -p cnf/repo/biz.aQute.bnd/ \
+ cnf/repo/com.springsource.junit/ \
+ cnf/repo/org.eclipse.osgi \
+ cnf/repo/osgi.core \
+ cnf/repo/osgi.cmpn \
+ cnf/repo/ee.minimum \
+ cnf/repo/junit.osgi \
+ cnf/repo/org.apache.tools.ant \
+ cnf/repo/org.eclipse.core.runtime \
+ cnf/repo/org.eclipse.core.resources \
+ cnf/repo/org.eclipse.core.commands \
+ cnf/repo/org.eclipse.jdt.core \
+ cnf/repo/org.eclipse.jdt.ui \
+ cnf/repo/org.eclipse.jdt.debug.ui \
+ cnf/repo/org.eclipse.jdt.junit \
+ cnf/repo/org.eclipse.jdt.launching \
+ cnf/repo/org.eclipse.jface \
+ cnf/repo/org.eclipse.jface.text \
+ cnf/repo/org.eclipse.swt \
+ cnf/repo/org.eclipse.debug.ui \
+ cnf/repo/org.eclipse.debug.core \
+ cnf/repo/org.eclipse.equinox.common \
+ cnf/repo/org.eclipse.equinox.registry \
+ cnf/repo/org.eclipse.ui \
+ cnf/repo/org.eclipse.ui.editors \
+ cnf/repo/org.eclipse.ui.workbench \
+ cnf/repo/org.eclipse.ui.workbench.texteditor \
+ cnf/repo/org.eclipse.ui.ide \
+ cnf/repo/org.eclipse.core.jobs \
+ cnf/repo/org.eclipse.text \
+ cnf/repo/org.eclipse.swt.carbon.macosx
+ ln -s $(CURDIR)/bootstrap/bnd.jar cnf/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar
+ ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar
+ ln -s /usr/share/java/junit.jar cnf/repo/junit.osgi/junit.osgi-3.8.2.jar
+ ln -s /usr/share/java/osgi.core.jar cnf/repo/org.eclipse.osgi/org.eclipse.osgi-3.5.0.jar
+ ln -s /usr/share/java/osgi.core.jar cnf/repo/osgi.core/osgi.core-4.2.1.jar
+ ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.2.1.jar
+# ln -s /usr/share/java/ee.foundation.jar cnf/repo/ee.minimum/ee.minimum-1.2.1.jar
+ ln -s /usr/share/java/ant.jar cnf/repo/org.apache.tools.ant/org.apache.tools.ant-1.7.1.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar cnf/repo/org.eclipse.core.runtime/org.eclipse.core.runtime-3.3.100.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar cnf/repo/org.eclipse.core.resources/org.eclipse.core.resources-3.3.1.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar cnf/repo/org.eclipse.core.commands/org.eclipse.core.commands-3.3.3.jar
+ ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar cnf/repo/org.eclipse.jdt.core/org.eclipse.jdt.core-3.3.3.jar
+ ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar cnf/repo/org.eclipse.jdt.ui/org.eclipse.jdt.ui-3.3.3.jar
+ ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar cnf/repo/org.eclipse.jdt.debug.ui/org.eclipse.jdt.debug.ui-3.2.102.jar
+ ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar cnf/repo/org.eclipse.jdt.junit/org.eclipse.jdt.junit-3.3.3.jar
+ ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar cnf/repo/org.eclipse.jdt.launching/org.eclipse.jdt.launching-3.3.3.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.jface_*.jar cnf/repo/org.eclipse.jface/org.eclipse.jface-3.3.2.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.jface.text_*.jar cnf/repo/org.eclipse.jface.text/org.eclipse.jface.text-3.3.2.jar
+ ln -s /usr/lib/java/swt-gtk-*.jar cnf/repo/org.eclipse.swt/org.eclipse.swt-3.3.2.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.debug.ui_*.jar cnf/repo/org.eclipse.debug.ui/org.eclipse.debug.ui-3.3.2.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.debug.core_*.jar cnf/repo/org.eclipse.debug.core/org.eclipse.debug.core-3.3.2.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar cnf/repo/org.eclipse.equinox.common/org.eclipse.equinox.common-3.3.0.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.equinox.registry_*.jar cnf/repo/org.eclipse.equinox.registry/org.eclipse.equinox.registry-3.3.0.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.ui_*.jar cnf/repo/org.eclipse.ui/org.eclipse.ui-3.3.2.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.editors_*.jar cnf/repo/org.eclipse.ui.editors/org.eclipse.ui.editors-3.3.2.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar cnf/repo/org.eclipse.ui.workbench/org.eclipse.ui.workbench-3.3.2.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar cnf/repo/org.eclipse.ui.workbench.texteditor/org.eclipse.ui.workbench.texteditor-3.3.2.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.ide_*.jar cnf/repo/org.eclipse.ui.ide/org.eclipse.ui.ide-3.3.2.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar cnf/repo/org.eclipse.core.jobs/org.eclipse.core.jobs-3.3.1.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.text_*.jar cnf/repo/org.eclipse.text/org.eclipse.text-3.5.100.jar
+ ln -s /usr/lib/eclipse/plugins/org.eclipse.swt.*_*.jar cnf/repo/org.eclipse.swt.carbon.macosx/org.eclipse.swt.carbon.macosx-3.3.3.jar
+ touch $@
+clean-bootstrap: DEB_BUILDDIR=$(CURDIR)
+clean-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
+clean-bootstrap:
+ $(DEB_ANT_INVOKE) clean
+ rm -rf cnf/repo/biz.aQute.bnd/
+ rm -f debian/stamp-bootstrap
+
+### Standard build
install/$(PACKAGE)::
pod2man -c 'BND for Debian GNU/Linux' \
-r $(PACKAGE)-$(VERSION) \
debian/bnd.pod > debian/bnd.1
binary-post-install/$(PACKAGE)::
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l --usj-name=bnd src/main/resources/pom.xml target/bnd.jar
+ mkdir install/
+ cp biz.aQute.bnd/tmp/biz.aQute.bnd.jar install/bnd.jar
+ cp biz.aQute.bndlib/tmp/biz.aQute.bndlib.jar install/bndlib.jar
+ cp biz.aQute.bnd/tmp/biz.aQute.bnd.annotation.jar install/bnd.annotation.jar
+ cp biz.aQute.launcher/tmp/biz.aQute.launcher.jar install/bnd.launcher.jar
+ cp biz.aQute.junit/tmp/biz.aQute.junit.jar install/bnd.junit.jar
+ mh_installpoms -p$(PACKAGE) -e$(VERSION)
+ mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom.xml install/bndlib.jar
+ jh_installlibs -p$(PACKAGE) install/bnd.jar
+ jh_installlibs -p$(PACKAGE) install/bnd.annotation.jar
+ jh_installlibs -p$(PACKAGE) install/bnd.launcher.jar
+ jh_installlibs -p$(PACKAGE) install/bnd.junit.jar
dh_install -p$(PACKAGE) debian/bnd.sh /usr/bin/
mv $(DEB_DESTDIR)/usr/bin/bnd.sh $(DEB_DESTDIR)/usr/bin/bnd
clean::
- -rm -rf debian/tmp
+ jh_clean
+ mh_clean
+ -rm -rf install/
-rm -f debian/bnd.1
get-orig-source:
- #-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
debian/orig-tar.sh "" $(VERSION)
+
+get-orig-pom:
+ wget --user-agent="" -O debian/pom.xml $(MAVEN_REPO)/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom
+
+.PHONY: bootstrap clean-bootstrap
Deleted: trunk/bnd/debian/svn-transform.sh
===================================================================
--- trunk/bnd/debian/svn-transform.sh 2011-10-25 23:16:03 UTC (rev 15263)
+++ trunk/bnd/debian/svn-transform.sh 2011-10-25 23:28:53 UTC (rev 15264)
@@ -1,817 +0,0 @@
-#!/bin/bash
-# Usage: svn-transform src dest
-
-set -e
-
-SRC=$1
-DEST=$2
-SRC=$(pwd)/"${SRC:-bnd}"
-DEST=$(pwd)/"${DEST:-bnd-svn}"
-VERSION=$(dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' '| cut -d: -f2- | cut -d'-' -f 1)
-
-rm -rf $DEST
-
-echo "Copy files..."
-mkdir -p $DEST/libg/src/main/java
-rsync --cvs-exclude -r --exclude '**/*.class' --exclude '**/*.jar' --exclude '**/filter' $SRC/aQute.libg/src/ $DEST/libg/src/main/java/
-
-mkdir -p $DEST/runtime/src/main/java
-rsync --cvs-exclude -r --exclude '**/*.class' --exclude '**/*.jar' $SRC/aQute.runtime/src/ $DEST/runtime/src/main/java/
-
-mkdir -p $DEST/service/src/main/java
-rsync --cvs-exclude -r --exclude '**/*.class' --exclude '**/*.jar' $SRC/aQute.service/src/ $DEST/service/src/main/java/
-
-mkdir -p $DEST/core/src/main/bnd
-mkdir -p $DEST/core/src/main/java
-mkdir -p $DEST/core/src/main/resources
-mkdir -p $DEST/core/src/test/java
-mkdir -p $DEST/core/src/test/resources
-
-rsync --cvs-exclude -r $SRC/aQute.bnd/*.bnd $SRC/aQute.bnd/bnd.version $SRC/aQute.bnd/plugin.xml $DEST/core/src/main/bnd
-rsync --cvs-exclude -r --exclude 'test' --exclude 'biz' --exclude 'swing2swt' --exclude '**/*.class' --exclude '**/*.jar' --exclude '**/*.properties' --exclude '**/*Test.java' --exclude 'aQute/bnd/plugin' --exclude 'aQute/bnd/launch' --exclude 'aQute/bnd/junit' --exclude 'aQute/bnd/jareditor' --exclude 'aQute/bnd/classpath' $SRC/aQute.bnd/src/ $DEST/core/src/main/java/
-rsync --cvs-exclude -r --exclude '**/*.jar' $SRC/aQute.bnd/src/aQute/bnd/test $DEST/core/src/main/java/aQute/bnd/
-rsync --cvs-exclude -r $SRC/aQute.bnd/META-INF $SRC/aQute.bnd/icons $DEST/core/src/main/resources/
-rsync -avmr --filter='+ */' --filter='+ *.properties' --filter='- *' $SRC/aQute.bnd/src/ $DEST/core/src/main/resources/
-
-#rsync --cvs-exclude -r --exclude 'com.acme' --exclude 'iht' --exclude 'include.bnd' --exclude 'repo' --exclude 'resourcesonly' --exclude 'signing' --exclude 'split' --exclude '*.jar' --exclude '*.class' --exclude '*.jclass' --exclude '*.clazz' --exclude '*.bnd' --exclude '*.mf' --exclude '*.prop' --exclude '*.info' --exclude '*.spring' $SRC/aQute.bnd/src/test $DEST/core/src/test/java/
-#cd $SRC/aQute.bnd/src/test
-#rsync --cvs-exclude -r com.acme iht include.bnd repo resourcesonly signing split *.jar *.class *.jclass *.clazz *.bnd *.mf *.prop *.info *.spring $DEST/core/src/test/resources/test
-#cd -
-#rsync --cvs-exclude -r $SRC/aQute.bnd/test/ $DEST/core/src/test/resources/
-#rsync --cvs-exclude -r $SRC/aQute.bnd/bnd $DEST/core/src/test/resources/
-
-mkdir -p $DEST/compilerversions/src/main/java
-mkdir -p $DEST/compilerversions/src/main/bnd
-
-echo 'mkdir -p target/classes' > .cp.sh
-cat .cp.sh $SRC/aQute.bnd/compilerversions/compile.sh | sed 's|-cp src|-d target/classes -cp target/classes|' | sed 's|src/|src/main/java/|' > $DEST/compilerversions/compile.sh
-chmod +x $DEST/compilerversions/compile.sh
-rm .cp.sh
-cp $SRC/aQute.bnd/compilerversions/*.gif $DEST/compilerversions/
-cp $SRC/aQute.bnd/compilerversions/compilerversions.bnd $DEST/compilerversions/src/main/bnd
-rsync --cvs-exclude -r --exclude '**/*.class' $SRC/aQute.bnd/compilerversions/src/ $DEST/compilerversions/src/main/java
-
-mkdir -p $DEST/eclipse/src/main/java/aQute/bnd
-
-rsync --cvs-exclude -r --exclude 'test' --exclude 'aQute' --exclude '**/*.class' --exclude '**/*.jar' $SRC/aQute.bnd/src/ $DEST/eclipse/src/main/java/
-rsync --cvs-exclude -r $SRC/aQute.bnd/src/aQute/bnd/plugin $SRC/aQute.bnd/src/aQute/bnd/launch $SRC/aQute.bnd/src/aQute/bnd/junit $SRC/aQute.bnd/src/aQute/bnd/jareditor $SRC/aQute.bnd/src/aQute/bnd/classpath $DEST/eclipse/src/main/java/aQute/bnd
-
-#rsync --cvs-exclude -r $SRC/aQute.bnd/jar $DEST/core/src/test/resources
-mkdir -p $DEST/src/main/assembly
-mkdir -p $DEST/src/main/resources
-cp $SRC/aQute.bnd/plugin.xml $DEST/src/main/resources
-cp $SRC/aQute.bnd/FEATURE* $DEST
-cp $SRC/aQute.bnd/LICENSE $DEST
-cp $SRC/aQute.bnd/TODO $DEST
-cp $SRC/aQute.bnd/testreqs $DEST
-
-#echo "Perl back magic..."
-#perl -p -i -e 's|src/test|src/test/java/test|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|"bin"|"target/test-classes"|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|"aQute\.bnd"|"core"|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|TargetFolder=test|TargetFolder=src/test/resources|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|\"/=src/test|"/=src/test/java/test|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|extends TestCase|extends BaseTestCase|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|new File\("bin"\)|binDir|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|new File\("src"\)|srcDir|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|new File\("(.*)"\)|locateFile("\1")|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|locateFile\("src/|locateFile("|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|locateFile\("test"\)|testSrcDir|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|contains\("src/test|contains("test|g' $DEST/core/src/test/java/test/*.java
-#perl -p -i -e 's|\"src\"|srcDir.getAbsolutePath()|g' $DEST/core/src/test/java/test/*.java
-
-echo "Create Maven and Eclipse files..."
-cat > $DEST/pom.xml <<EOF
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
- <modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd-parent</artifactId>
- <version>${VERSION}</version>
- <packaging>pom</packaging>
- <description>
- A utility and plugin to wrap, build, or print bundles
- </description>
- <name>aQute Bundle Tool parent</name>
- <url>http://www.aQute.biz/Code/Bnd</url>
- <organization>
- <name>aQute SARL</name>
- <url>http://www.aQute.biz</url>
- </organization>
- <licenses>
- <license>
- <name>This material is licensed under the Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <modules>
- <module>libg</module>
- <module>core</module>
- <module>service</module>
- <module>runtime</module>
- <!--module>eclipse</module-->
- </modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/dist.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- append to the packaging phase. -->
- <goals>
- <goal>single</goal> <!-- goals == mojos -->
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-EOF
-
-cat > $DEST/core/pom.xml <<EOF
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
- <modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
- <artifactId>core</artifactId>
- <version>${VERSION}</version>
- <description>
- A utility and plugin to wrap, build, or print bundles
- </description>
- <name>aQute Bundle Tool - core</name>
- <url>http://www.aQute.biz/Code/Bnd</url>
- <organization>
- <name>aQute SARL</name>
- <url>http://www.aQute.biz</url>
- </organization>
- <licenses>
- <license>
- <name>This material is licensed under the Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>eclipse</id>
- <name>Eclipse repository</name>
- <url>http://repository.sonatype.org/content/repositories/eclipse</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>libg</artifactId>
- <version>\${project.version}</version>
- </dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>service</artifactId>
- <version>\${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>3.1.200.v20070605</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
-EOF
-
-cat > $DEST/libg/pom.xml <<EOF
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
- <modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
- <artifactId>libg</artifactId>
- <version>${VERSION}</version>
- <description>
- A utility and plugin to wrap, build, or print bundles
- </description>
- <name>aQute Bundle Tool - libg</name>
- <url>http://www.aQute.biz/Code/Bnd</url>
- <organization>
- <name>aQute SARL</name>
- <url>http://www.aQute.biz</url>
- </organization>
- <licenses>
- <license>
- <name>This material is licensed under the Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-EOF
-
-cat > $DEST/service/pom.xml <<EOF
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
- <modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
- <artifactId>service</artifactId>
- <version>${VERSION}</version>
- <description>
- A utility and plugin to wrap, build, or print bundles
- </description>
- <name>aQute Bundle Tool - service</name>
- <url>http://www.aQute.biz/Code/Bnd</url>
- <organization>
- <name>aQute SARL</name>
- <url>http://www.aQute.biz</url>
- </organization>
- <licenses>
- <license>
- <name>This material is licensed under the Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-EOF
-
-cat > $DEST/runtime/pom.xml <<EOF
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
- <modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
- <artifactId>runtime</artifactId>
- <version>${VERSION}</version>
- <description>
- A utility and plugin to wrap, build, or print bundles
- </description>
- <name>aQute Bundle Tool - runtime</name>
- <url>http://www.aQute.biz/Code/Bnd</url>
- <organization>
- <name>aQute SARL</name>
- <url>http://www.aQute.biz</url>
- </organization>
- <licenses>
- <license>
- <name>This material is licensed under the Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>eclipse</id>
- <name>Eclipse repository</name>
- <url>http://repository.sonatype.org/content/repositories/eclipse</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.5.0.v20090520</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
-EOF
-
-cat > $DEST/eclipse/pom.xml <<EOF
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
- <modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
- <artifactId>eclipse</artifactId>
- <version>${VERSION}</version>
- <description>
- A utility and plugin to wrap, build, or print bundles
- </description>
- <name>aQute Bundle Tool - eclipse support</name>
- <url>http://www.aQute.biz/Code/Bnd</url>
- <organization>
- <name>aQute SARL</name>
- <url>http://www.aQute.biz</url>
- </organization>
- <licenses>
- <license>
- <name>This material is licensed under the Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>eclipse</id>
- <name>Eclipse repository</name>
- <url>http://repository.sonatype.org/content/repositories/eclipse</url>
- </repository>
- </repositories>
- <!-- All org.eclipse.* dependencies require that you get the Eclipse 3.2 distribution (NOT 3.2.x)
- and manually deploy the various plugins to your repository, e.g. using mvn deploy:deploy-file.
- Which plugin files to deploy should be fairly straight forward to figure out given the
- artifactId and version below -->
- <dependencies>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <!--version>3.2.0-v20060601</version-->
- <version>3.2.1.R32x_v20060919</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
- <version>3.2.0.v20060603</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.resources</artifactId>
- <!--version>3.2.0.v20060603</version-->
- <version>3.2.1.R32x_v20060914</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.runtime</artifactId>
- <version>3.2.0.v20060603</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.jobs</artifactId>
- <version>3.2.0.v20060603</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.registry</artifactId>
- <!--version>3.2.0.v20060603</version-->
- <version>3.2.1.R32x_v20060814</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.jface</artifactId>
- <!-- version>3.2.0-I20060605-1400</version-->
- <version>3.2.1.M20060908-1000</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.workbench</artifactId>
- <!--version>3.2.0-I20060605-1400</version-->
- <version>3.2.1.M20060906-0800</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
- <!--version>3.2.0.v3232</version-->
- <version>3.2.1.v3235</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- <!--version>3.2.0.v_671</version-->
- <version>3.2.1.v_677_R32x</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>core</artifactId>
- <version>\${project.version}</version>
- </dependency>
- </dependencies>
-</project>
-EOF
-
-cat > $DEST/core/.classpath <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.iam.jdt.core.mavenClasspathContainer"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
-EOF
-
-cat > $DEST/core/.project <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.iam.jdt.core.mavenIncrementalBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.iam.jdt.core.mavenNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
-EOF
-
-#cat > $DEST/core/src/test/java/test/BaseTestCase.java <<EOF
-#package test;
-#
-#import java.io.File;
-#
-#import junit.framework.TestCase;
-#
-#public class BaseTestCase extends TestCase {
-#
-# protected File binDir;
-# protected File srcDir;
-# protected File testSrcDir;
-#
-# protected void setUp() throws Exception {
-# super.setUp();
-# binDir = new File("target/test-classes");
-# if (!binDir.exists()) {
-# binDir = new File("bin");
-# }
-# srcDir = new File("src/test/java");
-# testSrcDir = new File(srcDir, "test");
-# }
-#
-# protected File locateFile(String relPath) {
-# File found = null;
-# if (getClass().getResource("/" + relPath) != null) {
-# String path = getClass().getResource("/" + relPath).getPath();
-# path = path.replace("file:", "");
-# System.out.println(path);
-# found = new File(path);
-# if (!found.exists()) {
-# found = null;
-# }
-# }
-# if (found == null) {
-# found = new File("src/test/resources/" + relPath);
-# if (!found.exists()) {
-# found = new File("src/test/java/" + relPath);
-# }
-# }
-# return found;
-# }
-#}
-#EOF
-
-cat > $DEST/eclipse/.classpath <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.iam.jdt.core.mavenClasspathContainer"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
-EOF
-
-cat > $DEST/eclipse/.project <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>eclipse</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.iam.jdt.core.mavenIncrementalBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.iam.jdt.core.mavenNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
-EOF
-
-cat > $DEST/libg/.classpath <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.iam.jdt.core.mavenClasspathContainer"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
-EOF
-
-cat > $DEST/libg/.project <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>libg</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.iam.jdt.core.mavenIncrementalBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.iam.jdt.core.mavenNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
-EOF
-
-cat > $DEST/runtime/.classpath <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.iam.jdt.core.mavenClasspathContainer"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
-EOF
-
-cat > $DEST/runtime/.project <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>runtime</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.iam.jdt.core.mavenIncrementalBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.iam.jdt.core.mavenNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
-EOF
-
-cat > $DEST/service/.classpath <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.iam.jdt.core.mavenClasspathContainer"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
-EOF
-
-cat > $DEST/service/.project <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>service</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.iam.jdt.core.mavenIncrementalBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.iam.jdt.core.mavenNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
-EOF
-
-cat > $DEST/src/main/assembly/dist.xml <<EOF
-<assembly>
- <id>dist</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <excludes>
- <exclude>biz.aQute:runtime:*</exclude>
- </excludes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <outputDirectory>OSGI-OPT/src</outputDirectory>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>DefaultPackage.java</exclude>
- <exclude>aQute/lib/signing/**</exclude>
- <exclude>aQute/lib/spring/**</exclude>
- <exclude>aQute/libg/asn1/**</exclude>
- <exclude>aQute/libg/classdump/**</exclude>
- <exclude>aQute/libg/clauses/**</exclude>
- <exclude>aQute/libg/log/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <unpack>true</unpack>
- <unpackOptions>
- <includes>
- <include>aQute/**</include>
- <include>icons/**</include>
- </includes>
- <!-- Doesn't seem to work, TODO: report bug -->
- <excludes>
- <exclude>*.classes</exclude>
- <exclude>DefaultPackage.class</exclude>
- <exclude>aQute/lib/signing/**</exclude>
- <exclude>aQute/lib/spring/**</exclude>
- <exclude>aQute/libg/asn1/**</exclude>
- <exclude>aQute/libg/classdump/**</exclude>
- <exclude>aQute/libg/clauses/**</exclude>
- <exclude>aQute/libg/log/**</exclude>
- </excludes>
- </unpackOptions>
- <outputDirectory></outputDirectory>
- </binaries>
- </moduleSet>
- </moduleSets>
- <fileSets>
- <fileSet>
- <includes>
- <include>\${project.basedir}/LICENSE</include>
- <include>\${project.basedir}/src/main/resources/*.xml</include>
- </includes>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
-</assembly>
-EOF
-
-cat > $DEST/src/main/resources/pom.xml <<EOF
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
- <modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- <version>${VERSION}</version>
- <packaging>jar</packaging>
- <description>
- A utility and plugin to wrap, build, or print bundles
- </description>
- <name>aQute Bundle Tool</name>
- <url>http://www.aQute.biz/Code/Bnd</url>
- <organization>
- <name>aQute SARL</name>
- <url>http://www.aQute.biz</url>
- </organization>
- <licenses>
- <license>
- <name>This material is licensed under the Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-</project>
-EOF
-
-cat > $DEST/build <<EOF
-#!/bin/sh
-mvn -Dmaven.test.skip=true install
-EOF
-
-echo "Done."
More information about the pkg-java-commits
mailing list