From e5fb280ec82072fdd3373136a41f96c9536a1592 Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@eecs.berkeley.edu>
Date: Sat, 16 Oct 2010 21:51:25 -0700
Subject: [PATCH] Changed the config files that were included in git to
templates which are used to create an initial copy of each config file if the
user does not have one. This way, users won't accidentally commit their
changes to config files to git.
---
Makefile | 13 ++++++++++---
conf/{java-opts => java-opts.template} | 0
.../{log4j.properties => log4j.properties.template} | 0
conf/{spark-env.sh => spark-env.sh.template} | 0
4 files changed, 10 insertions(+), 3 deletions(-)
rename conf/{java-opts => java-opts.template} (100%)
rename conf/{log4j.properties => log4j.properties.template} (100%)
rename conf/{spark-env.sh => spark-env.sh.template} (100%)
diff --git a/Makefile b/Makefile
index febf47f3f4..0486e443a8 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,9 @@ else
COMPILER = $(SCALA_HOME)/bin/$(COMPILER_NAME)
endif
-all: scala java
+CONF_FILES = conf/spark-env.sh conf/log4j.properties conf/java-opts
+
+all: scala java conf-files
build/classes:
mkdir -p build/classes
@@ -50,7 +52,7 @@ native: java
jar: build/spark.jar build/spark-dep.jar
-depjar: build/spark-dep.jar
+dep-jar: build/spark-dep.jar
build/spark.jar: scala java
jar cf build/spark.jar -C build/classes spark
@@ -60,6 +62,11 @@ build/spark-dep.jar:
cd build/dep && for i in $(JARS); do jar xf ../../$$i; done
jar cf build/spark-dep.jar -C build/dep .
+conf-files: $(CONF_FILES)
+
+$(CONF_FILES): %: %.template
+ if [ ! -e $@ ] ; then cp $^ $@; else touch $^; fi
+
test: all
./alltests
@@ -69,4 +76,4 @@ clean:
$(MAKE) -C src/native clean
rm -rf build
-.phony: default all clean scala java native jar depjar
+.phony: default all clean scala java native jar dep-jar conf-files
diff --git a/conf/java-opts b/conf/java-opts.template
similarity index 100%
rename from conf/java-opts
rename to conf/java-opts.template
diff --git a/conf/log4j.properties b/conf/log4j.properties.template
similarity index 100%
rename from conf/log4j.properties
rename to conf/log4j.properties.template
diff --git a/conf/spark-env.sh b/conf/spark-env.sh.template
similarity index 100%
rename from conf/spark-env.sh
rename to conf/spark-env.sh.template
--
GitLab