branch selection for dispersedalgorithms repository
authorMaximilian Quellmalz <maximilian.quellmalz@mailbox.tu-dresden.de>
Fri, 1 Aug 2014 10:45:54 +0000 (12:45 +0200)
committerMaximilian Quellmalz <maximilian.quellmalz@mailbox.tu-dresden.de>
Fri, 1 Aug 2014 10:45:54 +0000 (12:45 +0200)
Splitter-ng-plugin-bitsplitter/.gitignore
Splitter-ng-plugin-bitsplitter/0001-Makefile-now-detects-include-dir-and-creates-necessa.patch [deleted file]
Splitter-ng-plugin-bitsplitter/build.xml

diff --git a/Splitter-ng-plugin-bitsplitter/0001-Makefile-now-detects-include-dir-and-creates-necessa.patch b/Splitter-ng-plugin-bitsplitter/0001-Makefile-now-detects-include-dir-and-creates-necessa.patch
deleted file mode 100644 (file)
index 25ac050..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From f10ab1fb063baa235f04135ad56786995ef968b9 Mon Sep 17 00:00:00 2001
-From: Maximilian Quellmalz <maximilian.quellmalz@mailbox.tu-dresden.de>
-Date: Wed, 11 Jun 2014 14:33:32 +0200
-Subject: [PATCH] Makefile now detects include dir and creates necessary
- library
-
----
- bitsplitter/java/Makefile | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/bitsplitter/java/Makefile b/bitsplitter/java/Makefile
-index b1d9bea..978d22a 100644
---- a/bitsplitter/java/Makefile
-+++ b/bitsplitter/java/Makefile
-@@ -1,9 +1,12 @@
- B = classes
-+# Find Java and set jni header path
-+JAVAC := $(shell which javac)
-+JNI_HEADERS_PATH := $(shell readlink -f ${JAVAC} | sed "s:bin/javac::")/include
--all: jbitsplitter jbitsplitterjava test
-+all: libbitsplit jbitsplitter jbitsplitterjava test
- jbitsplitter:
--      gcc -O2 -Wall -Werror -fPIC -c jbitsplitter.c -I ..
-+      gcc -O2 -Wall -Werror -fPIC -c jbitsplitter.c -I$(JNI_HEADERS_PATH) -I$(JNI_HEADERS_PATH)/linux -I ..
-       gcc -shared -o libjbitsplitter.so jbitsplitter.o -L .. -lbitsplit
- jbitsplitterjava:
-@@ -13,8 +16,11 @@ jbitsplitterjava:
- test:
-       javac -cp lib BitSplitterTest.java
-       mkdir -p splitdir
--      LD_LIBRARY_PATH=. java -cp .:lib BitSplitterTest
-+      LD_LIBRARY_PATH=".:.." java -cp .:lib BitSplitterTest
- clean:
-       rm -f *.o *.so *.class
-       rm -rf lib splitdir
-+
-+libbitsplit:
-+      ${MAKE} -C ../ libbitsplit.so
--- 
-1.9.1
-
index c24881b..4166b95 100644 (file)
@@ -5,6 +5,7 @@
   <property name="bitsplitter.location" value="dispersedalgorithms/bitsplitter"/>
   <property name="dispersedalgorithms.location" value="dispersedalgorithms"/>
   <property name="dispersedalgorithms.url" value="git://serviceplatform.org/git/dispersedalgorithms"/>
+  <property name="dispersedalgorithms.branch" value="mq"/>
   <property name="debuglevel" value="source,lines,vars"/>
   <property name="target" value="1.7"/>
   <property name="source" value="1.7"/>
     <exec executable="git" dir="${dispersedalgorithms.location}" failonerror="false">
       <arg value="pull"/>
       <arg value="origin"/>
-      <arg value="master"/>
+      <arg value="${dispersedalgorithms.branch}"/>
     </exec>
     <exec executable="git" dir="${dispersedalgorithms.location}" failonerror="false">
       <arg value="reset"/>
       <arg value="--hard"/>
       <arg value="HEAD"/>
     </exec>
-    <exec executable="git" dir="${dispersedalgorithms.location}" failonerror="false">
-      <arg value="apply"/>
-      <arg value="../0001-Makefile-now-detects-include-dir-and-creates-necessa.patch"/>
-    </exec>
   </target>
   <target name="check-git-repo">
     <available property="repo.exists" file="${dispersedalgorithms.location}/.git/info/sparse-checkout"/>
     <exec executable="git" dir="${dispersedalgorithms.location}" failonerror="true">
       <arg value="pull"/>
       <arg value="origin"/>
-      <arg value="master"/>
+      <arg value="${dispersedalgorithms.branch}"/>
     </exec>
   </target>
 </project>