This is an automated email from the git hooks/post-receive script. eighthave pushed a commit to branch master in repository lombok-ast.
commit eaf9c849fef06a7a8e76c116e3cbaf99e450fb31 Author: Hans-Christoph Steiner <[email protected]> Date: Fri Dec 18 09:53:05 2015 +0100 now that ivyplusplus is packaged, switch to building with it --- debian/control | 6 +- debian/patches/create_build_directory.patch | 20 ------- debian/patches/replace_ipp_with_ivy.patch | 91 ----------------------------- debian/patches/series | 3 - debian/patches/use_local_artifacts.patch | 14 ----- debian/rules | 29 ++------- 6 files changed, 11 insertions(+), 152 deletions(-) diff --git a/debian/control b/debian/control index 9e0caa4..ae4990a 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,11 @@ Build-Depends: debhelper (>= 9), ant-optional, default-jdk, ivy, - junit4 (>=4.8.12) + ivyplusplus, + junit4 (>=4.8.12), + libecj-java, + liblombok-java, + libparboiled-java Standards-Version: 3.9.6 Homepage: https://projectlombok.org Vcs-Git: https://anonscm.debian.org/git/pkg-java/lombok-ast.git diff --git a/debian/patches/create_build_directory.patch b/debian/patches/create_build_directory.patch deleted file mode 100644 index 8568230..0000000 --- a/debian/patches/create_build_directory.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: lombok-ast-0.2.3/build.xml -=================================================================== ---- lombok-ast-0.2.3.orig/build.xml -+++ lombok-ast-0.2.3/build.xml -@@ -90,6 +90,7 @@ - </target> - - <target name="templateProcessor" depends="ensureBuildDeps" description="Builds the template processor."> -+ <mkdir dir="build/templateProcessor" /> - <javac destdir="build/templateProcessor" srcdir="src/template"> - <classpath refid="build.path" /> - </javac> -@@ -130,6 +131,7 @@ - <delete dir="build/lombok.ast" quiet="true" /> - <delete dir="build/lombok.ast_generatedSource" quiet="true" /> - <mkdir dir="build/lombok.ast_generatedSource" /> -+ <mkdir dir="build/lombok.ast" /> - <javac destdir="build/lombok.ast"> - <src path="src/main" /> - <src path="src/printer" /> diff --git a/debian/patches/replace_ipp_with_ivy.patch b/debian/patches/replace_ipp_with_ivy.patch deleted file mode 100644 index 145b7b5..0000000 --- a/debian/patches/replace_ipp_with_ivy.patch +++ /dev/null @@ -1,91 +0,0 @@ -Index: lombok-ast-0.2.3/build.xml -=================================================================== ---- lombok-ast-0.2.3.orig/build.xml -+++ lombok-ast-0.2.3/build.xml -@@ -19,13 +19,13 @@ - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - --> --<project name="lombok.ast" default="dist" xmlns:ivy="antlib:com.zwitserloot.ivyplusplus"> -+<project name="lombok.ast" default="dist" xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="build.compiler" value="javac1.6" /> - <property name="ivy.retrieve.pattern" value="lib/[conf]/[artifact].[ext]" /> -- <available file="lib/ivyplusplus.jar" property="ivyplusplus.available" /> -+ <available file="/usr/share/java/ivy.jar" property="ivy.available" /> - <available file="doc/jls/j3TOC.html" property="jls-available" /> - -- <target name="download-ipp" unless="ivyplusplus.available"> -+ <target name="download-ipp" unless="ivy.available"> - <mkdir dir="lib" /> - <get src="http://projectlombok.org/downloads/ivyplusplus.jar"; dest="lib/ivyplusplus.jar" usetimestamp="true" /> - </target> -@@ -67,7 +67,7 @@ - - <target name="version" depends="ensure-ipp" description="Shows the version number."> - <mkdir dir="build/lombok.ast" /> -- <ivy:compile destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" /> -+ <javac destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" /> - <java - classname="lombok.ast.Version" - classpath="build/lombok.ast" -@@ -91,9 +91,9 @@ - </target> - - <target name="templateProcessor" depends="ensureBuildDeps" description="Builds the template processor."> -- <ivy:compile destdir="build/templateProcessor" srcdir="src/template"> -+ <javac destdir="build/templateProcessor" srcdir="src/template"> - <classpath refid="build.path" /> -- </ivy:compile> -+ </javac> - <mkdir dir="build/templateProcessor/META-INF" /> - <mkdir dir="build/templateProcessor/META-INF/services" /> - <echo file="build/templateProcessor/META-INF/services/javax.annotation.processing.Processor">lombok.ast.template.TemplateProcessor</echo> -@@ -102,7 +102,7 @@ - - <target name="generateSource" depends="ensureBuildDeps, templateProcessor" description="Runs just the template processor and dumps the generated sources in build/lombok.ast_generatedSource"> - <mkdir dir="build/lombok.ast_generatedSource" /> -- <ivy:compile destdir="build/lombok.ast_generatedSource"> -+ <javac destdir="build/lombok.ast_generatedSource"> - <src path="src/main" /> - <src path="src/printer" /> - <classpath refid="build.path" /> -@@ -110,7 +110,7 @@ - <compilerarg value="-proc:only" /> - <compilerarg value="-s" /> - <compilerarg path="build/lombok.ast_generatedSource" /> -- </ivy:compile> -+ </javac> - <echo>NOTE: If you see a wash of errors above this line, ignore them. Compilation succeeded; this is a javac bug.</echo> - </target> - -@@ -131,7 +131,7 @@ - <delete dir="build/lombok.ast" quiet="true" /> - <delete dir="build/lombok.ast_generatedSource" quiet="true" /> - <mkdir dir="build/lombok.ast_generatedSource" /> -- <ivy:compile destdir="build/lombok.ast"> -+ <javac destdir="build/lombok.ast"> - <src path="src/main" /> - <src path="src/printer" /> - <src path="src/javacTransformer" /> -@@ -140,7 +140,7 @@ - <classpath refid="build.path" /> - <compilerarg value="-s" /> - <compilerarg path="build/lombok.ast_generatedSource" /> -- </ivy:compile> -+ </javac> - <touch file="build/lastSuccessfulCompile" datetime="${compile.started}" pattern="yyyyMMddHHmmssSSS" /> - </target> - -@@ -168,10 +168,10 @@ - <target name="compileTests" depends="compile, ensureTestDeps" description="compiles test code"> - <ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="test" /> - <mkdir dir="build/tests" /> -- <ivy:compile destdir="build/tests" srcdir="test/src"> -+ <javac destdir="build/tests" srcdir="test/src"> - <classpath refid="test.path" /> - <classpath location="build/lombok.ast" /> -- </ivy:compile> -+ </javac> - </target> - - <target name="build-cobertura-instrumentation" depends="compile, ensureTestDeps"> diff --git a/debian/patches/series b/debian/patches/series index 0406baf..d48dadf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,4 @@ -replace_ipp_with_ivy.patch -use_local_artifacts.patch remove_dependency_on_ensure-ipp.patch add_maven_repo.patch remove_missing_dependency.patch -create_build_directory.patch parboiled.patch diff --git a/debian/patches/use_local_artifacts.patch b/debian/patches/use_local_artifacts.patch deleted file mode 100644 index c7b2aab..0000000 --- a/debian/patches/use_local_artifacts.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/buildScripts/ivysettings.xml -+++ b/buildScripts/ivysettings.xml -@@ -4,7 +4,10 @@ - <filesystem name="projectLocalRepo"> - <ivy pattern="${ivy.settings.dir}/ivy-repo/[organization]-[module]-[revision].xml" /> - </filesystem> -- <ibiblio name="maven-repo2" m2compatible="true" root="https://repo1.maven.org/maven2"; /> -+ <filesystem name="localRepo"> -+ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" /> -+ <artifact pattern="/usr/share/java/[artifact].[ext]" /> -+ </filesystem> - </chain> - </resolvers> - <settings defaultResolver="projectRepos" /> diff --git a/debian/rules b/debian/rules index f2b06af..ab87efe 100755 --- a/debian/rules +++ b/debian/rules @@ -1,35 +1,18 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#DH_VERBOSE = 1 -# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* -DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export JAVA_HOME=/usr/lib/jvm/default-java -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - -# main packaging script based on dh7 syntax %: dh $@ -# debmake generated override targets -# This is example for Cmake (See http://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- \ -# -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) - - - +override_dh_auto_clean: + dh_auto_clean + ant -lib /usr/share/java/ivyplusplus.jar clean +override_dh_auto_build: + ant -lib /usr/share/java/ivyplusplus.jar dist GIT_COMMIT_ID = $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's,[0-9][0-9.]*+[0-9]git,,') newtarball = new$(DEB_VERSION_UPSTREAM).tar.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lombok-ast.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
