Alon Bar-Lev has uploaded a new change for review. Change subject: build: pack gwt-symbols within jar ......................................................................
build: pack gwt-symbols within jar due to limitation of rhel build, gwt target files are not available to the make process. packing these as maven artifacts will enable to reference them. somewhat more complex, until we drop el6. Change-Id: I1bfb8ca2eb2cb9e020eeff2c2e65237839402227 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1182000 Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile A frontend/webadmin/modules/frontend-symbols/pom.xml A frontend/webadmin/modules/frontend-symbols/resources/userportal/.keep A frontend/webadmin/modules/frontend-symbols/resources/webadmin/.keep M frontend/webadmin/modules/pom.xml 5 files changed, 60 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/39286/1 diff --git a/Makefile b/Makefile index 3738831..2bbca02 100644 --- a/Makefile +++ b/Makefile @@ -435,16 +435,8 @@ EXCLUDE="$$(echo $$(find packaging/dbscripts \( -name '*.scripts.md5' -or -name '*.schema' -or -name '*.log' \)))" install-gwt-symbols: - install -d -m 0755 "$(DESTDIR)$(DATA_DIR)/gwt-symbols/userportal" - f=frontend/webadmin/modules/userportal-gwtp/target/generated-gwt/WEB-INF/deploy/userportal/symbolMaps; \ - if [ -e "$${f}" ]; then \ - install -m 0644 "$${f}"/*.symbolMap "$(DESTDIR)$(DATA_DIR)/gwt-symbols/userportal"; \ - fi - install -d -m 0755 "$(DESTDIR)$(DATA_DIR)/gwt-symbols/webadmin" - f=frontend/webadmin/modules/webadmin/target/generated-gwt/WEB-INF/deploy/webadmin/symbolMaps; \ - if [ -e "$${f}" ]; then \ - install -m 0644 "$${f}"/*.symbolMap "$(DESTDIR)$(DATA_DIR)/gwt-symbols/webadmin"; \ - fi + install -d -m 0755 "$(DESTDIR)$(DATA_DIR)/gwt-symbols" + find "$(MAVEN_OUTPUT_DIR)" -name 'frontend-symbols-*.jar' -not -name '*-tests.jar' -type f | grep -v tmp.repos | xargs -ijar -r -n 1 unzip -q -o -d "$(DESTDIR)$(DATA_DIR)/gwt-symbols" jar -x 'META-INF/*' install-layout: \ install-packaging-files \ diff --git a/frontend/webadmin/modules/frontend-symbols/pom.xml b/frontend/webadmin/modules/frontend-symbols/pom.xml new file mode 100644 index 0000000..734e066 --- /dev/null +++ b/frontend/webadmin/modules/frontend-symbols/pom.xml @@ -0,0 +1,57 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.ovirt.engine.ui</groupId> + <artifactId>webadmin-modules</artifactId> + <version>3.5.3-SNAPSHOT</version> + </parent> + + <artifactId>frontend-symbols</artifactId> + <packaging>jar</packaging> + + <name>frontend-symbols</name> + + <dependencies> + <dependency> + <artifactId>webadmin</artifactId> + <groupId>org.ovirt.engine.ui</groupId> + <version>${engine.version}</version> + <type>war</type> + </dependency> + <dependency> + <artifactId>userportal</artifactId> + <groupId>org.ovirt.engine.ui</groupId> + <version>${engine.version}</version> + <type>war</type> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <filtering>false</filtering> + <directory>${project.basedir}/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <filtering>false</filtering> + <directory>${project.basedir}/../webadmin/target/generated-gwt/WEB-INF/deploy</directory> + <includes> + <include>webadmin/symbolMaps/**/*</include> + </includes> + </resource> + <resource> + <filtering>false</filtering> + <directory>${project.basedir}/../userportal-gwtp/target/generated-gwt/WEB-INF/deploy</directory> + <includes> + <include>userportal/symbolMaps/**/*</include> + </includes> + </resource> + </resources> + </build> + +</project> diff --git a/frontend/webadmin/modules/frontend-symbols/resources/userportal/.keep b/frontend/webadmin/modules/frontend-symbols/resources/userportal/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/frontend/webadmin/modules/frontend-symbols/resources/userportal/.keep diff --git a/frontend/webadmin/modules/frontend-symbols/resources/webadmin/.keep b/frontend/webadmin/modules/frontend-symbols/resources/webadmin/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/frontend/webadmin/modules/frontend-symbols/resources/webadmin/.keep diff --git a/frontend/webadmin/modules/pom.xml b/frontend/webadmin/modules/pom.xml index c9b4de0..cf00383 100644 --- a/frontend/webadmin/modules/pom.xml +++ b/frontend/webadmin/modules/pom.xml @@ -19,6 +19,7 @@ <module>gwt-common</module> <module>webadmin</module> <module>userportal-gwtp</module> + <module>frontend-symbols</module> </modules> <properties> <!-- Enforce java 1.6 compilation for GWT integration --> -- To view, visit https://gerrit.ovirt.org/39286 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1bfb8ca2eb2cb9e020eeff2c2e65237839402227 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
