Mercurial > hg > release > icedtea6-1.11
changeset 2654:15b2923c12a0
Fix addvm cleanup of jvm.cfg when it doesn't exist.
2011-07-11 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(clean-add-jamvm): Only perform sed on jvm.cfg
if it exists and use correct path as in original
rule.
(clean-add-jamvm-debug): Likewise.
(clean-add-cacao): Likewise.
(clean-add-cacao-debug): Likewise.
(clean-add-jamvm): Likewise.
(clean-add-jamvm-debug): Likewise.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 11 Jul 2011 23:52:57 +0100 |
| parents | 802bc279de76 |
| children | 32fa8c401cee |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 32 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jul 11 23:02:26 2011 +0100 +++ b/ChangeLog Mon Jul 11 23:52:57 2011 +0100 @@ -1,3 +1,15 @@ +2011-07-11 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (clean-add-jamvm): Only perform sed on jvm.cfg + if it exists and use correct path as in original + rule. + (clean-add-jamvm-debug): Likewise. + (clean-add-cacao): Likewise. + (clean-add-cacao-debug): Likewise. + (clean-add-jamvm): Likewise. + (clean-add-jamvm-debug): Likewise. + 2011-07-11 Andrew John Hughes <ahughes@redhat.com> * NEWS: Import 1.10.2, 1.9.8, 1.8.8 and
--- a/Makefile.am Mon Jul 11 23:02:26 2011 +0100 +++ b/Makefile.am Mon Jul 11 23:52:57 2011 +0100 @@ -1840,7 +1840,9 @@ clean-add-jamvm: rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm - -sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-jamvm.stamp stamps/add-jamvm-debug.stamp: stamps/icedtea-debug.stamp stamps/jamvm.stamp @@ -1856,7 +1858,9 @@ clean-add-jamvm-debug: rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm - sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-jamvm-debug.stamp # CACAO @@ -1906,7 +1910,9 @@ clean-add-cacao: rm -rf $(BUILD_JRE_ARCH_DIR)/cacao - sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg + if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-cacao.stamp stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp @@ -1926,7 +1932,9 @@ clean-add-cacao-debug: rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao - sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg + if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-cacao-debug.stamp # configure script arguments, quoted in single quotes @@ -2016,8 +2024,10 @@ rm -rf $(BUILD_JRE_ARCH_DIR)/zero rm -rf $(BUILD_JRE_ARCH_DIR)/shark rm -rf zerovm - sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg - sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg + if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-zero.stamp stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp @@ -2052,8 +2062,10 @@ rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/zero rm -rf $(BUILD_JRE_ARCH_DIR)/shark rm -rf zerovm - sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg - sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg + if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-zero-debug.stamp # end additional VMs