natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch cassandra-3.0 into cassandra-3.11

This commit is contained in:
Benjamin Lerer 2017-01-11 21:27:28 +01:00
parent 1553d864b5 5774d8e235
commit 9c2ab25556
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
conf/cassandra-env.ps1
View File

@ -197,42 +197,6 @@ Function CalculateHeapSizes
}
}
#-----------------------------------------------------------------------------
Function SetJsr223Env
{
$cp = $env:CLASSPATH
foreach ($jsrDir in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223")
{
foreach ($file in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223\$jsrDir\*.jar")
{
$file = $file -replace "\\", "/"
$cp = $cp + ";" + """$file"""
}
}
$env:CLASSPATH=$cp
# JSR223/JRuby - set ruby lib directory
if (Test-Path "$env:CASSANDRA_HOME\lib\jsr223\jruby\ruby")
{
$env:CASSANDRA_PARAMS=$env:CASSANDRA_PARAMS + " -Djruby.lib=$env:CASSANDRA_HOME\lib\jsr223\jruby"
}
# JSR223/JRuby - set ruby JNI libraries root directory
if (Test-Path "$env:CASSANDRA_HOME\lib\jsr223\jruby\jni")
{
$env:CASSANDRA_PARAMS=$env:CASSANDRA_PARAMS + " -Djffi.boot.library.path=$env:CASSANDRA_HOME\lib\jsr223\jruby\jni"
}
# JSR223/Jython - set python.home system property
if (Test-Path "$env:CASSANDRA_HOME\lib\jsr223\jython\jython.jar")
{
$env:CASSANDRA_PARAMS=$env:CASSANDRA_PARAMS + " -Dpython.home=$env:CASSANDRA_HOME\lib\jsr223\jython"
}
# JSR223/Scala - necessary system property
if (Test-Path "$env:CASSANDRA_HOME\lib\jsr223\scala\scala-compiler.jar")
{
$env:CASSANDRA_PARAMS=$env:CASSANDRA_PARAMS + " -Dscala.usejavacp=true"
}
}
#-----------------------------------------------------------------------------
Function ParseJVMInfo
{
@ -317,7 +281,6 @@ Function SetCassandraEnvironment
SetCassandraMain
BuildClassPath
SetJsr223Env
# Override these to set the amount of memory to allocate to the JVM at
# start-up. For production use you may wish to adjust this for your