* Rename of .profile files to .ep, which is correct according to the

  author of encap. Also associated Makefile and m4-1.4.4.sh changes.
* Added chmod 755 of .sh scripts before execution, in case the perms
  go bad for some reason.


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2013 ce84e21b-d406-0410-9b95-82705330c041

15 files changed, 53 insertions, 52 deletions

diff --git a/encap/Makefile b/encap/Makefile
index 951df309a..969aa49a2 100644
--- a/encap/Makefile
+++ b/encap/Makefile
@@ -2,7 +2,7 @@
 
 .PHONY : all install clean uninstall encaps rename
 .SUFFIXES : 
-.SUFFIXES : .profile .sh .e .ep
+.SUFFIXES : .profile .sh .installed .packaged
 
 BASEDIR = /usr/local
 ENCAPDIR = ${BASEDIR}/encap
@@ -29,43 +29,44 @@ LIBXSLT = bcfg2-libxslt-1.1.17
 LXML = bcfg2-lxml-1.0.1
 BCFG2 = bcfg2-0.8.2
 
-.profile.e : # Clean, compile and install an encap package
-	@printf "***** START .profile.e for |$*| ***** \n"
+.ep.installed : # Clean, compile and install an encap package
+	@printf "***** START .ep.installed for |$*| ***** \n"
 	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
 	( rm -rf ${ENCAPDIR}/$* || true )
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.profile || true ) > $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.profile || true ) >> $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.profile ) >> $*.log 2>&1
+	( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.ep || true ) > $*.log 2>&1
+	( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.ep || true ) >> $*.log 2>&1
+	( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.ep ) >> $*.log 2>&1
 	${EPKG} -q -i ${ENCAPDIR}/$*
 	test -h ${BASEDIR}/var/encap/$*
-	touch $*.e
-	@printf "***** STOP .profile.e for |$*| ***** \n"
+	touch $*.installed
+	@printf "***** STOP .ep.installed for |$*| ***** \n"
 
-.sh.e : # Create and install a "fake" encap package
-	@printf "***** START .sh.e for |$*| ***** \n"
+.sh.installed : # Create and install a "fake" encap package
+	@printf "***** START .sh.installed for |$*| ***** \n"
 	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
 	( rm -rf ${ENCAPDIR}/$* || true )
+	chmod 755 ./$*.sh
 	./$*.sh
 	${EPKG} -q -i ${ENCAPDIR}/$*
 	test -h ${BASEDIR}/var/encap/$*
-	touch $*.e
-	@printf "***** STOP .sh.e for |$*| ***** \n"
+	touch $*.installed
+	@printf "***** STOP .sh.installed for |$*| ***** \n"
 
-.e.ep : # Create .tar.gz encap packages for distribution to other machines
-	@printf "***** START .e.ep for |$*| ***** \n"
+.installed.packaged : # Create .tar.gz encap packages for distribution
+	@printf "***** START .installed.packaged for |$*| ***** \n"
 	( rm ${ENCAPDIR}/$*-*.tar.gz || true )
 	( cd ${ENCAPDIR} && ${MKENCAP} -e $* || true )
 	cd ${ENCAPDIR} && ${MKENCAP} -c $*
 	mv ${ENCAPDIR}/$*-encap-*.tar.gz .
-	touch $*.ep
-	@printf "***** STOP .e.ep for |$*| ***** \n"
+	touch $*.packaged
+	@printf "***** STOP .installed.packaged for |$*| ***** \n"
 
 all :
 	( $(MAKE) install > make.log 2>&1 && $(MAKE) encaps >> make.log 2>&1 ) &
 
-install : ${EPKG} ${MKENCAP} ${BCFG2}.e
+install : ${EPKG} ${MKENCAP} ${BCFG2}.installed
 
-encaps : ${EPKG} ${MKENCAP} ${BCFG2}.ep
+encaps : ${EPKG} ${MKENCAP} ${BCFG2}.packaged
 
 rename : encaps
 	test "$${OS}x" != "x"
@@ -75,41 +76,41 @@ rename : encaps
 
 clean : 
 	( rm *.log || true )
-	( rm *.ep || true )
+	( rm *.packaged || true )
 	( rm *.gz || true )
 
 uninstall : clean
-	( rm *.e || true )
+	( rm *.installed || true )
 	( ${EPKG} -q -r ${ENCAPDIR}/bcfg2-* || true )
 	( rm -rf ${ENCAPDIR}/bcfg2-* || true )
 	( rm -rf ${BASEDIR}/lib/bcfg2 || true )
 
-${ZLIB}.e : ${M4}.e
-${LIBICONV}.e : ${ZLIB}.e
-${GETTEXT}.e : ${LIBICONV}.e
-${PKG-CONFIG}.e : ${GETTEXT}.e
-${PATCH}.e : ${PKG-CONFIG}.e
-${OPENSSL}.e : ${PATCH}.e
-${LIBSTDCXX}.e : ${OPENSSL}.e
-${LIBGCC}.e : ${LIBSTDCXX}.e
-${PYTHON}.e : ${LIBGCC}.e
-${PYREX}.e : ${PYTHON}.e
-${PYOPENSSL}.e : ${PYREX}.e
-${LIBXML2}.e : ${PYOPENSSL}.e	
-${LIBXSLT}.e : ${LIBXML2}.e
-${LXML}.e : ${LIBXSLT}.e
-${BCFG2}.e : ${LXML}.e
+${ZLIB}.installed : ${M4}.installed
+${LIBICONV}.installed : ${ZLIB}.installed
+${GETTEXT}.installed : ${LIBICONV}.installed
+${PKG-CONFIG}.installed : ${GETTEXT}.installed
+${PATCH}.installed : ${PKG-CONFIG}.installed
+${OPENSSL}.installed : ${PATCH}.installed
+${LIBSTDCXX}.installed : ${OPENSSL}.installed
+${LIBGCC}.installed : ${LIBSTDCXX}.installed
+${PYTHON}.installed : ${LIBGCC}.installed
+${PYREX}.installed : ${PYTHON}.installed
+${PYOPENSSL}.installed : ${PYREX}.installed
+${LIBXML2}.installed : ${PYOPENSSL}.installed	
+${LIBXSLT}.installed : ${LIBXML2}.installed
+${LXML}.installed : ${LIBXSLT}.installed
+${BCFG2}.installed : ${LXML}.installed
 
-${LIBICONV}.ep : ${ZLIB}.ep
-${GETTEXT}.ep : ${LIBICONV}.ep
-${PATCH}.ep : ${GETTEXT}.ep
-${OPENSSL}.ep : ${PATCH}.ep
-${LIBSTDCXX}.ep : ${OPENSSL}.ep
-${LIBGCC}.ep : ${LIBSTDCXX}.ep
-${PYTHON}.ep : ${LIBGCC}.ep
-${PYOPENSSL}.ep : ${PYTHON}.ep
-${LIBXML2}.ep : ${PYOPENSSL}.ep
-${LIBXSLT}.ep : ${LIBXML2}.ep
-${LXML}.ep : ${LIBXSLT}.ep
-${BCFG2}.ep : ${LXML}.ep
+${LIBICONV}.packaged : ${ZLIB}.packaged
+${GETTEXT}.packaged : ${LIBICONV}.packaged
+${PATCH}.packaged : ${GETTEXT}.packaged
+${OPENSSL}.packaged : ${PATCH}.packaged
+${LIBSTDCXX}.packaged : ${OPENSSL}.packaged
+${LIBGCC}.packaged : ${LIBSTDCXX}.packaged
+${PYTHON}.packaged : ${LIBGCC}.packaged
+${PYOPENSSL}.packaged : ${PYTHON}.packaged
+${LIBXML2}.packaged : ${PYOPENSSL}.packaged
+${LIBXSLT}.packaged : ${LIBXML2}.packaged
+${LXML}.packaged : ${LIBXSLT}.packaged
+${BCFG2}.packaged : ${LXML}.packaged
 
diff --git a/encap/bcfg2-0.8.2.profile b/encap/bcfg2-0.8.2.ep
index d0b2df5c0..d0b2df5c0 100644
--- a/encap/bcfg2-0.8.2.profile
+++ b/encap/bcfg2-0.8.2.ep
diff --git a/encap/bcfg2-gettext-0.14.5.profile b/encap/bcfg2-gettext-0.14.5.ep
index 8bf753796..8bf753796 100644
--- a/encap/bcfg2-gettext-0.14.5.profile
+++ b/encap/bcfg2-gettext-0.14.5.ep
diff --git a/encap/bcfg2-libiconv-1.9.2.profile b/encap/bcfg2-libiconv-1.9.2.ep
index da6d76bd0..da6d76bd0 100644
--- a/encap/bcfg2-libiconv-1.9.2.profile
+++ b/encap/bcfg2-libiconv-1.9.2.ep
diff --git a/encap/bcfg2-libxml2-2.6.26.profile b/encap/bcfg2-libxml2-2.6.26.ep
index fa0344477..fa0344477 100644
--- a/encap/bcfg2-libxml2-2.6.26.profile
+++ b/encap/bcfg2-libxml2-2.6.26.ep
diff --git a/encap/bcfg2-libxslt-1.1.17.profile b/encap/bcfg2-libxslt-1.1.17.ep
index 8845c4a4f..8845c4a4f 100644
--- a/encap/bcfg2-libxslt-1.1.17.profile
+++ b/encap/bcfg2-libxslt-1.1.17.ep
diff --git a/encap/bcfg2-lxml-1.0.1.profile b/encap/bcfg2-lxml-1.0.1.ep
index aa8e009e1..aa8e009e1 100644
--- a/encap/bcfg2-lxml-1.0.1.profile
+++ b/encap/bcfg2-lxml-1.0.1.ep
diff --git a/encap/bcfg2-openssl-0.9.8b.profile b/encap/bcfg2-openssl-0.9.8b.ep
index 318ee6603..318ee6603 100644
--- a/encap/bcfg2-openssl-0.9.8b.profile
+++ b/encap/bcfg2-openssl-0.9.8b.ep
diff --git a/encap/bcfg2-patch-2.5.9.profile b/encap/bcfg2-patch-2.5.9.ep
index 1784e59d2..1784e59d2 100644
--- a/encap/bcfg2-patch-2.5.9.profile
+++ b/encap/bcfg2-patch-2.5.9.ep
diff --git a/encap/bcfg2-pkg-config-0.20.profile b/encap/bcfg2-pkg-config-0.20.ep
index 62db17661..62db17661 100644
--- a/encap/bcfg2-pkg-config-0.20.profile
+++ b/encap/bcfg2-pkg-config-0.20.ep
diff --git a/encap/bcfg2-pyopenssl-0.6.profile b/encap/bcfg2-pyopenssl-0.6.ep
index 7f9fa97f6..7f9fa97f6 100644
--- a/encap/bcfg2-pyopenssl-0.6.profile
+++ b/encap/bcfg2-pyopenssl-0.6.ep
diff --git a/encap/bcfg2-pyrex-0.9.4.1.profile b/encap/bcfg2-pyrex-0.9.4.1.ep
index 8fcc80449..8fcc80449 100644
--- a/encap/bcfg2-pyrex-0.9.4.1.profile
+++ b/encap/bcfg2-pyrex-0.9.4.1.ep
diff --git a/encap/bcfg2-python-2.4.3.profile b/encap/bcfg2-python-2.4.3.ep
index 296bedff3..296bedff3 100644
--- a/encap/bcfg2-python-2.4.3.profile
+++ b/encap/bcfg2-python-2.4.3.ep
diff --git a/encap/bcfg2-zlib-1.2.3.profile b/encap/bcfg2-zlib-1.2.3.ep
index 4a081993b..4a081993b 100644
--- a/encap/bcfg2-zlib-1.2.3.profile
+++ b/encap/bcfg2-zlib-1.2.3.ep
diff --git a/encap/m4-1.4.4.sh b/encap/m4-1.4.4.sh
index 740c74cd8..b424007eb 100755
--- a/encap/m4-1.4.4.sh
+++ b/encap/m4-1.4.4.sh
@@ -5,7 +5,7 @@ ENCAP_PKGNAME=m4-1.4.4
 PATH=$PATH:/usr/local/bin
 export PATH
 
-cat > ${ENCAP_PKGNAME}.profile << EOF
+cat > ${ENCAP_PKGNAME}.ep << EOF
 <?xml version="1.0"?>
 
 <encap_profile
@@ -59,16 +59,16 @@ EOF
 
 chmod 755 m4-fake
 
-( ${MKENCAP} -m ${PWD}/m4-fake -b -DUP ${ENCAP_PKGNAME}.profile || true ) \
+( ${MKENCAP} -m ${PWD}/m4-fake -b -DUP ${ENCAP_PKGNAME}.ep || true ) \
 	> ${ENCAP_PKGNAME}.log 2>&1
 
-( ${MKENCAP} -m ${PWD}/m4-fake -b -T ${ENCAP_PKGNAME}.profile || true ) \
+( ${MKENCAP} -m ${PWD}/m4-fake -b -T ${ENCAP_PKGNAME}.ep || true ) \
 	>> ${ENCAP_PKGNAME}.log 2>&1
 
-( ${MKENCAP} -m ${PWD}/m4-fake -b -CBI ${ENCAP_PKGNAME}.profile ) \
+( ${MKENCAP} -m ${PWD}/m4-fake -b -CBI ${ENCAP_PKGNAME}.ep ) \
 	>> ${ENCAP_PKGNAME}.log 2>&1
 
 rm m4-fake
-rm ${ENCAP_PKGNAME}.profile
+rm ${ENCAP_PKGNAME}.ep
 
 exit 0