You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ju...@apache.org on 2014/09/14 19:45:43 UTC
git commit: kafka-1419 (followup); cross build for scala 2.11;
patched by Stevo Slavic; reviewed by Jun Rao
Repository: kafka
Updated Branches:
refs/heads/trunk 8d0ab1de7 -> f9d9b3814
kafka-1419 (followup); cross build for scala 2.11; patched by Stevo Slavic; reviewed by Jun Rao
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/f9d9b381
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/f9d9b381
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/f9d9b381
Branch: refs/heads/trunk
Commit: f9d9b3814317f80ea08df9c7879de966aa0a2554
Parents: 8d0ab1d
Author: Stevo Slavic <ss...@apache.org>
Authored: Sun Sep 14 10:45:37 2014 -0700
Committer: Jun Rao <ju...@gmail.com>
Committed: Sun Sep 14 10:45:37 2014 -0700
----------------------------------------------------------------------
README.md | 2 +-
bin/kafka-run-class.sh | 8 ++++++--
bin/windows/kafka-console-consumer.bat | 2 +-
bin/windows/kafka-console-producer.bat | 2 +-
bin/windows/kafka-run-class.bat | 10 +++++++---
5 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/f9d9b381/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 544d475..18a65b1 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ The release file can be found inside ./core/build/distributions/.
./gradlew clean
### Running a task on a particular version of Scala (either 2.9.1, 2.9.2, 2.10.1 or 2.11) ###
-#### (If building a jar with a version other than 2.10, the scala version variable in bin/kafka-run-class.sh needs to be changed to run quick start.) ####
+#### (If building a jar with a version other than 2.10, need to set SCALA_BINARY_VERSION variable or change it in bin/kafka-run-class.sh to run quick start.) ####
./gradlew -PscalaVersion=2.9.1 jar
./gradlew -PscalaVersion=2.9.1 test
./gradlew -PscalaVersion=2.9.1 releaseTarGz
http://git-wip-us.apache.org/repos/asf/kafka/blob/f9d9b381/bin/kafka-run-class.sh
----------------------------------------------------------------------
diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh
index 1588e46..36c742b 100755
--- a/bin/kafka-run-class.sh
+++ b/bin/kafka-run-class.sh
@@ -32,7 +32,11 @@ if [ ! -d "$LOG_DIR" ]; then
fi
if [ -z "$SCALA_VERSION" ]; then
- SCALA_VERSION=2.10
+ SCALA_VERSION=2.10.1
+fi
+
+if [ -z "$SCALA_BINARY_VERSION" ]; then
+ SCALA_BINARY_VERSION=2.10
fi
# run ./gradlew copyDependantLibs to get all dependant jars in a local dir
@@ -67,7 +71,7 @@ do
CLASSPATH=$CLASSPATH:$file
done
-for file in $base_dir/core/build/libs/kafka_${SCALA_VERSION}*.jar;
+for file in $base_dir/core/build/libs/kafka_${SCALA_BINARY_VERSION}*.jar;
do
CLASSPATH=$CLASSPATH:$file
done
http://git-wip-us.apache.org/repos/asf/kafka/blob/f9d9b381/bin/windows/kafka-console-consumer.bat
----------------------------------------------------------------------
diff --git a/bin/windows/kafka-console-consumer.bat b/bin/windows/kafka-console-consumer.bat
index 94b20a4..f70f98a 100644
--- a/bin/windows/kafka-console-consumer.bat
+++ b/bin/windows/kafka-console-consumer.bat
@@ -16,5 +16,5 @@ rem limitations under the License.
SetLocal
set KAFKA_HEAP_OPTS=-Xmx512M
-%~dp0kafka-run-class.bat kafka.consumer.ConsoleConsumer %*
+%~dp0kafka-run-class.bat kafka.tools.ConsoleConsumer %*
EndLocal
http://git-wip-us.apache.org/repos/asf/kafka/blob/f9d9b381/bin/windows/kafka-console-producer.bat
----------------------------------------------------------------------
diff --git a/bin/windows/kafka-console-producer.bat b/bin/windows/kafka-console-producer.bat
index b116e64..a5b57de 100644
--- a/bin/windows/kafka-console-producer.bat
+++ b/bin/windows/kafka-console-producer.bat
@@ -16,5 +16,5 @@ rem limitations under the License.
SetLocal
set KAFKA_HEAP_OPTS=-Xmx512M
-%~dp0kafka-run-class.bat kafka.producer.ConsoleProducer %*
+%~dp0kafka-run-class.bat kafka.tools.ConsoleProducer %*
EndLocal
http://git-wip-us.apache.org/repos/asf/kafka/blob/f9d9b381/bin/windows/kafka-run-class.bat
----------------------------------------------------------------------
diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat
index f4d2904..8e9780e 100644
--- a/bin/windows/kafka-run-class.bat
+++ b/bin/windows/kafka-run-class.bat
@@ -28,7 +28,11 @@ popd
set CLASSPATH=
IF ["%SCALA_VERSION%"] EQU [""] (
- set SCALA_VERSION=2.8.0
+ set SCALA_VERSION=2.10.1
+)
+
+IF ["%SCALA_BINARY_VERSION%"] EQU [""] (
+ set SCALA_BINARY_VERSION=2.10
)
rem Classpath addition for kafka-core dependencies
@@ -67,7 +71,7 @@ for %%i in (%BASE_DIR%\libs\*.jar) do (
)
rem Classpath addition for core
-for %%i in (%BASE_DIR%\core\build\libs\kafka_%SCALA_VERSION%*.jar) do (
+for %%i in (%BASE_DIR%\core\build\libs\kafka_%SCALA_BINARY_VERSION%*.jar) do (
call :concat %%i
)
@@ -126,4 +130,4 @@ IF ["%CLASSPATH%"] EQU [""] (
set CLASSPATH="%1"
) ELSE (
set CLASSPATH=%CLASSPATH%;"%1"
-)
\ No newline at end of file
+)