mirrors/pgloader
1
0
Fork 0
mirror of https://github.com/dimitri/pgloader.git synced 2026-01-22 07:31:04 +01:00
Code Issues Projects Releases Wiki Activity

Improve pgloader bundle distribution.

Browse Source 
Include the local git clones in the bundle so that git is not needed at
build time for consumers of the bundle. Fixes #428.
This commit is contained in:
Dimitri Fontaine 2016-08-07 21:30:48 +02:00
parent c2c98b8b42
commit ffef9bc28e
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -172,9 +172,11 @@ $(BUNDLEDIR):
--eval '(quit)'
$(BUNDLE): $(BUNDLEDIR)
cp bundle/README.md bundle/Makefile $(BUNDLEDIR)
cp bundle/README.md $(BUNDLEDIR)
sed -e s/%VERSION%/$(VERSION)/ < bundle/Makefile > $(BUNDLEDIR)/Makefile
git archive --format=tar --prefix=pgloader-$(VERSION)/ master \
| tar -C $(BUNDLEDIR)/local-projects/ -xf -
make QLDIR=$(BUNDLEDIR) clones
tar -C build/bundle \
--exclude bin \
--exclude test/sqlite \

28
bundle/Makefile
View File

@ -3,7 +3,7 @@
CL = sbcl
APP_NAME = pgloader
VERSION = 3.3.0.50
VERSION = %VERSION%
ifeq ($(OS),Windows_NT)
EXE = .exe
@ -43,7 +43,7 @@ $(BUILDAPP):
--eval '(buildapp:build-buildapp "$@")' \
--eval '(quit)'
$(PGLOADER): $(BUILDAPP) clones
$(PGLOADER): $(BUILDAPP)
$(BUILDAPP) --logfile /tmp/pgloader-bundle-build.log \
$(BUILDAPP_OPTS) \
--sbcl $(CL) \
@ -58,30 +58,6 @@ $(PGLOADER): $(BUILDAPP) clones
# that's ugly, but necessary when building on Windows :(
mv $@.tmp $@
#
# Provide the current versions of some packages, not the Quicklisp one:
#
local-projects/qmynd:
git clone https://github.com/qitab/qmynd.git $@
local-projects/cl-ixf:
git clone https://github.com/dimitri/cl-ixf.git $@
local-projects/cl-db3:
git clone https://github.com/dimitri/cl-db3.git $@
local-projects/cl-csv:
git clone https://github.com/AccelerationNet/cl-csv.git $@
local-projects/esrap:
git clone https://github.com/scymtym/esrap.git $@
clones: local-projects/cl-ixf \
local-projects/cl-db3 \
local-projects/cl-csv \
local-projects/qmynd \
local-projects/esrap ;
test: $(PGLOADER)
$(MAKE) PGLOADER=$(realpath $(PGLOADER)) -C $(SRCDIR)/test regress