Juan Hernandez has uploaded a new change for review.
Change subject: core: Don't use bash for duplicate script check
......................................................................
core: Don't use bash for duplicate script check
Use /bin/sh instead of /bin/bash in the script that checks for
duplicates. This helps building in environments where bash is not
available.
Change-Id: Iaaf0d7c448e4b21e1174f41ad5efa9a87a399d98
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M Makefile
M backend/manager/dbscripts/check_for_duplicate_upgrade_scripts.sh
2 files changed, 20 insertions(+), 59 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/10900/1
diff --git a/Makefile b/Makefile
index 45f8dc4..350ca20 100644
--- a/Makefile
+++ b/Makefile
@@ -64,48 +64,6 @@
MAVEN_OUTPUT_DIR_DEFAULT=$(shell pwd -P)/tmp.repos
MAVEN_OUTPUT_DIR=$(MAVEN_OUTPUT_DIR_DEFAULT)
-ARTIFACTS = \
- backend bll \
- common \
- compat \
- dal \
- engine-config \
- engine-notifier \
- engine-notifier-resources \
- engine-notifier-service \
- engine-tools-common \
- engineencryptutils \
- genericapi \
- interface-common-jaxrs \
- manager \
- manager-modules \
- manager-tools \
- restapi-definition \
- restapi-jaxrs \
- restapi-parent \
- restapi-types \
- root \
- scheduler \
- searchbackend \
- utils \
- vdsbroker
-
-# avoid duplicate jars, remove 1st component
-# link to 2nd component
-# no convention yet...
-OWN_JAR_FIXUPS = \
- $(PKG_EAR_DIR)/engine-bll,bll \
- $(PKG_EAR_DIR)/engine-genericapi,genericapi \
- $(PKG_EAR_DIR)/engine-scheduler,scheduler \
- $(PKG_EAR_DIR)/lib/engine-common,common \
- $(PKG_EAR_DIR)/lib/engine-compat,compat \
- $(PKG_EAR_DIR)/lib/engine-dal,dal \
- $(PKG_EAR_DIR)/lib/engine-encryptutils,engineencryptutils \
- $(PKG_EAR_DIR)/lib/engine-tools-common,engine-tools-common \
- $(PKG_EAR_DIR)/lib/engine-utils,utils \
- $(PKG_EAR_DIR)/lib/engine-vdsbroker,vdsbroker \
- $(PKG_EAR_DIR)/lib/searchbackend,searchbackend
-
all: $(BUILD_FILE)
$(BUILD_FILE):
@@ -221,26 +179,29 @@
X=`find "$(MAVEN_OUTPUT_DIR)" -name
engine-server-ear-$(APP_VERSION).ear` && unzip "$$X" -d
"$(DESTDIR)$(PKG_EAR_DIR)"
- for artifact_id in $(ARTIFACTS); do \
- POM=`find "$(MAVEN_OUTPUT_DIR)" -name
"$${artifact_id}-$(APP_VERSION).pom"`; \
- if ! [ -f "$${POM}" ]; then \
- echo "ERROR: Cannot find artifact $${artifact_id}"; \
- exit 1; \
- fi; \
- JAR=`echo "$${POM}" | sed 's/\.pom/.jar/'`; \
- install -p -m 644 "$${POM}"
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-$${artifact_id}.pom"; \
- [ -f "$${JAR}" ] && install -p -m 644 "$${JAR}"
"$(DESTDIR)$(PKG_JAVA_DIR)/$${artifact_id}.jar"; \
+ # Install the artifacts:
+ for pom in `find "$(MAVEN_OUTPUT_DIR)" -name "*.pom"`; do \
+ base=`basename "$${pom}"`; \
+ id=`echo "$${base}" | sed 's/-[0-9].*\.pom//'`; \
+ install -p -m 644 "$${pom}"
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-$${id}.pom"; \
+ jar=`echo "$${pom}" | sed 's/\.pom/.jar/'`; \
+ if [ -f "$${jar}" ]; then \
+ install -p -m 644 "$${jar}"
"$(DESTDIR)$(PKG_JAVA_DIR)/$${id}.jar"; \
+ fi \
done
- # Replace jar files in the ear with links to their actuals
- # locations
- for jar_line in $(OWN_JAR_FIXUPS); do \
- path=`echo $${jar_line} | sed 's/,.*//'`; \
- jar=`echo $${jar_line} | sed 's/.*,//'`; \
- rm -rf "$(DESTDIR)$${path}"*.jar; \
- ln -s "$(PKG_JAVA_DIR)/$${jar}.jar" "$(DESTDIR)$${path}.jar"; \
+ # Replace jar files in the ear with links to their actual
+ # locations:
+ for jar in $(PKG_EAR_DIR)/*.jar; do \
+ base=`basename "$${jar}"`; \
+ if [ -f "$${jar}" ]; then \
+ rm -rf "$${jar}"; \
+ ln -s "$(PKG_JAVA_DIR)/$${base}" "$(DESTDIR)$${jar}"; \
+ fi \
done
+ @echo hello
+
install_setup:
@echo "*** Deploying setup executables"
diff --git a/backend/manager/dbscripts/check_for_duplicate_upgrade_scripts.sh
b/backend/manager/dbscripts/check_for_duplicate_upgrade_scripts.sh
index cb43e1a..b89e3f0 100755
--- a/backend/manager/dbscripts/check_for_duplicate_upgrade_scripts.sh
+++ b/backend/manager/dbscripts/check_for_duplicate_upgrade_scripts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
cd "$(dirname "$0")"
--
To view, visit http://gerrit.ovirt.org/10900
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaaf0d7c448e4b21e1174f41ad5efa9a87a399d98
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
