Permalink
Browse files

binary distribution construction (for uhc) via 'make uhc-dist'

  • Loading branch information...
1 parent def45a1 commit 1957650104cbeeb294a078535d06e24698e8c1cb @atzedijkstra atzedijkstra committed Jan 31, 2012
Showing with 194 additions and 106 deletions.
  1. +98 −59 EHC/Makefile
  2. +1 −1 EHC/SVNREVISION
  3. +13 −1 EHC/configure
  4. +7 −1 EHC/configure.ac
  5. +19 −0 EHC/mk/config.mk.in
  6. +50 −0 EHC/mk/functions.mk
  7. +6 −44 EHC/mk/shared.mk.in
View
157 EHC/Makefile
@@ -49,6 +49,7 @@ $(RULER1): $(RULER1_DIR)/$(RULER1_AG) $(LIB_EH_UTIL_INS_FLAG)
include src/files.mk
include $(SRC_PREFIX)ehc/shared.mk
+include $(MK_PREFIX)functions.mk
include $(MK_PREFIX)shared.mk
include $(SRC_PREFIX)libutil/files.mk
@@ -98,7 +99,7 @@ include ehclib/files2.mk
include test/files.mk
include test/benchmark/files.mk
--include $(MK_PREFIX)dist.mk
+#-include $(MK_PREFIX)dist.mk
###########################################################################################
# all versions (as used by testing)
@@ -163,6 +164,10 @@ explanation:
echo "make test-expect : make expected output (for later comparison with test-regress), see test-regress for remarks" ; \
echo "make benchmark : run 16 nofib programs with 3 compilers on 3 inputs each"; \
echo "" ; \
+ echo "Distribution" ; \
+ echo "===========" ; \
+ echo "make uhc-dist : make platform specific binary distribution from uhc build in $(DISTABS_PREFIX)" ; \
+ echo "" ; \
echo "Cleaning up" ; \
echo "===========" ; \
echo "make <n>/clean : cleanup for variant <n>" ; \
@@ -226,24 +231,33 @@ heliumdoc: $(LIB_HELIUM_ALL_DRV_HS) $(LIB_TOP_HS_DRV) $(LIB_LVM_HS_DRV)
# Target: UHC: uhc + libs
###########################################################################################
-uhc: $(EHC_FOR_UHC_BLD_EXEC) $(EHC_UHC_INSTALL_VARIANT)/ehclibs
+# install util functions, also used for building distribution (see target uhc-dist)
-uhc-install: uhc
- @rm -f $(UHC_INSTALL_EXEC)
- @echo "Copying files to $(UHC_INSTALL_PREFIX) ..."
- @mkdir -p $(UHC_INSTALL_PREFIX)
- @$(call FUN_COPY_FILES_AND_RENAME,$(UHC_INSTALL_VARIANT_PREFIX),$(UHC_INSTALL_PREFIX),$(EHC_UHC_INSTALL_VARIANT),$(UHC_INSTALL_VARIANTNAME)) ; \
- alltargets="`$(EHC_FOR_UHC_BLD_EXEC) --meta-targets`" ; \
- echo "Postprocessing installation ..." ; \
+# Copy install files to install/dist location
+# $1: src install prefix
+# $2: dst install prefix
+FUN_INSTALLUHC_COPY = \
+ echo "Copying files to $(2) ..." && \
+ mkdir -p $(2) && \
+ $(call FUN_COPY_FILES_AND_RENAME,$(1),$(2),$(EHC_UHC_INSTALL_VARIANT),$(UHC_INSTALL_VARIANTNAME)) && \
+ $(STRIP) $(2)bin/$(EHC_EXEC_NAME)$(EXEC_SUFFIX) && \
+ alltargets="`$(EHC_FOR_UHC_BLD_EXEC) --meta-targets`" && \
+ echo "Postprocessing installation ..." && \
for target in $${alltargets} ; \
do \
$(MAKE) uhc-install-postprocess-$${target} EHC_VARIANT_TARGET=$${target} ; \
- done ; \
+ done
+
+# install
+
+uhc: $(EHC_FOR_UHC_BLD_EXEC) $(EHC_UHC_INSTALL_VARIANT)/ehclibs
+
+uhc-install: uhc
+ @rm -f $(UHC_INSTALL_EXEC)
+ @$(call FUN_INSTALLUHC_COPY,$(UHC_INSTALL_VARIANT_PREFIX),$(UHC_INSTALL_PREFIX)) ; \
rm -f $(UHC_INSTALL_EXEC) ; \
mkdir -p $(INSTALL_UHC_BIN_PREFIX) ; \
- $(STRIP) $(UHC_INSTALL_EHCBINARY) ; \
- echo "Generating wrapper ..." ; \
- $(call FUN_GEN_SHELL_ALIAS,$(UHC_INSTALL_EHCBINARY),$(UHC_INSTALL_SHELL),--cfg-install-root=$(TOPLEVEL_SYSTEM_ABSPATH_PREFIX)$(INSTALL_UHC_ROOT) --cfg-install-variant=$(UHC_INSTALL_VARIANTNAME))
+ $(call FUN_INSTALLUHC_WRAPPER,$(UHC_INSTALL_EHCBINARY),$(UHC_INSTALL_SHELL),$(INSTALL_UHC_BIN_PREFIX),$(TOPLEVEL_SYSTEM_ABSPATH_PREFIX)$(INSTALL_UHC_ROOT),$(UHC_INSTALL_VARIANTNAME))
@echo "Installation done"
# ln -s $(UHC_INSTALL_EHCBINARY) $(UHC_INSTALL_EXEC)
@@ -254,20 +268,20 @@ uhc-uninstall:
rm -fr $(UHC_INSTALL_PREFIX) $(UHC_INSTALL_EXEC)
uhc-install-postprocess-bc:
- @cd $(call FUN_DIR_VARIANT_LIB_TARGET_PREFIX,$(INSTALL_UHC_ROOT),$(UHC_INSTALL_VARIANTNAME),$(EHC_VARIANT_TARGET)) ; \
- for pkg in $(EHC_PACKAGES_ASSUMED) ; \
- do \
- rm -f $${pkg}/$(EHCLIB_MAIN)* ; \
- done
+# @cd $(call FUN_DIR_VARIANT_LIB_TARGET_PREFIX,$(INSTALL_UHC_ROOT),$(UHC_INSTALL_VARIANTNAME),$(EHC_VARIANT_TARGET)) ; \
+# for pkg in $(EHC_PACKAGES_ASSUMED) ; \
+# do \
+# rm -f $${pkg}/$(EHCLIB_MAIN)* ; \
+# done
# rm -f $${pkg}/*.{hs,hs-cpp,c} $${pkg}/*/*.{hs,hs-cpp,c} $${pkg}/$(EHCLIB_MAIN)* ; \
uhc-install-postprocess-C:
- @cd $(call FUN_DIR_VARIANT_LIB_TARGET_PREFIX,$(INSTALL_UHC_ROOT),$(UHC_INSTALL_VARIANTNAME),$(EHC_VARIANT_TARGET)) ; \
- for pkg in $(EHC_PACKAGES_ASSUMED) ; \
- do \
- rm -f $${pkg}/$(EHCLIB_MAIN)* ; \
- done
+# @cd $(call FUN_DIR_VARIANT_LIB_TARGET_PREFIX,$(INSTALL_UHC_ROOT),$(UHC_INSTALL_VARIANTNAME),$(EHC_VARIANT_TARGET)) ; \
+# for pkg in $(EHC_PACKAGES_ASSUMED) ; \
+# do \
+# rm -f $${pkg}/$(EHCLIB_MAIN)* ; \
+# done
# rm -f $${pkg}/*.{hs,hs-cpp} $${pkg}/*/*.{hs,hs-cpp} $${pkg}/$(EHCLIB_MAIN)* ; \
@@ -282,6 +296,66 @@ uhc-install-postprocess-llvm:
# still to do: uhc --meta-export-env=$(INSTALL_UHC_LIB_PREFIX),$(UHC_EXEC_NAME)
###########################################################################################
+# Target: UHC: binary distribution generation
+###########################################################################################
+
+uhc-dist: uhc
+ @distnm="$(UHC_INSTALL_VARIANTNAME)-R$(subst :,-,$(SVN_REVISION))-$(DATE)-$(HOST_PLATFORM_NRWORDBITS)-$(HOST_PLATFORM_NAME)" && \
+ distdir="$(DISTABS_PREFIX)$${distnm}" && \
+ mkdir -p $${distdir} && \
+ echo $${distnm} && \
+ echo $(UHC_INSTALL_VARIANT_PREFIX) $(UHC_INSTALL_PREFIX) && \
+ $(call FUN_INSTALLUHC_COPY,$(UHC_INSTALL_VARIANT_PREFIX),$${distdir}/dist/) && \
+ echo "Generating install (make, config, ...) files to $${distdir} ..." && \
+ mkdir -p $(UHC_INSTALL_VARIANT_PREFIX) && \
+ ( echo "# installation makefile, generated for $${distnm}" && \
+ echo "" && \
+ echo "TAR:=$(TAR)" && \
+ echo 'include mk/functions.mk' && \
+ echo "" && \
+ echo 'DIST_DIR:=@prefix@' && \
+ echo 'DIST_PREFIX:=$$(DIST_DIR)/' && \
+ echo 'DIST_LIB_DIR:=$$(DIST_PREFIX)lib' && \
+ echo 'DIST_LIB_PREFIX:=$$(DIST_LIB_DIR)/' && \
+ echo 'DIST_BIN_PREFIX:=$$(DIST_PREFIX)bin/' && \
+ echo 'DIST_INSTALL_PREFIX:=$$(call FUN_DIR_VARIANT_PREFIX,$$(DIST_LIB_DIR),'"$(UHC_INSTALL_VARIANTNAME)"')' && \
+ echo 'DIST_EHCBINARY:=$$(DIST_INSTALL_PREFIX)bin/'"$(EHC_EXEC_NAME)$(EXEC_SUFFIX)" && \
+ echo 'DIST_UHCSHELL:=$$(DIST_BIN_PREFIX)'"$(UHC_EXEC_NAME)" && \
+ echo "" && \
+ echo "install:" && \
+ echo ' @echo Copying files to $$(DIST_INSTALL_PREFIX) ...' && \
+ echo ' @$$(call FUN_COPY_FILES_BY_TAR,dist,$$(DIST_INSTALL_PREFIX),*)' && \
+ echo ' @$$(call FUN_INSTALLUHC_WRAPPER,$$(DIST_EHCBINARY),$$(DIST_UHCSHELL),$$(DIST_BIN_PREFIX),$$(DIST_LIB_PREFIX),'"$(UHC_INSTALL_VARIANTNAME)"')' && \
+ echo "" && \
+ echo "uninstall:" && \
+ echo ' @echo Removing installation $$(DIST_INSTALL_PREFIX) ...' && \
+ echo ' rm -rf $$(DIST_INSTALL_PREFIX) $$(DIST_UHCSHELL)' && \
+ echo "" && \
+ echo "# done" \
+ ) > $${distdir}/Makefile.in && \
+ ( echo "# installation configure, generated for $${distnm}" && \
+ echo "AC_INIT([UHC],[$(EH_VERSION_FULL)],[uhc-users@lists.science.uu.nl, http://www.cs.uu.nl/wiki/UHC/WebHome])" && \
+ echo 'AC_CANONICAL_HOST' && \
+ echo 'AC_CONFIG_FILES([Makefile])' && \
+ echo 'AC_OUTPUT' && \
+ echo "# done" \
+ ) > $${distdir}/configure.ac && \
+ cp LICENSE README \
+ aclocal.m4 \
+ install-sh \
+ config.guess config.sub \
+ $${distdir} && \
+ mkdir -p $${distdir}/mk && \
+ cp $(MK_PREFIX)functions.mk \
+ $${distdir}/mk && \
+ cd $${distdir} && \
+ autoconf && \
+ cd .. && \
+ echo "Building archive $${distnm}.tar.bz2 ..." && \
+ tar cfj $${distnm}.tar.bz2 $${distnm} && \
+ echo "Done"
+
+###########################################################################################
# Target: UHC: installation
###########################################################################################
@@ -309,6 +383,7 @@ clean:
$(MAKE) ruler-clean
$(MAKE) shuffle-clean
$(MAKE) libutil-clean
+ rm -rf $(DIST_PREFIX)
# @echo "NOTE: all but external libraries (gmp, ...) is cleaned. Use 'make clean-extlibs' for cleaning those."
@@ -333,42 +408,6 @@ bump-minorminor:
echo "bumped version to `cat VERSION`"
###########################################################################################
-# Releasing, construct distribution
-###########################################################################################
-
-# NOTE: not maintained for some time already; guaranteed to be broken
-
-DISTS_DIR := $(BLD_PREFIX)dists
-DIST_UHC_SRC_NM := uhc-$(TODAY)-$(EH_VERSION_FULL)-src
-
-uhc-src-dist:
- mkdir -p $(DISTS_DIR)/$(DIST_UHC_SRC_NM) ; \
- ( (tar cf - --exclude '.*' \
- src \
- ehclib extlibs \
- doc/*-doc.pdf \
- bin/filterOutEmptyFiles bin/agdepend bin/llvm-*.in \
- test/files.mk test/regress/frozen-test-expect.tgz \
- Makefile mk \
- configure.ac configure install-sh config.sub config.guess \
- Setup.hs \
- VERSION README ANNOUNCE LICENSE \
- ) \
- | (cd $(DISTS_DIR)/$(DIST_UHC_SRC_NM) && tar xf -) \
- ) ; \
- $(call FUN_GEN_CABAL_EXEC \
- , uhc \
- , $(EH_VERSION_FULL) \
- , mtl \
- , \
- , Utrecht Haskell Compiler \
- , \
- , \
- ) > $(DISTS_DIR)/$(DIST_UHC_SRC_NM)/uhc.cabal ; \
- (cd $(DISTS_DIR) && tar cfj $(DIST_UHC_SRC_NM).tar.bz2 $(DIST_UHC_SRC_NM)) ; \
- cp $(DISTS_DIR)/$(DIST_UHC_SRC_NM).tar.bz2 www
-
-###########################################################################################
# Releasing, currently just svn copying
###########################################################################################
View
2 EHC/SVNREVISION
@@ -1 +1 @@
-2422M
+2422:2426M
View
14 EHC/configure
@@ -762,6 +762,8 @@ PATHS_SEP
SLASH
LINKER_SYMBOL_PREFIX
DEVELOPMENT_PLATFORM
+HOST_PLATFORM
+NRWORDBITS_PLATFORM
LIBTOOL_STATIC_CMD
LIBTOOL_STATIC_OPTS
LIBTOOL_DYNAMIC_CMD
@@ -31282,6 +31284,9 @@ else
use64bits=""
fi
+# get nr of bits, for further Makefile use
+nrwordbits_platform="$((8 * $ac_cv_sizeof_intptr_t))"
+
if test "x$use32bits" = "xyes"
then
gccExtlibsOptions="$gccExtlibsOptions -m32"
@@ -31420,6 +31425,7 @@ suffix_libJavaScript=".mjs"
prefix_lib=""
# development platform
development_platform="UNIX"
+host_platform="$host"
# path separator
paths_sep=":"
slash="/"
@@ -31489,6 +31495,10 @@ LINKER_SYMBOL_PREFIX="$linker_symbol_prefix"
# misc
DEVELOPMENT_PLATFORM="$development_platform"
+HOST_PLATFORM="$host_platform"
+
+NRWORDBITS_PLATFORM="$nrwordbits_platform"
+
# libtool used, if any
LIBTOOL_STATIC_CMD="$libtoolStaticCmd"
@@ -32411,6 +32421,8 @@ PATHS_SEP!$PATHS_SEP$ac_delim
SLASH!$SLASH$ac_delim
LINKER_SYMBOL_PREFIX!$LINKER_SYMBOL_PREFIX$ac_delim
DEVELOPMENT_PLATFORM!$DEVELOPMENT_PLATFORM$ac_delim
+HOST_PLATFORM!$HOST_PLATFORM$ac_delim
+NRWORDBITS_PLATFORM!$NRWORDBITS_PLATFORM$ac_delim
LIBTOOL_STATIC_CMD!$LIBTOOL_STATIC_CMD$ac_delim
LIBTOOL_STATIC_OPTS!$LIBTOOL_STATIC_OPTS$ac_delim
LIBTOOL_DYNAMIC_CMD!$LIBTOOL_DYNAMIC_CMD$ac_delim
@@ -32436,7 +32448,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
View
8 EHC/configure.ac
@@ -1,5 +1,5 @@
### Process this file with autoconf to produce a configure script.
-AC_INIT([EH],[0.1],[uhc-developers@cs.uu.nl, http://www.cs.uu.nl/wiki/UHC/WebHome])
+AC_INIT([UHC],[1.1.3],[uhc-developers@lists.science.uu.nl, http://www.cs.uu.nl/wiki/UHC/WebHome])
### version of autoconf used (and required)
#AC_PREREQ(2.64)
@@ -893,6 +893,9 @@ else
use64bits=""
fi
+# get nr of bits, for further Makefile use
+nrwordbits_platform="$((8 * $ac_cv_sizeof_intptr_t))"
+
if test "x$use32bits" = "xyes"
then
gccExtlibsOptions="$gccExtlibsOptions -m32"
@@ -993,6 +996,7 @@ suffix_libJavaScript=".mjs"
prefix_lib=""
# development platform
development_platform="UNIX"
+host_platform="$host"
# path separator
paths_sep=":"
slash="/"
@@ -1053,6 +1057,8 @@ AC_SUBST(LINKER_SYMBOL_PREFIX,"$linker_symbol_prefix")
# misc
AC_SUBST(DEVELOPMENT_PLATFORM,"$development_platform")
+AC_SUBST(HOST_PLATFORM,"$host_platform")
+AC_SUBST(NRWORDBITS_PLATFORM,"$nrwordbits_platform")
# libtool used, if any
AC_SUBST(LIBTOOL_STATIC_CMD, "$libtoolStaticCmd")
View
19 EHC/mk/config.mk.in
@@ -6,6 +6,12 @@ MK_PREFIX := $(TOP_PREFIX)mk/
MK_CONFIG_MKF := $(MK_PREFIX)config.mk
###########################################################################################
+# current date
+###########################################################################################
+
+DATE := $(shell /bin/date +%Y%m%d)
+
+###########################################################################################
# the overall version of EH
###########################################################################################
@@ -57,6 +63,19 @@ EXTLIBS_GMP_PKG_NAME := @EXTLIBS_GMP_PKG_NAME@
UHC_PKG_CONFIGFILE_NAME := installed-pkg-config
###########################################################################################
+# Platform we develop on; stuff depending on it, in particular to cater for cygwin
+###########################################################################################
+
+# platform: UNIX, CYGWIN
+DEVELOPMENT_PLATFORM := @DEVELOPMENT_PLATFORM@
+# platform: as known by configure, with wordsize added
+HOST_PLATFORM_NAME := @HOST_PLATFORM@
+HOST_PLATFORM_NRWORDBITS := @NRWORDBITS_PLATFORM@
+
+# A prefix to be added for direct access to otherwise hidden (by cygwin) locations
+TOPLEVEL_SYSTEM_ABSPATH_PREFIX := @TOPLEVEL_SYSTEM_ABSPATH_PREFIX@
+
+###########################################################################################
# inclusion of features
###########################################################################################
View
50 EHC/mk/functions.mk
@@ -0,0 +1,50 @@
+###########################################################################################
+# Copy files
+###########################################################################################
+
+# copy files using tar
+# $1: src dir
+# $2: dest dir
+# $3: src files relative to src dir
+FUN_COPY_FILES_BY_TAR = ((cd $(1) && $(TAR) --ignore-failed-read -cf - $(3)) | (mkdir -p $(2) && cd $(2) && $(TAR) xf -))
+
+# copy files recursively while renaming the variant subdirectory
+# $1: src dir
+# $2: dest dir
+# $3: original variant name
+# $4: target variant name
+FUN_COPY_FILES_AND_RENAME = (cd $(1) && for i in `find . -type f`; do tgt=$(2)/`echo $${i} | sed s+$(3)/+$(4)/+g`; mkdir -p `dirname $${tgt}` ; install $${i} $${tgt}; done)
+
+###########################################################################################
+# Shell script generation: shell alias to executable with config options
+###########################################################################################
+
+# $1: executable
+# $2: shell script
+# $3: config options
+FUN_GEN_SHELL_ALIAS = \
+ ( \
+ echo "\#!/bin/sh" ; \
+ echo $(1) '$(3) $$*' ; \
+ ) > $(2) ; \
+ chmod +x $(2)
+
+###########################################################################################
+# Generate uhc wrapper shell script
+###########################################################################################
+
+# $1: name of binary
+# $2: dst install shell script name
+# $3: prefix of location of binary
+# $4: abs installation root dir
+# $5: variant name
+FUN_INSTALLUHC_WRAPPER = \
+ echo "Generating uhc wrapper in $(2) ..." && \
+ mkdir -p $(3) && \
+ $(call FUN_GEN_SHELL_ALIAS,$(1),$(2),--cfg-install-root=$(4) --cfg-install-variant=$(5))
+
+###########################################################################################
+# installation locations for ehc running time, as functions still depending on variant + target, see shared.mk for more
+###########################################################################################
+
+FUN_DIR_VARIANT_PREFIX = $(1)/$(2)/
View
50 EHC/mk/shared.mk.in
@@ -142,16 +142,6 @@ EHC_EXEC_NAME := @EHC_EXEC_NAME@
UHC_EXEC_NAME := @UHC_EXEC_NAME@
###########################################################################################
-# Platform we develop on; stuff depending on it, in particular to cater for cygwin
-###########################################################################################
-
-# platform: UNIX, CYGWIN
-DEVELOPMENT_PLATFORM := @DEVELOPMENT_PLATFORM@
-
-# A prefix to be added for direct access to otherwise hidden (by cygwin) locations
-TOPLEVEL_SYSTEM_ABSPATH_PREFIX := @TOPLEVEL_SYSTEM_ABSPATH_PREFIX@
-
-###########################################################################################
# SVN revision nr, and cmd to extract, if present
###########################################################################################
@@ -160,7 +150,7 @@ SVN_VERSION_CMD := @SVN_VERSION_CMD@
SVN_REVISION := @SVN_REVISION@
###########################################################################################
-# Locations in source, build and install
+# Locations in source, build, install, distribution
###########################################################################################
# suffix for build + (temporary) install locations + package names
@@ -207,6 +197,10 @@ INSTALL_UHC_BIN_PREFIX := @prefix@/bin/
INSTALL_UHC_LIB_PREFIX := $(INSTALL_UHC_PREFIX)lib/
INSTALL_UHC_INC_PREFIX := $(INSTALL_UHC_PREFIX)include/
+# location for distribution construction
+DIST_PREFIX := $(TOP_PREFIX)dist$(EHC_BUILD_SUFFIX_DASH)/
+DISTABS_PREFIX := $(TOPABS_PREFIX)dist$(EHC_BUILD_SUFFIX_DASH)/
+
# location for building
BLD_PREFIX := $(TOP_PREFIX)build$(EHC_BUILD_SUFFIX_DASH)/
BLDABS_PREFIX := $(TOPABS_PREFIX)build$(EHC_BUILD_SUFFIX_DASH)/
@@ -273,10 +267,9 @@ FUN_MD5 = echo -n "no md5"
endif
###########################################################################################
-# installation locations for ehc running time, as functions still depending on variant + target
+# installation locations for ehc running time, as functions still depending on variant + target, see also functions.mk
###########################################################################################
-FUN_DIR_VARIANT_PREFIX = $(1)/$(2)/
FUN_DIR_VARIANT_XXX_PREFIX = $(call FUN_DIR_VARIANT_PREFIX,$(1),$(2))$(3)/
FUN_DIR_VARIANT_SHARED_PREFIX = $(call FUN_DIR_VARIANT_XXX_PREFIX,$(1),$(2),shared)
FUN_DIR_VARIANT_LIB_PREFIX = $(call FUN_DIR_VARIANT_XXX_PREFIX,$(1),$(2),lib)
@@ -454,20 +447,6 @@ EHC_SHUFFLE_ORDER := 1 < 2 < 3 < 4 < 4_99 < 5 < 6 < 7 < 8 < 9 < 10 < 11 < 12 < 1
# 10 < 40, \
###########################################################################################
-# Shell script generation: shell alias to executable with config options
-###########################################################################################
-
-# $1: executable
-# $2: shell script
-# $3: config options
-FUN_GEN_SHELL_ALIAS = \
- ( \
- echo "\#!/bin/sh" ; \
- echo $(1) '$(3) $$*' ; \
- ) > $(2) ; \
- chmod +x $(2)
-
-###########################################################################################
# Cabal
###########################################################################################
@@ -549,23 +528,6 @@ FILTER_OUT_EMPTY_FILES = $(if $(strip $(1)),$(shell echo $(1) | sed -e 's/\([^
# FILTER_OUT_EMPTY_FILES = $(shell echo $(1) | sed -e 's/\([^ ]*\)\.hs\s*/ls \1\*\.hs ;/g' | sh | sed -e 's/\s+/ /g' | sort | uniq | xargs $(SHELL_FILTER_NONEMP_FILES) )
###########################################################################################
-# Copy files
-###########################################################################################
-
-# copy files using tar
-# $1: src dir
-# $2: dest dir
-# $3: src files relative to src dir
-FUN_COPY_FILES_BY_TAR = ((cd $(1) && $(TAR) --ignore-failed-read -cf - $(3)) | (cd $(2) && $(TAR) xf -))
-
-# copy files recursively while renaming the variant subdirectory
-# $1: src dir
-# $2: dest dir
-# $3: original variant name
-# $4: target variant name
-FUN_COPY_FILES_AND_RENAME = (cd $(1) && for i in `find . -type f`; do tgt=$(2)/`echo $${i} | sed s+$(3)/+$(4)/+g`; mkdir -p `dirname $${tgt}` ; install $${i} $${tgt}; done)
-
-###########################################################################################
# Misc
###########################################################################################

0 comments on commit 1957650

Please sign in to comment.