[pkg-java] r7884 - in trunk/maven-debian-helper: . cdbs debian share share/cdbs share/cdbs/1 share/cdbs/1/class share/maven-debian-helper share/maven-repo
twerner at alioth.debian.org
twerner at alioth.debian.org
Sun Jan 25 21:37:05 UTC 2009
Author: twerner
Date: 2009-01-25 21:37:05 +0000 (Sun, 25 Jan 2009)
New Revision: 7884
Added:
trunk/maven-debian-helper/share/cdbs/
trunk/maven-debian-helper/share/cdbs/1/
trunk/maven-debian-helper/share/cdbs/1/class/
trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
trunk/maven-debian-helper/share/maven-repo/
Removed:
trunk/maven-debian-helper/cdbs/maven-vars.mk
trunk/maven-debian-helper/cdbs/maven.mk
trunk/maven-debian-helper/maven-repo/
Modified:
trunk/maven-debian-helper/debian/install
trunk/maven-debian-helper/share/maven-debian-helper/copy-repo.sh
Log:
bugfix + cleanup
Deleted: trunk/maven-debian-helper/cdbs/maven-vars.mk
===================================================================
--- trunk/maven-debian-helper/cdbs/maven-vars.mk 2009-01-25 21:01:27 UTC (rev 7883)
+++ trunk/maven-debian-helper/cdbs/maven-vars.mk 2009-01-25 21:37:05 UTC (rev 7884)
@@ -1,89 +0,0 @@
-# This file is based on ant-vars.mk
-
-# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
-# Copyright © 2008 Torsten Werner <twerner at debian.org>
-# Description: Defines useful variables for packages which use Maven
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_maven_vars
-_cdbs_class_maven_vars = 1
-
-# Maven home directory. Doesn't need to be changed except when using
-# nonstandard Maven installations.
-MAVEN_HOME = /usr/share/maven2
-
-# The home directory of the Java Runtime Environment (JRE) or Java Development
-# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
-# JAVA_HOME_DIRS to multiple possible home directories. The first existing
-# directory from this list is used for JAVA_HOME. You can also override
-# JAVACMD in case you don't want to use the default JAVA_HOME/bin/java.
-JAVA_HOME = $(shell for jh in $(JAVA_HOME_DIRS); do if [ -x "$$jh/bin/java" ]; then \
- echo $${jh}; exit 0; fi; done)
-JAVACMD = $(JAVA_HOME)/bin/java
-
-# You can list all Java ARchives (JARs) to be added to the class path in
-# DEB_JARS, either with their full path or just the basename if the JAR is
-# in /usr/share/java. You may also ommit the ".jar" extension. Non-existing
-# files will silently be ignored. tools.jar is automatically added to the
-# end of the class path if it exists in the JDK's lib directory.
-# You can override the complete class path using DEB_CLASSPATH.
-DEB_JARS_BASE = /usr/share/java
-DEB_CLASSPATH = $(MAVEN_HOME)/boot/classworlds.jar:$(shell for jar in $(DEB_JARS); do \
- if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
- if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
- done; \
- if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
-
-# Extra arguments for the Maven command line.
-DEB_MAVEN_ARGS =
-
-# Property file for Maven, defaults to debian/maven.properties if it exists.
-# You may define additional properties. Please note that command-line
-# arguments in MAVEN_ARGS (see below) override the settings in pom.xml and
-# the property file.
-DEB_MAVEN_PROPERTYFILE = $(shell test -f $(CURDIR)/debian/maven.properties && echo $(CURDIR)/debian/maven.properties)
-
-# You can specify additional JVM arguments in MAVEN_OPTS and Maven
-# command-line arguments in MAVEN_ARGS. You can additionally define
-# MAVEN_ARGS_<package> for each individual package.
-DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -noverify -cp $(DEB_CLASSPATH) \
- $(JAVA_OPTS) -Dclassworlds.conf=/etc/maven2/m2-debian.conf \
- org.codehaus.classworlds.Launcher $(DEB_MAVEN_ARGS) \
- -s/etc/maven2/settings-debian.xml \
- -Dmaven.repo.local=$(DEB_MAVEN_REPO) \
- $(if $(MAVEN_ARGS_$(cdbs_curpkg)),$(MAVEN_ARGS_$(cdbs_curpkg)),$(MAVEN_ARGS))
-
-# The name of the binary package that gets the jar files installed. The
-# first package by default.
-DEB_JAR_PACKAGE = $(firstword $(shell dh_listpackages))
-
-# Targets to invoke for building, installing, testing and cleaning up.
-# Building uses the default target from build.xml, installing and testing is
-# only called if the corresponding variable is set. You can also specify
-# multiple targets for each step.
-DEB_MAVEN_BUILD_TARGET = package
-DEB_MAVEN_INSTALL_TARGET = debian:install
-DEB_MAVEN_CHECK_TARGET =
-DEB_MAVEN_CLEAN_TARGET = clean
-
-endif
Deleted: trunk/maven-debian-helper/cdbs/maven.mk
===================================================================
--- trunk/maven-debian-helper/cdbs/maven.mk 2009-01-25 21:01:27 UTC (rev 7883)
+++ trunk/maven-debian-helper/cdbs/maven.mk 2009-01-25 21:37:05 UTC (rev 7884)
@@ -1,79 +0,0 @@
-# This file is based on ant.mk
-
-# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
-# Copyright © 2008 Torsten Werner <twerner at debian.org>
-# Description: Builds and cleans packages which have an Maven pom.xml file
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_maven
-_cdbs_class_maven = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/maven-vars.mk$(_cdbs_makefile_suffix)
-
-DEB_MAVEN_REPO := $(CURDIR)/debian/maven-repo
-
-JAVA_OPTS = \
- $(shell test -n "$(DEB_MAVEN_PROPERTYFILE)" && echo -Dproperties.file.manual=$(DEB_MAVEN_PROPERTYFILE)) \
- -Dproperties.file.auto=$(CURDIR)/debian/auto.properties
-
-DEB_PHONY_RULES += maven-sanity-check
-
-maven-sanity-check:
- @if ! test -x "$(JAVACMD)"; then \
- echo "You must specify a valid JAVA_HOME or JAVACMD!"; \
- exit 1; \
- fi
- @if ! test -r "$(MAVEN_HOME)/boot/classworlds.jar"; then \
- echo "You must specify a valid MAVEN_HOME directory!"; \
- exit 1; \
- fi
-
-debian/auto.properties:
- /usr/share/maven-debian-helper/copy-repo.sh $(CURDIR)/debian
-
-common-build-arch common-build-indep:: debian/stamp-maven-build maven-sanity-check
-debian/stamp-maven-build: debian/auto.properties
- $(DEB_MAVEN_INVOKE) $(DEB_MAVEN_BUILD_TARGET)
- touch $@
-
-cleanbuilddir:: maven-sanity-check apply-patches debian/auto.properties
- -$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CLEAN_TARGET)
- $(RM) -r debian/auto.properties $(DEB_MAVEN_REPO) debian/stamp-maven-build
-
-# extra arguments for the installation step
-PLUGIN_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_JAR_PACKAGE)
-
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
- $(if $(DEB_MAVEN_INSTALL_TARGET),$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_INSTALL_TARGET) $(PLUGIN_ARGS), at echo "DEB_MAVEN_INSTALL_TARGET unset, skipping default maven.mk common-install target")
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-common-build-arch common-build-indep:: debian/stamp-maven-check
-debian/stamp-maven-check: debian/stamp-maven-build
- $(if $(DEB_MAVEN_CHECK_TARGET),$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CHECK_TARGET), at echo "DEB_MAVEN_CHECK_TARGET unset, not running checks")
- $(if $(DEB_MAVEN_CHECK_TARGET),touch $@)
-
-clean::
- $(if $(DEB_MAVEN_CHECK_TARGET),$(RM) debian/stamp-maven-check)
-endif
-
-endif
Modified: trunk/maven-debian-helper/debian/install
===================================================================
--- trunk/maven-debian-helper/debian/install 2009-01-25 21:01:27 UTC (rev 7883)
+++ trunk/maven-debian-helper/debian/install 2009-01-25 21:37:05 UTC (rev 7884)
@@ -1,5 +1,3 @@
bin /usr/
-cdbs/* /usr/share/cdbs/1/class/
etc/* /etc/maven2/
-maven-repo /usr/share/
share /usr/
Copied: trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk (from rev 7883, trunk/maven-debian-helper/cdbs/maven-vars.mk)
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk (rev 0)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk 2009-01-25 21:37:05 UTC (rev 7884)
@@ -0,0 +1,89 @@
+# This file is based on ant-vars.mk
+
+# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
+# Copyright © 2008 Torsten Werner <twerner at debian.org>
+# Description: Defines useful variables for packages which use Maven
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_maven_vars
+_cdbs_class_maven_vars = 1
+
+# Maven home directory. Doesn't need to be changed except when using
+# nonstandard Maven installations.
+MAVEN_HOME = /usr/share/maven2
+
+# The home directory of the Java Runtime Environment (JRE) or Java Development
+# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
+# JAVA_HOME_DIRS to multiple possible home directories. The first existing
+# directory from this list is used for JAVA_HOME. You can also override
+# JAVACMD in case you don't want to use the default JAVA_HOME/bin/java.
+JAVA_HOME = $(shell for jh in $(JAVA_HOME_DIRS); do if [ -x "$$jh/bin/java" ]; then \
+ echo $${jh}; exit 0; fi; done)
+JAVACMD = $(JAVA_HOME)/bin/java
+
+# You can list all Java ARchives (JARs) to be added to the class path in
+# DEB_JARS, either with their full path or just the basename if the JAR is
+# in /usr/share/java. You may also ommit the ".jar" extension. Non-existing
+# files will silently be ignored. tools.jar is automatically added to the
+# end of the class path if it exists in the JDK's lib directory.
+# You can override the complete class path using DEB_CLASSPATH.
+DEB_JARS_BASE = /usr/share/java
+DEB_CLASSPATH = $(MAVEN_HOME)/boot/classworlds.jar:$(shell for jar in $(DEB_JARS); do \
+ if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+ if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+ done; \
+ if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
+
+# Extra arguments for the Maven command line.
+DEB_MAVEN_ARGS =
+
+# Property file for Maven, defaults to debian/maven.properties if it exists.
+# You may define additional properties. Please note that command-line
+# arguments in MAVEN_ARGS (see below) override the settings in pom.xml and
+# the property file.
+DEB_MAVEN_PROPERTYFILE = $(shell test -f $(CURDIR)/debian/maven.properties && echo $(CURDIR)/debian/maven.properties)
+
+# You can specify additional JVM arguments in MAVEN_OPTS and Maven
+# command-line arguments in MAVEN_ARGS. You can additionally define
+# MAVEN_ARGS_<package> for each individual package.
+DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -noverify -cp $(DEB_CLASSPATH) \
+ $(JAVA_OPTS) -Dclassworlds.conf=/etc/maven2/m2-debian.conf \
+ org.codehaus.classworlds.Launcher $(DEB_MAVEN_ARGS) \
+ -s/etc/maven2/settings-debian.xml \
+ -Dmaven.repo.local=$(DEB_MAVEN_REPO) \
+ $(if $(MAVEN_ARGS_$(cdbs_curpkg)),$(MAVEN_ARGS_$(cdbs_curpkg)),$(MAVEN_ARGS))
+
+# The name of the binary package that gets the jar files installed. The
+# first package by default.
+DEB_JAR_PACKAGE = $(firstword $(shell dh_listpackages))
+
+# Targets to invoke for building, installing, testing and cleaning up.
+# Building uses the default target from build.xml, installing and testing is
+# only called if the corresponding variable is set. You can also specify
+# multiple targets for each step.
+DEB_MAVEN_BUILD_TARGET = package
+DEB_MAVEN_INSTALL_TARGET = debian:install
+DEB_MAVEN_CHECK_TARGET =
+DEB_MAVEN_CLEAN_TARGET = clean
+
+endif
Property changes on: trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/maven-debian-helper/share/cdbs/1/class/maven.mk (from rev 7883, trunk/maven-debian-helper/cdbs/maven.mk)
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven.mk (rev 0)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven.mk 2009-01-25 21:37:05 UTC (rev 7884)
@@ -0,0 +1,79 @@
+# This file is based on ant.mk
+
+# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
+# Copyright © 2008 Torsten Werner <twerner at debian.org>
+# Description: Builds and cleans packages which have an Maven pom.xml file
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_maven
+_cdbs_class_maven = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+include $(_cdbs_class_path)/maven-vars.mk$(_cdbs_makefile_suffix)
+
+DEB_MAVEN_REPO := $(CURDIR)/debian/maven-repo
+
+JAVA_OPTS = \
+ $(shell test -n "$(DEB_MAVEN_PROPERTYFILE)" && echo -Dproperties.file.manual=$(DEB_MAVEN_PROPERTYFILE)) \
+ -Dproperties.file.auto=$(CURDIR)/debian/auto.properties
+
+DEB_PHONY_RULES += maven-sanity-check
+
+maven-sanity-check:
+ @if ! test -x "$(JAVACMD)"; then \
+ echo "You must specify a valid JAVA_HOME or JAVACMD!"; \
+ exit 1; \
+ fi
+ @if ! test -r "$(MAVEN_HOME)/boot/classworlds.jar"; then \
+ echo "You must specify a valid MAVEN_HOME directory!"; \
+ exit 1; \
+ fi
+
+debian/auto.properties:
+ /usr/share/maven-debian-helper/copy-repo.sh $(CURDIR)/debian
+
+common-build-arch common-build-indep:: debian/stamp-maven-build maven-sanity-check
+debian/stamp-maven-build: debian/auto.properties
+ $(DEB_MAVEN_INVOKE) $(DEB_MAVEN_BUILD_TARGET)
+ touch $@
+
+cleanbuilddir:: maven-sanity-check apply-patches debian/auto.properties
+ -$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CLEAN_TARGET)
+ $(RM) -r debian/auto.properties $(DEB_MAVEN_REPO) debian/stamp-maven-build
+
+# extra arguments for the installation step
+PLUGIN_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_JAR_PACKAGE)
+
+common-install-arch common-install-indep:: common-install-impl
+common-install-impl::
+ $(if $(DEB_MAVEN_INSTALL_TARGET),$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_INSTALL_TARGET) $(PLUGIN_ARGS), at echo "DEB_MAVEN_INSTALL_TARGET unset, skipping default maven.mk common-install target")
+
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+common-build-arch common-build-indep:: debian/stamp-maven-check
+debian/stamp-maven-check: debian/stamp-maven-build
+ $(if $(DEB_MAVEN_CHECK_TARGET),$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CHECK_TARGET), at echo "DEB_MAVEN_CHECK_TARGET unset, not running checks")
+ $(if $(DEB_MAVEN_CHECK_TARGET),touch $@)
+
+clean::
+ $(if $(DEB_MAVEN_CHECK_TARGET),$(RM) debian/stamp-maven-check)
+endif
+
+endif
Property changes on: trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/maven-debian-helper/share/maven-debian-helper/copy-repo.sh
===================================================================
--- trunk/maven-debian-helper/share/maven-debian-helper/copy-repo.sh 2009-01-25 21:01:27 UTC (rev 7883)
+++ trunk/maven-debian-helper/share/maven-debian-helper/copy-repo.sh 2009-01-25 21:37:05 UTC (rev 7884)
@@ -14,16 +14,16 @@
}
header() {
- echo "<?xml version="1.0" encoding="UTF-8"?>"
- echo "<metadata>"
- echo " <versioning>"
- echo " <versions>"
+ echo '<?xml version="1.0" encoding="UTF-8"?>'
+ echo '<metadata>'
+ echo ' <versioning>'
+ echo ' <versions>'
}
footer() {
- echo " </versions>"
- echo " </versioning>"
- echo "</metadata>"
+ echo ' </versions>'
+ echo ' </versioning>'
+ echo '</metadata>'
}
echo_meta() {
Copied: trunk/maven-debian-helper/share/maven-repo (from rev 7839, trunk/maven-debian-helper/maven-repo)
Property changes on: trunk/maven-debian-helper/share/maven-repo
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the pkg-java-commits
mailing list