PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-12 15:04:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add resource directories and config/

Browse source
This commit is contained in:
Chord 2016-07-26 21:32:31 -04:00
parent 35a592476f
commit 1168022db9
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
build.sbt
View file

@ -19,13 +19,21 @@ lazy val commonSettings = Seq(
) )
lazy val pscryptoSettings = Seq( lazy val pscryptoSettings = Seq(
unmanagedClasspath in Test += (baseDirectory in ThisBuild).value / "pscrypto-lib", unmanagedClasspath in Test += (baseDirectory in ThisBuild).value / "pscrypto-lib",
unmanagedClasspath in Runtime += (baseDirectory in ThisBuild).value / "pscrypto-lib", unmanagedClasspath in Runtime += (baseDirectory in ThisBuild).value / "pscrypto-lib"
unmanagedResources in Runtime += (baseDirectory in ThisBuild).value / "pscrypto-lib" )
lazy val psloginPackSettings = packAutoSettings ++ Seq(
packArchivePrefix := "pslogin",
packExtraClasspath := Map("ps-login" -> Seq("${PROG_HOME}/pscrypto-lib",
"${PROG_HOME}/config")),
packResourceDir += (baseDirectory.value / "pscrypto-lib" -> "pscrypto-lib"),
packResourceDir += (baseDirectory.value / "config" -> "config")
) )
lazy val root = (project in file(".")). lazy val root = (project in file(".")).
settings(commonSettings: _*). settings(commonSettings: _*).
settings(psloginPackSettings: _*).
aggregate(pslogin, common) aggregate(pslogin, common)
lazy val pslogin = (project in file("pslogin")). lazy val pslogin = (project in file("pslogin")).
@ -34,7 +42,7 @@ lazy val pslogin = (project in file("pslogin")).
name := "pslogin" name := "pslogin"
). ).
settings(pscryptoSettings: _*). settings(pscryptoSettings: _*).
settings(packAutoSettings: _*).dependsOn(common) dependsOn(common)
lazy val common = (project in file("common")). lazy val common = (project in file("common")).
settings(commonSettings: _*). settings(commonSettings: _*).

0
logback.xml → config/logback.xml
View file

12
pslogin/src/main/scala/PsLogin.scala
View file

@ -1,5 +1,6 @@
// Copyright (c) 2016 PSForever.net to present // Copyright (c) 2016 PSForever.net to present
import java.net.InetAddress import java.net.InetAddress
import java.io.File
import akka.actor.{ActorSystem, Props} import akka.actor.{ActorSystem, Props}
import ch.qos.logback.classic.LoggerContext import ch.qos.logback.classic.LoggerContext
@ -98,7 +99,16 @@ object PsLogin {
banner() banner()
println(systemInformation) println(systemInformation)
initializeLogging("logback.xml") // Config directory
// Assume a default of the current directory
var configDirectory = "config"
// This is defined when we are running from SBT pack
if(System.getProperty("prog.home") != null) {
configDirectory = System.getProperty("prog.home") + File.separator + "config"
}
initializeLogging(configDirectory + File.separator + "logback.xml")
parseArgs(args) parseArgs(args)
/** Initialize the PSCrypto native library /** Initialize the PSCrypto native library