Skip to content
This repository has been archived by the owner on Jun 27, 2023. It is now read-only.

Commit

Permalink
Keep AntRun as is for running the translator, updated CHANGES.
Browse files Browse the repository at this point in the history
  • Loading branch information
vsonnier committed Jan 23, 2016
1 parent 5c84ae5 commit 4af3457
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[0.7.3-SNAPSHOT]
** Other changes
Borrowed from HPPC: PR #5: OSGi descriptors in JAR manifests, bundle packaging. (Guillaume Delafosse)
PR #5: OSGi descriptors in JAR manifests, bundle packaging, by Guillaume Delafosse. (Copied from HPPC)

HPPCRT-XX: Modernize the build process notably using Retrolambda (https://github.com/orfjackal/retrolambda) to generate a unique Java 5 compatible Jar,
which is fine since the API was the same between the 1.6 and 1.5 jars previously.
HPPCRT-47: Modernize the build by using Retrolambda (https://github.com/orfjackal/retrolambda) to generate a unique retro-compatible Jar.
This is fine since the API was the same between the 1.6 and 1.5 jars previously.
As a contrast, building the HPPC-RT project now REQUIRES Java 8 due to Retrolambda.


Expand Down
5 changes: 2 additions & 3 deletions hppcrt/build.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

<!-- Source code generation phase is handled by an ANT script, it's simply much easier to do it from ANT. -->

<project name="hppcrt" default="generate.sources">

<!-- Generate code from templates. -->
<target name="generate.sources" description="Generate main/test sources from templates">

<taskdef classname="com.carrotsearch.hppcrt.generator.TemplateProcessor" name="generate">
<classpath path="${classpath}" />
<!-- AntRun passed the needed classpath trough the property template_prcessor_classpath -->
<classpath path="${template_prcessor_classpath}" />
</taskdef>

<generate
Expand Down
7 changes: 5 additions & 2 deletions hppcrt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@
<fork>true</fork>
<meminitial>256m</meminitial>
<maxmem>512m</maxmem>
<target>
<property name="classpath" refid="maven.plugin.classpath" />
<target>
<!-- Pass the full plugin classpath to the Ant script through the Ant property template_prcessor_classpath -->
<!-- so that TemplateProcessor could find all the classes it needs -->
<property name="template_prcessor_classpath" refid="maven.plugin.classpath" />
<ant antfile="${basedir}/build.xml" />
</target>
</configuration>
Expand All @@ -74,6 +76,7 @@
<artifactId>hppcrt-template-processor</artifactId>
<version>${project.version}</version>
</dependency>
<!-- force AntRun to use the specified Ant -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
Expand Down

0 comments on commit 4af3457

Please sign in to comment.