make it obvious what role *.txt files play based on their filename

7 files changed, 17 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
index ffc4c6c..53757ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /upstream/
 /build/
-/maven-svn-version.txt
-/network
\ No newline at end of file
+/token_*
+/gen_*
diff --git a/Makefile b/Makefile
index 349bd4c..ec19415 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
 top=$(shell pwd)
 
-all: extract maven-svn-version.txt
+mvn_ver=$(shell cat conf_apache-maven_version.txt)
+
+all: extract gen_version-maven-svn.txt
 
 # We get slf4j from git because the official distribution tarball for 1.7.5 is
 # incomplete.
 
 download: \
-	upstream/apache-maven-$(shell cat apache-maven-version.txt) \
+	upstream/apache-maven-$(mvn_ver) \
 	upstream/maven-svn \
 	upstream/slf4j-git \
 	upstream/plexus-compiler-git \
@@ -33,16 +35,13 @@ extract: \
 	build/plexus-interpolation \
 	build/plexus-pom
 
-# touch this file to trigger network updates
-network:
+token_%:
 	touch $@
 
 ################################################################################
 
-mvn_ver=$(shell cat apache-maven-version.txt)
-upstream/apache-maven-${mvn_ver}-src.tar.gz: upstream/apache-maven-%-src.tar.gz:
-	ver=$* && \
-	mirror='http://archive.apache.org/dist' && \
+upstream/apache-maven-${mvn_ver}-src.tar.gz: upstream/apache-maven-%-src.tar.gz: conf_apache-maven_mirror.txt token_network
+	ver=$* && mirror=$$(< $<) && \
 	mkdir -p ${@D} && \
 	wget -c -O $@ "$${mirror}/maven/maven-$${ver%%.*}/$${ver}/source/${@F}"
 upstream/apache-maven-${mvn_ver}: upstream/apache-maven-%: upstream/apache-maven-%-src.tar.gz
@@ -55,7 +54,7 @@ build/maven: upstream/apache-maven-${mvn_ver}
 
 ################################################################################
 
-upstream/maven-svn: maven-svn-map.txt network
+upstream/maven-svn: conf_maven-svn_map.txt token_network
 	if ! [[ -d "$@/.svn" ]]; then \
 		mkdir -p ${@D} && \
 		svn checkout --depth=empty https://svn.apache.org/repos/asf/maven "$@"; \
@@ -67,23 +66,23 @@ upstream/maven-svn: maven-svn-map.txt network
 		svn update --parents "$$svnpath"; \
 	done <"${top}/$<"
 	touch $@
-maven-svn-version.txt: upstream/maven-svn maven-svn-map.txt
+gen_version-maven-svn.txt: upstream/maven-svn conf_maven-svn_map.txt
 	while read svnpath localpath; do \
 		cd "${top}/$</$${svnpath}" && \
 		LANG=C svn log -l 1 .|sed -n 2p; \
-	done <"${top}/maven-svn-map.txt" | \
+	done <"${top}/conf_maven-svn_map.txt" | \
 	cut -d'|' -f3 | date --file=- --utc --iso-8601 | sort | sed -n '$$p' > "${top}/$@"
-build/maven-extras: upstream/maven-svn maven-svn-map.txt
+build/maven-extras: upstream/maven-svn conf_maven-svn_map.txt
 	rm -rf $@
 	mkdir -p $@
 	while read svnpath localpath; do \
 		mkdir -p "${top}/$@/$${localpath}" && \
 		lndir -silent "${top}/$</$${svnpath}" "${top}/$@/$${localpath}"; \
-	done <maven-svn-map.txt
+	done <conf_maven-svn_map.txt
 
 ################################################################################
 
-upstream/%-git: git-urls.txt
+upstream/%-git: conf_git-urls.txt
 	gitget checkout $$(grep $* $<) $@
 build/%: upstream/%-git
 	rm -rf $@
diff --git a/apache-maven-version.txt b/apache-maven-version.txt
deleted file mode 100644
index 94ff29c..0000000
--- a/apache-maven-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.1.1
diff --git a/conf_apache-maven_mirror.txt b/conf_apache-maven_mirror.txt
new file mode 100644
index 0000000..7c21d7f
--- /dev/null
+++ b/conf_apache-maven_mirror.txt
@@ -0,0 +1 @@
+http://archive.apache.org/dist
diff --git a/conf_apache-maven_version.txt b/conf_apache-maven_version.txt
new file mode 100644
index 0000000..e4604e3
--- /dev/null
+++ b/conf_apache-maven_version.txt
@@ -0,0 +1 @@
+3.2.1
diff --git a/git-urls.txt b/conf_git-urls.txt
index 5e38c5c..5e38c5c 100644
--- a/git-urls.txt
+++ b/conf_git-urls.txt
diff --git a/maven-svn-map.txt b/conf_maven-svn_map.txt
index 8e8ccee..8e8ccee 100644
--- a/maven-svn-map.txt
+++ b/conf_maven-svn_map.txt