[modello] 07/32: Updates from trygvis to build all maven jars

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Jul 9 10:49:20 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch modello-1.1
in repository modello.

commit cc99a4057c5381281113afabcb70cf34d94fec38
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Sun May 27 22:42:28 2007 +0000

    Updates from trygvis to build all maven jars
---
 debian/build.xml | 118 +++++++++++++++++++------------------------------------
 debian/control   |   3 +-
 debian/rules     |  15 ++++---
 3 files changed, 52 insertions(+), 84 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 75fa03d..d33cbd1 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -1,81 +1,45 @@
 <?xml version="1.0"?>
-
+ 
+<project name="pkg-java" default="package" basedir="..">
+ 
+    <property file="debian/build.properties"/>
+    <property name="maven.test.skip" value="true"/>
+    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+ 
+    <target name="clean">
+        <delete dir="build"/>
 <!--
-      This build.xml file was written for the Debian project.
-      This file copyright (c) Paul Cager <paul-debian at home.paulcager.org>
-
-        This software and documentation is provided "as is," and
-        the copyright holders and contributing author(s) make no
-        representations or warranties, express or implied, including
-        but not limited to, warranties of merchantability or fitness
-        for any particular purpose or that the use of the software or
-        documentation will not infringe any third party patents,
-        copyrights, trademarks or other rights. 
-
-        The copyright holders and contributing author(s) will not be
-        liable for any direct, indirect, special or consequential damages
-        arising out of any use of the software or documentation, even if
-        advised of the possibility of such damage.
-
-        Permission is hereby granted to use, copy, modify, and distribute
-        this source code, or portions hereof, documentation and executables,
-        for any purpose, without fee, subject to the following restrictions:
-
-        1. The origin of this source code must not be misrepresented.
-        2. Altered versions must be plainly marked as such and must
-           not be misrepresented as being the original source.
-        3. This Copyright notice may not be removed or altered from any
-           source or altered source distribution.
+        <ant target="clean" antfile="/usr/share/maven-ant-helper/build.xml" dir="modello-test"/>
 -->
-
-<project name="pkg-java" default="package" basedir="..">
-
-<target name="package" depends="jar,javadoc"/>
-
-<target name="init">
-	<property name="src.dir" value="."/>
-	<property name="build.dir" value="build"/>
-	<property name="jar.suffix" value="-${version}.jar"/>
-	<property name="jar" value="${build.dir}/${package}-${version}.jar"/>
-	<property name="javadoc.dir" value="${build.dir}/doc/api"/>
-	<echo message="Classpath: ${java.class.path}" />
-</target>
-
-<target name="compile" depends="init">
-	<mkdir dir="${build.dir}"/>
-	<javac srcdir="${src.dir}"
-		destdir="${build.dir}"
-		debug="on">
-		<include name="**/main/java/**/*.java"/>
-	</javac>
-</target>
-
-<target name="jar" depends="compile">
-	<delete file="${jar}"/>
-
-	<mkdir dir="${build.dir}/META-INF/maven/org.codehaus.modello/modello-core" />
-	<copy file="./modello-core/pom.xml" todir="${build.dir}/META-INF/maven/org.codehaus.modello/modello-core" />
-
-	<jar jarfile="${build.dir}/${package}${jar.suffix}"
-		basedir="${build.dir}"
-		includes="**/*.class,**/*.properties,**/pom.xml" />
-</target>
-
-<target name="javadoc" depends="init">
-	<mkdir dir="${javadoc.dir}"/>
-	<javadoc 
-		packagenames="org.codehaus.*"
-		sourcepath="modello-core/src/main/java/:modello-db-keywords/src/main/java/"
-		destdir="${javadoc.dir}"
-		author="true"
-		version="true"
-		windowtitle="${package} API"
-		doctitle="${package} - ${version}"
-		classpath="${java.class.path}" >
-	</javadoc>
-</target>
-
-<target name="clean" depends="init">
-	<delete dir="${build.dir}"/>
-</target>
+        <ant target="clean" antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-core"/>
+        <ant target="clean" antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-plugins/modello-plugin-xml"/>
+        <ant target="clean" antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-plugins/modello-plugin-xpp3"/>
+    </target>
+ 
+    <target name="package">
+<!-- Disabled as it depends on too much Maven stuff
+        <ant target="package" antfile="/usr/share/maven-ant-helper/build.xml" dir="modello-test">
+            <property name="artifactId" value="modello-test"/>
+        </ant>
+-->
+        <ant target="package" antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-core">
+            <property name="artifactId" value="modello-core"/>
+        </ant>
+        <ant target="package" antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-plugins/modello-plugin-xml">
+            <property name="artifactId" value="modello-plugin-xml"/>
+        </ant>
+        <ant target="package" antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-plugins/modello-plugin-xpp3">
+            <property name="artifactId" value="modello-plugin-xpp3"/>
+        </ant>
+    </target>
+ 
+    <target name="javadoc">
+        <javadoc destdir="${javadoc.dir}">
+            <sourcepath>
+                <fileset dir="modello-core/src/main/java"/> 
+            </sourcepath>
+            <packageset dir="modello-core/src/main/java/"/>
+        </javadoc>
+    </target>
+ 
 </project>
diff --git a/debian/control b/debian/control
index b4c0ee2..f3d856c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-jav
 		     libplexus-container-default-java, libplexus-container-default-java-doc,
 		     libplexus-interactivity-api-java, libplexus-interactivity-api-java-doc,
 		     libdom4j-java, libdom4j-java-doc,
-		     velocity, velocity-doc
+		     velocity, velocity-doc,
+		     maven-ant-helper
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
 Standards-Version: 3.7.2
 
diff --git a/debian/rules b/debian/rules
index 3a06657..1a84307 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,11 +16,11 @@ DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-tra
 			/usr/share/java/libplexus-utils.jar \
                         /usr/share/java/commons-lang.jar
 
-DEB_ANT_BUILD_TARGET := package
+DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := ./debian/build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 #DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
-API_DOCS             := build/doc/api
+API_DOCS             := build/javadoc
 SVN                  := https://svn.codehaus.org/modello/tags/modello-$(VERSION)
 
 
@@ -29,14 +29,17 @@ get-orig-source:
 	mkdir orig_tmp
 	cd orig_tmp && \
 		svn export -q $(SVN) $(PACKAGE) && \
-		cd modello; rm -rf modello-maven-plugin modello-plugins modello-plugins-sandbox modello-test modello-site; cd .. && \
+		cd modello; rm -rf modello-maven-plugin modello-plugins-sandbox modello-site; cd .. && \
 		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
 	rm -rf orig_tmp
-	
 
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java build/$(PACKAGE)-$(VERSION).jar usr/share/java && \
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar; \
+	dh_install -plib$(PACKAGE)-java modello-core/build/$(PACKAGE)-core-$(VERSION).jar usr/share/java
+	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-core-$(VERSION).jar usr/share/java/$(PACKAGE)-core.jar
+	dh_install -plib$(PACKAGE)-java modello-plugins/modello-plugin-xml/build/$(PACKAGE)-plugin-xml-$(VERSION).jar usr/share/java
+	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-plugin-xml-$(VERSION).jar usr/share/java/$(PACKAGE)-plugin-xml.jar
+	dh_install -plib$(PACKAGE)-java modello-plugins/modello-plugin-xpp3/build/$(PACKAGE)-plugin-xpp3-$(VERSION).jar usr/share/java
+	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-plugin-xpp3-$(VERSION).jar usr/share/java/$(PACKAGE)-plugin-xpp3.jar
 
 binary-post-install/lib$(PACKAGE)-java-doc::
 	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/modello.git



More information about the pkg-java-commits mailing list