From 8873684b8e4ad87067f71d2462571a2fcf78af26 Mon Sep 17 00:00:00 2001
From: Viktor Kuncak <viktor.kuncak@epfl.ch>
Date: Wed, 24 Jun 2015 23:22:37 -0400
Subject: [PATCH] Fixed scala scripts to work from scripts directory
---
scripts/scalacleon | 4 ++--
scripts/scalaleon | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/scalacleon b/scripts/scalacleon
index 4fb34bdbc..d7c3bd25a 100755
--- a/scripts/scalacleon
+++ b/scripts/scalacleon
@@ -3,9 +3,9 @@
# - Leon home is stored in PATH_TO_LEON
# - we have xargs installed
# - ${SCALA_COMPILER} is on the path
-PATH_TO_LEON="./" # assume we run from Leon home directory
+PATH_TO_LEON=".." # assume we run from Leon script directory
PATH_TO_LEON_LIB="${PATH_TO_LEON}/library/"
-OUT_CLASSES_DIR="./out-classes"
+OUT_CLASSES_DIR="${PATH_TO_LEON}/out-classes"
SCALA_COMPILER="fsc"
mkdir -p ${OUT_CLASSES_DIR}
echo ========= Now invoking: ====================================
diff --git a/scripts/scalaleon b/scripts/scalaleon
index ca1b55d12..58a164168 100755
--- a/scripts/scalaleon
+++ b/scripts/scalaleon
@@ -1,7 +1,7 @@
#!/bin/bash --posix
# Assumes:
# - ${SCALA_JVM} is on the path
-OUT_CLASSES_DIR="./out-classes"
+OUT_CLASSES_DIR="../out-classes" # assume we run from scripts directory
SCALA_RUN="scala"
if [[ -d ${OUT_CLASSES_DIR} ]]
then
--
GitLab