From cb90d0adedd7853b39ad622f56cef85a1e31abd5 Mon Sep 17 00:00:00 2001
From: Pawel Szostek <pawel.szostek@cern.ch>
Date: Mon, 21 Oct 2013 14:58:40 +0200
Subject: [PATCH] Move makefile and "build" scripts to separate directory
---
embed_build_id.sh => scripts/build_hash.sh | 2 +-
make_tarball => scripts/makefile | 26 ++++++++++++++++------
2 files changed, 20 insertions(+), 8 deletions(-)
rename embed_build_id.sh => scripts/build_hash.sh (88%)
rename make_tarball => scripts/makefile (61%)
diff --git a/embed_build_id.sh b/scripts/build_hash.sh
similarity index 88%
rename from embed_build_id.sh
rename to scripts/build_hash.sh
index 9cd8db87..f347ed5a 100755
--- a/embed_build_id.sh
+++ b/scripts/build_hash.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
diff --git a/make_tarball b/scripts/makefile
similarity index 61%
rename from make_tarball
rename to scripts/makefile
index 13e7c09c..be52145e 100644
--- a/make_tarball
+++ b/scripts/makefile
@@ -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
--
GitLab