Skip to content

Move build system to Maven (retains Ant tasks for backwards compatibility) #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2016
Merged

Move build system to Maven (retains Ant tasks for backwards compatibility) #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@ ebin/
out/
tmp/
junit*.properties
/target/
/.DS_Store
/.classpath
/.project
/.settings
18 changes: 15 additions & 3 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<project name="RabbitMQ Java client" default="build"
xmlns:bundlor="antlib:com.springsource.bundlor.ant">

<property file="build.properties"/>
<property file="config.properties"/>
<property file="${basedir}/src/test/resources/build.properties"/>
<property file="${basedir}/src/test/resources/config.properties"/>
<property environment="env"/>

<path id="javac.classpath">
Expand Down Expand Up @@ -81,7 +81,7 @@

<target name="build" depends="amqp-generate" description="Build the client library.">
<mkdir dir="${javac.out}"/>
<copy file="src/com/rabbitmq/client/impl/ClientVersion.java.in"
<copy file="${maven.src.home}/com/rabbitmq/client/impl/ClientVersion.java.in"
tofile="${src.generated}/com/rabbitmq/client/impl/ClientVersion.java">
<filterset>
<filter token="VERSION" value="${impl.version}"/>
Expand Down Expand Up @@ -340,6 +340,9 @@
<jvmarg value="-Dmake.bin=${make.bin}"/>
<jvmarg value="-Drabbitmqctl.bin=${rabbitmqctl.bin}"/>
<jvmarg value="-Dsibling.rabbitmq_test.dir=${sibling.rabbitmq_test.dir}"/>
<jvmarg value="-Dbroker.hostname=${broker.hostname}"/>
<jvmarg value="-Dbroker.port=${broker.port}"/>
<jvmarg value="-Dbroker.sslport=${broker.sslport}"/>

<jvmarg value="-Dkeystore.path=${CLIENT_KEYSTORE}"/>
<jvmarg value="-Dkeystore.empty.path=${CLIENT_KEYSTORE_EMPTY}"/>
Expand All @@ -364,6 +367,9 @@
<jvmarg value="-Dmake.bin=${make.bin}"/>
<jvmarg value="-Drabbitmqctl.bin=${rabbitmqctl.bin}"/>
<jvmarg value="-Dsibling.rabbitmq_test.dir=${sibling.rabbitmq_test.dir}"/>
<jvmarg value="-Dbroker.hostname=${broker.hostname}"/>
<jvmarg value="-Dbroker.port=${broker.port}"/>
<jvmarg value="-Dbroker.sslport=${broker.sslport}"/>

<formatter type="plain"/>
<formatter type="xml"/>
Expand All @@ -380,6 +386,9 @@
<jvmarg value="-Dmake.bin=${make.bin}"/>
<jvmarg value="-Drabbitmqctl.bin=${rabbitmqctl.bin}"/>
<jvmarg value="-Dsibling.rabbitmq_test.dir=${sibling.rabbitmq_test.dir}"/>
<jvmarg value="-Dbroker.hostname=${broker.hostname}"/>
<jvmarg value="-Dbroker.port=${broker.port}"/>
<jvmarg value="-Dbroker.sslport=${broker.sslport}"/>

<formatter type="plain"/>
<formatter type="xml"/>
Expand All @@ -398,6 +407,9 @@
<jvmarg value="-Dmake.bin=${make.bin}"/>
<jvmarg value="-Drabbitmqctl.bin=${rabbitmqctl.bin}"/>
<jvmarg value="-Dsibling.rabbitmq_test.dir=${sibling.rabbitmq_test.dir}"/>
<jvmarg value="-Dbroker.hostname=${broker.hostname}"/>
<jvmarg value="-Dbroker.port=${broker.port}"/>
<jvmarg value="-Dbroker.sslport=${broker.sslport}"/>

<formatter type="plain"/>
<formatter type="xml"/>
Expand Down
Loading