Move makefile and "build" scripts to separate directory

cb90d0ad · Pawel Szostek · 64ac1e4b · cb90d0ad · cb90d0ad
Commit cb90d0ad authored Oct 21, 2013 by Pawel Szostek
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 8 deletions

build_hash.sh scripts/build_hash.sh +1 -1

makefile scripts/makefile +19 -7

No files found.
--- a/embed_build_id.sh
+++ b/embed_build_id.sh
@@ -8,5 +8,5 @@ date_string=$(echo $date_line | awk '{print $6 $3 $4}')

 embed_string='"'$(echo "$date_string:${commit_string:0:6}")'"'

-build_hash_path="src/build_hash.py"
+build_hash_path="../hdlmake/build_hash.py"
 echo 'BUILD_ID = '"$embed_string" > $build_hash_path
--- a/make_tarball
+++ b/make_tarball
@@ -15,17 +15,18 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
-SRC_FILES := $(shell find hdlmake -name '*py')
+SRC_DIR := ../hdlmake
+SRC_FILES := $(shell find $(SRC_DIR) -name '*py')
 SRC_FILES_BASENAMES = $(foreach src, $(SRC_FILES), $(shell basename $(src)))

-TAG = $(shell git describe --abbrev=0 --tags --always)#get the latest tag
+TAG = $(shell cd .. && git describe --abbrev=0 --tags --always)#get the latest tag
 RELEASE = hdlmake-$(TAG).tar.gz
 ARCH := hdlmake$(TAG)

-single_file_app: $(ARCH) build_tag
+single_file_app: warning $(ARCH)
 $(ARCH): $(SRC_FILES)
-	bash embed_build_id.sh
-	cd hdlmake &&\
+	bash build_hash.sh
+	cd $(SRC_DIR) &&\
 	zip $(ARCH) build_hash.py $(SRC_FILES_BASENAMES) &&\
 	echo '#!/usr/bin/python' > $(ARCH) &&\
 	cat $(ARCH).zip >> $(ARCH) &&\
@@ -37,8 +38,19 @@ release: $(RELEASE)
 $(RELEASE): $(ARCH) $(SRC)
 	tar -zcvf $@ *

-.PHONY: clean build_tag
+warning:
+	echo This makefile is not ment to build an executable file.
+	echo The default way to run hdlmake is to give the path
+	echo to the source code as the first argument to the Python
+	echo interpreter call, for instance:
+	echo python path/to/hdl-make/hdlmake
+	echo If you _really_ need to have a single file, then
+	echo you might use this makefile, but in some cases it might
+	echo reduce the volume of displayed debugging information.
+	sleep 5
+
+.PHONY: clean

 clean:
-	rm -f $(SRC_DIR)/*~ $(PREFIX)/*pyc $(EXEC) hdlmake-*.tar.gz 
+	rm -f $(SRC_DIR)/*~ $(SRC_DIR)/*pyc ../$(ARCH) ../hdlmake-*.tar.gz