Author: onkarshinde-guest Date: 2009-11-25 15:15:25 +0000 (Wed, 25 Nov 2009) New Revision: 11125
Added: trunk/cruisecontrol/debian/README.Debian trunk/cruisecontrol/debian/cruisecontrol-documentation.install trunk/cruisecontrol/debian/cruisecontrol-jsp.install trunk/cruisecontrol/debian/cruisecontrol-jsp.links trunk/cruisecontrol/debian/cruisecontrol.dirs trunk/cruisecontrol/debian/cruisecontrol.install trunk/cruisecontrol/debian/cruisecontrol.links trunk/cruisecontrol/debian/patches/03_build_fixes.diff Removed: trunk/cruisecontrol/debian/install Modified: trunk/cruisecontrol/debian/README.source trunk/cruisecontrol/debian/ant.properties trunk/cruisecontrol/debian/control trunk/cruisecontrol/debian/patches/01_disable_components.diff trunk/cruisecontrol/debian/patches/series trunk/cruisecontrol/debian/rules Log: more progress on cruisecontrol Added: trunk/cruisecontrol/debian/README.Debian =================================================================== --- trunk/cruisecontrol/debian/README.Debian (rev 0) +++ trunk/cruisecontrol/debian/README.Debian 2009-11-25 15:15:25 UTC (rev 11125) @@ -0,0 +1,9 @@ +Following components of distributed by upstread are not available in Debian +package for various reasons. + +Jabber publisher - Build/Runtime dependency not available in Debian. +Origo publisher - Build/Runtime dependency not available in Debian. +SourceForge Enterprise Edition publishers - Build/Runtime dependency not available in Debian. +Weblog publisher - Doesn't build with xmlrpc jar version available in Debian. +X10 publisher - Build/Runtime dependency not available in Debian. +Charts module in reporting package - Doesn't build with jfreechart version available in Debian. Modified: trunk/cruisecontrol/debian/README.source =================================================================== --- trunk/cruisecontrol/debian/README.source 2009-11-25 11:59:43 UTC (rev 11124) +++ trunk/cruisecontrol/debian/README.source 2009-11-25 15:15:25 UTC (rev 11125) @@ -1,33 +1,4 @@ -This package uses CDBS (and therefore simple-patchsys.mk) in order to -apply patches to the upstream source. Patches are stored in -debian/patches and their filenames usually end in .patch or .diff . -For further details, see the man page for cdbs-edit-patch. +This package uses quilt in order to apply patches to the upstream source. +Patches are stored in debian/patches. -All commands described below should be run from the top directory of the -package source tree, unless otherwise stated. - - * To generate the fully patched source, in a form ready for - editing, that would be built to create Debian packages, run: - - make -f debian/rules apply-patches - - Note: This should happen automatically when you run - dpkg-source -x on a CDBS simple-patchsys.mk source package. - - * To modify the source and save those modifications so that - they will be applied when building the package, pick a - suitably informative patch file name, for example - 01_add_README.source_file.patch, and then run: - - cdbs-edit-patch 01_add_README.source_file.patch - - This will place you in a new shell in a temporary copy of the - source tree. Make your desired modifications to it, and then - exit the shell to create the patch file containing them (this - file will appear in debian/patches). - - * To remove source modifications that are currently being - applied when building the package, run: - - make -f debian/rules reverse-patches - +For further details, check /usr/share/doc/quilt/README.source. Modified: trunk/cruisecontrol/debian/ant.properties =================================================================== --- trunk/cruisecontrol/debian/ant.properties 2009-11-25 11:59:43 UTC (rev 11124) +++ trunk/cruisecontrol/debian/ant.properties 2009-11-25 15:15:25 UTC (rev 11125) @@ -1 +1,2 @@ emma.classpath=/usr/share/java/emma.jar:/usr/share/java/emma_ant.jar +checkstyle.jar=/usr/share/java/checkstyle.jar:/usr/share/java/antlr.jar:/usr/share/java/commons-beanutils.jar:/usr/share/java/commons-collections.jar Modified: trunk/cruisecontrol/debian/control =================================================================== --- trunk/cruisecontrol/debian/control 2009-11-25 11:59:43 UTC (rev 11124) +++ trunk/cruisecontrol/debian/control 2009-11-25 15:15:25 UTC (rev 11125) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Onkar Shinde <onkarshi...@ubuntu.com> Build-Depends: debhelper (>= 5), cdbs, ant, quilt, libemma-java -Build-Depends-Indep: default-jdk, ant-optional, checkstyle, ivy, junit4, libcommons-httpclient-java, libcommons-net-java, libcommons-validator-java, libfast-md5-java, libgnumail-java, libjdom1-java, libjetty-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java, libplexus-component-api-java, libwagon-java, libxstream-java +Build-Depends-Indep: default-jdk, ant-optional, aspectj, checkstyle, ivy, junit4, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, libcommons-net-java, libcommons-validator-java, libfast-md5-java, libgnumail-java, libjdom1-java, libjetty-java, libjoda-time-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java, libplexus-component-api-java, libservlet2.5-java, libspring-beans-2.5-java, libspring-webmvc-2.5-java, libtomcat6-java, libwagon-java, libxstream-java Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cruisecontrol Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cruisecontrol @@ -12,7 +12,27 @@ Package: cruisecontrol Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless +Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, ant, ivy, junit4, libcommons-httpclient-java, libcommons-net-java, libcommons-validator-java, libfast-md5-java, libgnumail-java, libjdom1-java, libjetty-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java, libservlet2.5-java, libxstream-java +Recommends: cruisecontrol-jsp +Suggests: cruisecontrol-dashboard, cruisecontrol-documentation Description: place holder short description place holder long description +Package: cruisecontrol-jsp +Architecture: all +Depends: ${misc:Depends}, cruisecontrol (= ${binary:Version}) +Description: place holder short description + place holder long description + +Package: cruisecontrol-dashboard +Architecture: all +Depends: ${misc:Depends}, cruisecontrol (= ${binary:Version}) +Description: place holder short description + place holder long description + +Package: cruisecontrol-documentation +Architecture: all +Depends: ${misc:Depends} +Description: place holder short description + place holder long description + Added: trunk/cruisecontrol/debian/cruisecontrol-documentation.install =================================================================== --- trunk/cruisecontrol/debian/cruisecontrol-documentation.install (rev 0) +++ trunk/cruisecontrol/debian/cruisecontrol-documentation.install 2009-11-25 15:15:25 UTC (rev 11125) @@ -0,0 +1 @@ +target/website/* usr/share/cruisecontrol/webapps/documentation Added: trunk/cruisecontrol/debian/cruisecontrol-jsp.install =================================================================== --- trunk/cruisecontrol/debian/cruisecontrol-jsp.install (rev 0) +++ trunk/cruisecontrol/debian/cruisecontrol-jsp.install 2009-11-25 15:15:25 UTC (rev 11125) @@ -0,0 +1 @@ +binaryrelease/JETTY-WORKDIR-README.txt usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/work/ Added: trunk/cruisecontrol/debian/cruisecontrol-jsp.links =================================================================== --- trunk/cruisecontrol/debian/cruisecontrol-jsp.links (rev 0) +++ trunk/cruisecontrol/debian/cruisecontrol-jsp.links 2009-11-25 15:15:25 UTC (rev 11125) @@ -0,0 +1,13 @@ +usr/share/cruisecontrol/lib/cruisecontrol.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/cruisecontrol.jar +usr/share/java/commons-lang.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/commons-lang.jar +usr/share/java/commons-logging.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/commons-logging.jar +usr/share/java/el-api-2.1.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/el-api-2.1.jar +usr/share/java/jaxen.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/jaxen.jar +usr/share/java/jdom1.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/jdom1.jar +usr/share/java/log4j.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/log4j.jar +usr/share/java/mx4j.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/mx4j.jar +usr/share/java/mx4j-remote.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/mx4j-remote.jar +usr/share/java/saxon9.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/saxon9.jar +usr/share/java/serializer.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/serializer.jar +usr/share/java/xercesImpl.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/xercesImpl.jar +usr/share/java/xml-apis.jar usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/xml-apis.jar Added: trunk/cruisecontrol/debian/cruisecontrol.dirs =================================================================== --- trunk/cruisecontrol/debian/cruisecontrol.dirs (rev 0) +++ trunk/cruisecontrol/debian/cruisecontrol.dirs 2009-11-25 15:15:25 UTC (rev 11125) @@ -0,0 +1,3 @@ +var/cache/cruisecontrol/artifacts +var/cache/cruisecontrol/projects +var/log/cruisecontrol Added: trunk/cruisecontrol/debian/cruisecontrol.install =================================================================== --- trunk/cruisecontrol/debian/cruisecontrol.install (rev 0) +++ trunk/cruisecontrol/debian/cruisecontrol.install 2009-11-25 15:15:25 UTC (rev 11125) @@ -0,0 +1,3 @@ +target/binzip/README.txt usr/share/cruisecontrol/ +binaryrelease/etc/* etc/cruisecontrol/ +main/dist/*.jar usr/share/cruisecontrol/lib/ Added: trunk/cruisecontrol/debian/cruisecontrol.links =================================================================== --- trunk/cruisecontrol/debian/cruisecontrol.links (rev 0) +++ trunk/cruisecontrol/debian/cruisecontrol.links 2009-11-25 15:15:25 UTC (rev 11125) @@ -0,0 +1,44 @@ +etc/cruisecontrol usr/share/cruisecontrol/etc +var/cache/cruisecontrol/artifacts usr/share/cruisecontrol/artifacts +var/cache/cruisecontrol/projects usr/share/cruisecontrol/projects +var/log/cruisecontrol usr/share/cruisecontrol/logs +usr/share/java/activation.jar usr/share/cruisecontrol/lib/activation.jar +usr/share/java/ant.jar usr/share/cruisecontrol/lib/ant.jar +usr/share/java/ant-launcher.jar usr/share/cruisecontrol/lib/ant-launcher.jar +usr/share/java/commons-codec.jar usr/share/cruisecontrol/lib/commons-codec.jar +usr/share/java/commons-httpclient.jar usr/share/cruisecontrol/lib/commons-httpclient.jar +usr/share/java/commons-logging.jar usr/share/cruisecontrol/lib/commons-logging.jar +usr/share/java/commons-net.jar usr/share/cruisecontrol/lib/commons-net.jar +usr/share/java/commons-validator.jar usr/share/cruisecontrol/lib/commons-validator.jar +usr/share/java/emma_ant.jar usr/share/cruisecontrol/lib/emma_ant.jar +usr/share/java/emma.jar usr/share/cruisecontrol/lib/emma.jar +usr/share/java/fast-md5.jar usr/share/cruisecontrol/lib/fast-md5.jar +usr/share/java/ivy.jar usr/share/cruisecontrol/lib/ivy.jar +usr/share/java/oro.jar usr/share/cruisecontrol/lib/oro.jar +usr/share/java/jaxen.jar usr/share/cruisecontrol/lib/jaxen.jar +usr/share/java/jdom.jar usr/share/cruisecontrol/lib/jdom.jar +usr/share/java/jetty.jar usr/share/cruisecontrol/lib/jetty.jar +usr/share/java/jetty-ajp.jar usr/share/cruisecontrol/lib/jetty-ajp.jar +usr/share/java/jetty-util.jar usr/share/cruisecontrol/lib/jetty-util.jar +usr/share/java/jsp-2.1.jar usr/share/cruisecontrol/lib/jsp-2.1.jar +usr/share/java/jsp-api-2.1.jar usr/share/cruisecontrol/lib/jsp-api-2.1.jar +usr/share/java/jug-lgpl.jar usr/share/cruisecontrol/lib/jug-lgpl.jar +usr/share/java/junit4.jar usr/share/cruisecontrol/lib/junit4.jar +usr/share/java/log4j.jar usr/share/cruisecontrol/lib/log4j.jar +usr/share/java/gnumail.jar usr/share/cruisecontrol/lib/mail.jar +usr/share/java/maven-embedder.jar usr/share/cruisecontrol/lib/maven-embedder.jar +usr/share/java/mx4j.jar usr/share/cruisecontrol/lib/mx4j.jar +usr/share/java/mx4j-remote.jar usr/share/cruisecontrol/lib/mx4j-remote.jar +usr/share/java/mx4j-tools.jar usr/share/cruisecontrol/lib/mx4j-tools.jar +usr/share/java/saxon9-dom.jar usr/share/cruisecontrol/lib/saxon9-dom.jar +usr/share/java/saxon9.jar usr/share/cruisecontrol/lib/saxon9.jar +usr/share/java/serializer.jar usr/share/cruisecontrol/lib/serializer.jar +usr/share/java/servlet-api-2.5.jar usr/share/cruisecontrol/lib/servlet-api-2.5.jar +usr/share/java/smack.jar usr/share/cruisecontrol/lib/smack.jar +usr/share/java/smackx.jar usr/share/cruisecontrol/lib/smackx.jar +usr/share/java/x10.jar usr/share/cruisecontrol/lib/x10.jar +usr/share/java/xercesImpl.jar usr/share/cruisecontrol/lib/xercesImpl.jar +usr/share/java/xml-apis.jar usr/share/cruisecontrol/lib/xml-apis.jar +usr/share/java/xmlrpc.jar usr/share/cruisecontrol/lib/xmlrpc.jar +usr/share/java/xpp3.jar usr/share/cruisecontrol/lib/xpp3.jar +usr/share/java/xstream.jar usr/share/cruisecontrol/lib/xstream.jar Deleted: trunk/cruisecontrol/debian/install =================================================================== --- trunk/cruisecontrol/debian/install 2009-11-25 11:59:43 UTC (rev 11124) +++ trunk/cruisecontrol/debian/install 2009-11-25 15:15:25 UTC (rev 11125) @@ -1,4 +0,0 @@ -electric.jar usr/share/java/ -debian/electric.svg usr/share/icons/hicolor/scalable/apps/ -debian/electric.desktop usr/share/applications/ -debian/wrappers/electric usr/bin/ Modified: trunk/cruisecontrol/debian/patches/01_disable_components.diff =================================================================== --- trunk/cruisecontrol/debian/patches/01_disable_components.diff 2009-11-25 11:59:43 UTC (rev 11124) +++ trunk/cruisecontrol/debian/patches/01_disable_components.diff 2009-11-25 15:15:25 UTC (rev 11125) @@ -1,7 +1,7 @@ Index: cruisecontrol-2.8.2/main/build.xml =================================================================== ---- cruisecontrol-2.8.2.orig/main/build.xml 2009-11-19 19:01:43.000000000 +0530 -+++ cruisecontrol-2.8.2/main/build.xml 2009-11-19 19:14:09.000000000 +0530 +--- cruisecontrol-2.8.2.orig/main/build.xml 2009-11-22 23:24:34.000000000 +0530 ++++ cruisecontrol-2.8.2/main/build.xml 2009-11-24 12:02:00.000000000 +0530 @@ -136,14 +136,20 @@ <attribute name="classpathref" default="project.classpath" /> <element name="nested" implicit="true" optional="true" /> @@ -38,3 +38,60 @@ </compile-macro> <copy todir="${test.classes}"> +Index: cruisecontrol-2.8.2/reporting/jsp/build.xml +=================================================================== +--- cruisecontrol-2.8.2.orig/reporting/jsp/build.xml 2009-11-22 23:24:34.000000000 +0530 ++++ cruisecontrol-2.8.2/reporting/jsp/build.xml 2009-11-24 12:02:25.000000000 +0530 +@@ -152,19 +152,23 @@ + <attribute name="classpathref" default="project.runtime.classpath" /> + <element name="nested" implicit="true" optional="true" /> + <sequential> +- <javac destdir="@{destdir}" debug="true" deprecation="true" fork="true" source="1.5" target="1.5" compiler="javac1.5" classpathref="@{classpathref}" srcdir="@{srcdir}"> ++ <javac sourcepath="" destdir="@{destdir}" debug="true" deprecation="true" fork="true" source="1.5" target="1.5" compiler="javac1.5" classpathref="@{classpathref}" srcdir="@{srcdir}"> + <nested /> + </javac> + </sequential> + </macrodef> + + <target name="compile" depends="init"> +- <compile-macro/> ++ <compile-macro> ++ <exclude name="**/*ChartData.java"/> ++ </compile-macro> + </target> + + <target name="compile-test" depends="compile" + description="Compile test code"> +- <compile-macro srcdir="${test}" destdir="${test.classes}"/> ++ <compile-macro srcdir="${test}" destdir="${test.classes}"> ++ <exclude name="**/*ChartDataTest.java"/> ++ </compile-macro> + </target> + + <target name="test" depends="compile-test" unless="test.skip" description="Executes the unit tests"> +@@ -220,7 +224,7 @@ + <copy file="webwork.properties" todir="${classes}"/> + <copy file="xwork.xml" todir="${classes}"/> + <war warfile="${deploy.dir}/cruisecontrol.war" webxml="${temp.dir}/web.xml"> +- <fileset dir="${webcontent}" excludes="WEB-INF/web.xml"/> ++ <fileset dir="${webcontent}" excludes="WEB-INF/web.xml,metrics.jsp"/> + <classes dir="${classes}"/> + <lib refid="req.libs"/> + <lib file="../../main/dist/cruisecontrol.jar"/> +Index: cruisecontrol-2.8.2/reporting/jsp/webcontent/main.jsp +=================================================================== +--- cruisecontrol-2.8.2.orig/reporting/jsp/webcontent/main.jsp 2009-11-22 23:24:34.000000000 +0530 ++++ cruisecontrol-2.8.2/reporting/jsp/webcontent/main.jsp 2009-11-24 12:02:00.000000000 +0530 +@@ -72,9 +72,9 @@ + <cruisecontrol:loglink id="logs_url"/> + <cruisecontrol:tab name="log" url="<%=logs_url%>" label="XML Log File" /> + +- <cruisecontrol:tab name="metrics" label="Metrics" > +- <%@ include file="metrics.jsp" %> +- </cruisecontrol:tab> ++ <!--cruisecontrol:tab name="metrics" label="Metrics" --> ++ <!--%@ include file="metrics.jsp" %--> ++ <!--/cruisecontrol:tab--> + + <% if (rmiEnabled) { %> + <cruisecontrol:tab name="config" label="Config"> Added: trunk/cruisecontrol/debian/patches/03_build_fixes.diff =================================================================== --- trunk/cruisecontrol/debian/patches/03_build_fixes.diff (rev 0) +++ trunk/cruisecontrol/debian/patches/03_build_fixes.diff 2009-11-25 15:15:25 UTC (rev 11125) @@ -0,0 +1,57 @@ +Index: cruisecontrol-2.8.2/reporting/jsp/build.xml +=================================================================== +--- cruisecontrol-2.8.2.orig/reporting/jsp/build.xml 2009-11-24 19:51:07.000000000 +0530 ++++ cruisecontrol-2.8.2/reporting/jsp/build.xml 2009-11-24 19:51:07.000000000 +0530 +@@ -98,6 +98,7 @@ + <pathelement location="${classes}"/> + <pathelement location="${test.classes}"/> + <pathelement location="../../main/target/test-classes"/> ++ <pathelement path="${java.class.path}" /> + </path> + + <target name="clean"> +Index: cruisecontrol-2.8.2/reporting/dashboard/build.xml +=================================================================== +--- cruisecontrol-2.8.2.orig/reporting/dashboard/build.xml 2009-11-24 19:46:08.000000000 +0530 ++++ cruisecontrol-2.8.2/reporting/dashboard/build.xml 2009-11-24 19:51:07.000000000 +0530 +@@ -74,6 +74,7 @@ + <path id="lib.classpath"> + <fileset dir="${ccmain.dist.dir}" includes="cruisecontrol.jar" /> + <fileset dir="${basedir}/lib" includes="**/*.jar" /> ++ <pathelement path="${java.class.path}" /> + </path> + + <path id="emma.lib.dir"> +@@ -541,7 +542,7 @@ + <target name="--run.jwebunit.tests" depends="--prepare.functional.tests, -start.jwebunit.functional.testing.server, -prepare.functional.test.property, -jwebunit-tests, -stop.jwebunit.functional.testing.server, -check.jwebunit.testing.result" /> + + <target name="--start-jetty-server" depends="--package.development, -start.jetty.server.with.sys" /> +- <target name="--run.all.tests" depends="--check.license, checkstyle, --run.unit.tests, smoke, --run.jwebunit.tests" /> ++ <target name="--run.all.tests" depends="checkstyle, --run.unit.tests, smoke, --run.jwebunit.tests" /> + <target name="--package.production" depends="clean, --compile, --war.production" /> + <target name="--package.development" depends="clean, --compile, -compile-tests, --war.development" /> + <target name="--prepare.smoke.tests" depends="--compile, -compile-tests, --war.smoke" /> +@@ -569,7 +570,7 @@ + <target name="checkstyle" description="checkstyle"> + <checkstyle-macro reportsdir="${reports.dir}" configfile="${checkstyle.config}" checkstylecache="${checkstyle.cache}" testdir="${unittest.dir}"> + +- <taskdef classpathref="lib.classpath" resource="checkstyletask.properties" /> ++ <taskdef classpath="${checkstyle.jar}" resource="checkstyletask.properties" /> + + </checkstyle-macro> + </target> +Index: cruisecontrol-2.8.2/build.xml +=================================================================== +--- cruisecontrol-2.8.2.orig/build.xml 2009-11-24 19:46:08.000000000 +0530 ++++ cruisecontrol-2.8.2/build.xml 2009-11-24 19:53:00.000000000 +0530 +@@ -134,8 +134,8 @@ + prefix="${cc.bin.zip.prefix}"/> + <zipfileset dir="target/binzip" prefix="${cc.bin.zip.prefix}"/> + <!-- Force file and dir mode as ant has problem copying connectfour.zip's file permissions --> +- <zipfileset src="binaryrelease/connectfour.zip" filemode="644" dirmode="755" prefix="${cc.bin.zip.prefix}/projects"/> +- <zipfileset src="${apache.ant.zip}" prefix="${cc.bin.zip.prefix}"/> ++ <!--zipfileset src="binaryrelease/connectfour.zip" filemode="644" dirmode="755" prefix="${cc.bin.zip.prefix}/projects"/> ++ <zipfileset src="${apache.ant.zip}" prefix="${cc.bin.zip.prefix}"/--> + <zipfileset dir="main/lib" includes="junit*.jar" prefix="${cc.bin.zip.prefix}/${apache.ant}/lib"/> + <zipfileset dir="main/lib" includes="*.jar" prefix="${cc.bin.zip.prefix}/lib" excludes="inmemorysfee*.jar, checkstyle*, **/.svn"/> + <zipfileset dir="main/lib/licenses" includes="*.txt" prefix="${cc.bin.zip.prefix}/lib/licenses"/> Modified: trunk/cruisecontrol/debian/patches/series =================================================================== --- trunk/cruisecontrol/debian/patches/series 2009-11-25 11:59:43 UTC (rev 11124) +++ trunk/cruisecontrol/debian/patches/series 2009-11-25 15:15:25 UTC (rev 11125) @@ -1,2 +1,3 @@ 01_disable_components.diff 02_checkstyle_fixes.diff +03_build_fixes.diff Modified: trunk/cruisecontrol/debian/rules =================================================================== --- trunk/cruisecontrol/debian/rules 2009-11-25 11:59:43 UTC (rev 11124) +++ trunk/cruisecontrol/debian/rules 2009-11-25 15:15:25 UTC (rev 11125) @@ -5,8 +5,21 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-trax ant-junit commons-httpclient commons-net commons-validator emma emma_ant fast-md5 gnumail ivy jdom1 jetty jetty-util junit4 log4j-1.2.jar maven-artifact maven-core maven-embedder maven-model maven-project maven-settings mx4j mx4j-tools oro plexus-component-api wagon-provider-api xstream -DEB_ANT_BUILD_TARGET := build +DEB_JARS := ant-trax ant-junit antlr aspectjrt commons-beanutils commons-collections3 commons-collections commons-httpclient commons-io commons-lang commons-net commons-validator el-api-2.1 emma emma_ant fast-md5 gnumail ivy jasper jasper-el jaxen jdom1 jetty jetty-util joda-time jsp-api-2.1 junit4 log4j-1.2.jar maven-artifact maven-core maven-embedder maven-model maven-project maven-settings mx4j mx4j-tools oro plexus-component-api servlet-api-2.5 spring-beans spring-context spring-core spring-web spring-webmvc tomcat-juli wagon-provider-api xercesImpl xstream +DEB_ANT_BUILD_TARGET := build website bin-zip +DEB_ANT_ARGS := -verbose -Dtest.skip=true +install/cruisecontrol:: + mkdir -p debian/cruisecontrol/usr/share/cruisecontrol + install -m 755 binaryrelease/cruisecontrol.sh debian/cruisecontrol/usr/share/cruisecontrol/cruisecontrol + +install/cruisecontrol-jsp:: + mkdir -p debian/cruisecontrol-jsp/usr/share/cruisecontrol/webapps/cruisecontrol + cd $(CURDIR)/debian/cruisecontrol-jsp/usr/share/cruisecontrol/webapps/cruisecontrol && jar -xvf $(CURDIR)/reporting/jsp/dist/cruisecontrol.war + +install/cruisecontrol-dashboard:: + mkdir -p debian/cruisecontrol-dashboard/usr/share/cruisecontrol/webapps/dashboard + cd debian/cruisecontrol-dashboard/usr/share/cruisecontrol/webapps/dashboard && jar -xvf $(CURDIR)/reporting/dashboard/dist/dashboard.war + get-orig-source:: uscan --verbose --force-download _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits