Sandro Bonazzola has uploaded a new change for review. Change subject: Revert "build: pack gwt-symbols within jar" ......................................................................
Revert "build: pack gwt-symbols within jar" This reverts commit b2eaa9697d9cfb19f5b38463a4a7c3bb85cab1c1. The patch introduced a dependency on 3.6. Change-Id: I138df483f777a1cb261282b33770d134408bcff4 Signed-off-by: Sandro Bonazzola <[email protected]> --- M Makefile D frontend/webadmin/modules/frontend-symbols/pom.xml D frontend/webadmin/modules/frontend-symbols/resources/userportal/.keep D frontend/webadmin/modules/frontend-symbols/resources/webadmin/.keep M frontend/webadmin/modules/pom.xml 5 files changed, 10 insertions(+), 60 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/39282/1 diff --git a/Makefile b/Makefile index 2bbca02..3738831 100644 --- a/Makefile +++ b/Makefile @@ -435,8 +435,16 @@ 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" - 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 -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-layout: \ install-packaging-files \ diff --git a/frontend/webadmin/modules/frontend-symbols/pom.xml b/frontend/webadmin/modules/frontend-symbols/pom.xml deleted file mode 100644 index 68cce61..0000000 --- a/frontend/webadmin/modules/frontend-symbols/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ -<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.6.0-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 deleted file mode 100644 index e69de29..0000000 --- a/frontend/webadmin/modules/frontend-symbols/resources/userportal/.keep +++ /dev/null diff --git a/frontend/webadmin/modules/frontend-symbols/resources/webadmin/.keep b/frontend/webadmin/modules/frontend-symbols/resources/webadmin/.keep deleted file mode 100644 index e69de29..0000000 --- a/frontend/webadmin/modules/frontend-symbols/resources/webadmin/.keep +++ /dev/null diff --git a/frontend/webadmin/modules/pom.xml b/frontend/webadmin/modules/pom.xml index cf00383..c9b4de0 100644 --- a/frontend/webadmin/modules/pom.xml +++ b/frontend/webadmin/modules/pom.xml @@ -19,7 +19,6 @@ <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/39282 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I138df483f777a1cb261282b33770d134408bcff4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
