You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/10/31 20:03:47 UTC
svn commit: r1195619 - in /incubator/mesos/trunk: Makefile.in
src/Makefile.in src/java/mesos.pom
Author: benh
Date: Mon Oct 31 19:03:47 2011
New Revision: 1195619
URL: http://svn.apache.org/viewvc?rev=1195619&view=rev
Log:
Applied patch for MESOS-49, contributed by Ed Kohlway.
Added:
incubator/mesos/trunk/src/java/mesos.pom
Modified:
incubator/mesos/trunk/Makefile.in
incubator/mesos/trunk/src/Makefile.in
Modified: incubator/mesos/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/Makefile.in?rev=1195619&r1=1195618&r2=1195619&view=diff
==============================================================================
--- incubator/mesos/trunk/Makefile.in (original)
+++ incubator/mesos/trunk/Makefile.in Mon Oct 31 19:03:47 2011
@@ -38,6 +38,8 @@ ZOOKEEPER = third_party/zookeeper-3.3.1/
LEVELDB = third_party/leveldb
SETUPTOOLS = @SETUPTOOLS@
+export VERSION = `git describe --tags | cut -f 2,3,4 -d - | sed "s/-/\./"`
+
default: all
src: third_party
@@ -104,6 +106,9 @@ endif
uninstall:
$(error unimplemented)
+maven-install:
+ mvn install:install-file -Dfile=$(LIBDIR)/java/mesos.jar -Dsources=$(LIBDIR)/java/mesos-sources.jar -DpomFile=$(LIBDIR)/java/mesos.pom
+
dist:
$(error unimplemented)
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1195619&r1=1195618&r2=1195619&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Mon Oct 31 19:03:47 2011
@@ -351,6 +351,9 @@ ifdef JAVA_HOME
$(JAVA_HOME)/bin/javac -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java -sourcepath java/generated -d java/classes java/generated/org/apache/mesos/*.java
$(JAVA_HOME)/bin/javac -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes -sourcepath $(SRCDIR)/java/src -d java/classes $(SRCDIR)/java/src/org/apache/mesos/*.java
$(JAVA_HOME)/bin/jar cf $@ -C java/classes org
+ $(JAVA_HOME)/bin/jar cf $(LIBDIR)/java/mesos-sources.jar -C java/src org
+ $(JAVA_HOME)/bin/jar uf $(LIBDIR)/java/mesos-sources.jar -C java/generated org
+ sed s/%MESOS_VERSION%/$(VERSION)/ java/mesos.pom > $(LIBDIR)/java/mesos.pom
$(JAVA_HOME)/bin/javah -d java/jni -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes org.apache.mesos.MesosSchedulerDriver
$(JAVA_HOME)/bin/javah -d java/jni -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes org.apache.mesos.MesosExecutorDriver
$(JAVA_HOME)/bin/javah -d java/jni -classpath @top_builddir@/$(PROTOBUF)/java/src/main/java:java/classes org.apache.mesos.Log
Added: incubator/mesos/trunk/src/java/mesos.pom
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/mesos.pom?rev=1195619&view=auto
==============================================================================
--- incubator/mesos/trunk/src/java/mesos.pom (added)
+++ incubator/mesos/trunk/src/java/mesos.pom Mon Oct 31 19:03:47 2011
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>mesos</artifactId>
+ <name>Mesos</name>
+ <groupId>org.mesosproject</groupId>
+ <version>%MESOS_VERSION%</version>
+ <dependencies>
+ <dependency>
+ <artifactId>protobuf-java</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <version>2.3.0</version>
+ </dependency>
+ </dependencies>
+</project>