* [gentoo-commits] gentoo-x86 commit in dev-java/snappy/files: 1.1.0.1-unbundle-snappy.patch 1.x-build.xml 1.1.0.1-gentoo.patch 1.0.3_rc3-unbundle-snappy.patch 1.0.3_rc3-gentoo.patch
@ 2013-11-24 15:09 Johann Schmitz (ercpe)
0 siblings, 0 replies; only message in thread
From: Johann Schmitz (ercpe) @ 2013-11-24 15:09 UTC (permalink / raw
To: gentoo-commits
ercpe 13/11/24 15:09:02
Added: 1.1.0.1-unbundle-snappy.patch 1.x-build.xml
1.1.0.1-gentoo.patch
1.0.3_rc3-unbundle-snappy.patch
1.0.3_rc3-gentoo.patch
Log:
Added ebuild for dev-java/snappy, a JNI library for app-arch/snappy.
Version 1.1.0.1 is the latest; 1.0.3_rc3 is a dependency of picard (#491816)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Revision Changes Path
1.1 dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch?rev=1.1&content-type=text/plain
Index: 1.1.0.1-unbundle-snappy.patch
===================================================================
diff --git a/Makefile b/Makefile
index 0821c87..04f0435 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,8 @@ all: snappy
SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz
-SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
+SNAPPY_CC:=
SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION)
SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o)
@@ -46,7 +47,8 @@ src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resou
$(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $<
cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@
-$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
+$(SNAPPY_SRC):
+# $(SNAPPY_UNPACKED)
$(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
@mkdir -p $(@D)
@@ -58,7 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
$(STRIP) $@
clean-native:
@@ -73,14 +75,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }')
-native: $(SNAPPY_UNPACKED) $(NATIVE_DLL)
-snappy: native $(TARGET)/$(snappy-jar-version).jar
+native: $(NATIVE_DLL)
+snappy: native
$(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
@mkdir -p $(@D)
cp $< $@
@mkdir -p $(NATIVE_TARGET_DIR)
cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
+ cp $< $(TARGET)/
$(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)
1.1 dev-java/snappy/files/1.x-build.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.x-build.xml?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.x-build.xml?rev=1.1&content-type=text/plain
Index: 1.x-build.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project name="snappy-java-from-maven" default="package" basedir=".">
<property file="${user.home}/.m2/maven.properties" />
<property file="maven-build.properties" />
<property name="maven.build.finalName" value="snappy" />
<property name="maven.build.dir" value="target" />
<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
<property name="maven.build.srcDir.0" value="src/main/java" />
<property name="maven.build.resourceDir.0" value="src/main/java" />
<property name="maven.build.resourceDir.1" value="src/main/resources" />
<property name="maven.build.resourceDir.2" value="." />
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
<property name="maven.build.testDir.0" value="src/test/java" />
<property name="maven.build.testResourceDir.0" value="src/test/java" />
<property name="maven.build.testResourceDir.1" value="src/test/resources" />
<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
<property name="maven.repo.local" value="${user.home}/.m2/repository" />
<property name="maven.settings.offline" value="false" />
<property name="maven.settings.interactiveMode" value="true" />
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
</path>
<path id="build.test.classpath">
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.dir}" />
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
<mkdir dir="${maven.build.outputDir}" />
<javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
<src>
<pathelement location="${maven.build.srcDir.0}" />
</src>
<classpath refid="build.classpath" />
</javac>
<copy todir="${maven.build.outputDir}">
<fileset dir="${maven.build.resourceDir.0}">
<include name="org/xerial/snappy/VERSION" />
</fileset>
</copy>
<copy todir="${maven.build.outputDir}">
<fileset dir="${maven.build.resourceDir.1}">
<include name="org/xerial/snappy/*.bytecode" />
<include name="org/xerial/snappy/native/**" />
</fileset>
</copy>
<mkdir dir="${maven.build.outputDir}/META-INF/maven/org.xerial.snappy/snappy-java" />
<copy todir="${maven.build.outputDir}/META-INF/maven/org.xerial.snappy/snappy-java">
<fileset dir="${maven.build.resourceDir.2}">
<include name="LICENSE*" />
</fileset>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->
<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}" />
<javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
<src>
<pathelement location="${maven.build.testDir.0}" />
</src>
<classpath>
<path refid="build.test.classpath" />
<pathelement location="${maven.build.outputDir}" />
</classpath>
</javac>
<copy todir="${maven.build.testOutputDir}">
<fileset dir="${maven.build.testResourceDir.0}">
<exclude name="**/*.java" />
</fileset>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->
<target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases">
<mkdir dir="${maven.test.reports}" />
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="." />
<formatter type="xml" />
<formatter type="plain" usefile="false" />
<classpath>
<path refid="build.test.classpath" />
<pathelement location="${maven.build.outputDir}" />
<pathelement location="${maven.build.testOutputDir}" />
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/Test*.java" />
<include name="**/*Test.java" />
<include name="**/*TestCase.java" />
<exclude name="**/*Abstract*Test.java" />
</fileset>
</batchtest>
<batchtest todir="${maven.test.reports}" if="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/${test}.java" />
<exclude name="**/*Abstract*Test.java" />
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present" />
</target>
<target name="test-junit-status" depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}" />
<isfalse value="${maven.test.skip}" />
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}" />
<istrue value="${maven.test.skip}" />
</or>
</condition>
</target>
<target name="junit-missing" depends="test-junit-status" if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="public" old="false" verbose="false" locale="en_US" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="UTF-8" linksource="false" breakiterator="false" />
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application">
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="true" basedir="${maven.build.outputDir}" excludes="**/package.html" />
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application" />
<!-- ====================================================================== -->
<!-- Download dependencies target -->
<!-- ====================================================================== -->
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${maven.settings.offline}" arg2="true" />
</condition>
</target>
</project>
1.1 dev-java/snappy/files/1.1.0.1-gentoo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.1.0.1-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.1.0.1-gentoo.patch?rev=1.1&content-type=text/plain
Index: 1.1.0.1-gentoo.patch
===================================================================
diff --git a/Makefile b/Makefile
index 04f0435..0249d09 100644
--- a/Makefile
+++ b/Makefile
@@ -60,8 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
- $(STRIP) $@
+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS)
clean-native:
rm -rf $(SNAPPY_OUT)
1.1 dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch?rev=1.1&content-type=text/plain
Index: 1.0.3_rc3-unbundle-snappy.patch
===================================================================
diff --git a/Makefile b/Makefile
index b67855a..a9d5cdc 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,8 @@ all: snappy
SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz
-SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
+SNAPPY_CC:=
SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION)
SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o)
@@ -30,7 +31,8 @@ jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h
$(SRC)/org/xerial/snappy/SnappyNative.h: $(SRC)/org/xerial/snappy/SnappyNative.java
$(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative
-$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
+$(SNAPPY_SRC):
+# $(SNAPPY_UNPACKED)
$(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
@mkdir -p $(@D)
@@ -42,7 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
$(STRIP) $@
clean-native:
@@ -57,15 +59,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }')
-native: $(SNAPPY_UNPACKED) $(NATIVE_DLL)
-snappy: $(TARGET)/$(snappy-jar-version).jar
+native: $(NATIVE_DLL)
+snappy: native
$(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
@mkdir -p $(@D)
cp $< $@
@mkdir -p $(NATIVE_TARGET_DIR)
cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
-
+ cp $< $(TARGET)
$(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)
$(MVN) package -Dmaven.test.skip=true
1.1 dev-java/snappy/files/1.0.3_rc3-gentoo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.0.3_rc3-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/snappy/files/1.0.3_rc3-gentoo.patch?rev=1.1&content-type=text/plain
Index: 1.0.3_rc3-gentoo.patch
===================================================================
diff --git a/Makefile b/Makefile
index a9d5cdc..8026741 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
- $(STRIP) $@
+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS)
clean-native:
rm -rf $(SNAPPY_OUT)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-11-24 15:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-24 15:09 [gentoo-commits] gentoo-x86 commit in dev-java/snappy/files: 1.1.0.1-unbundle-snappy.patch 1.x-build.xml 1.1.0.1-gentoo.patch 1.0.3_rc3-unbundle-snappy.patch 1.0.3_rc3-gentoo.patch Johann Schmitz (ercpe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox