Mercurial > hg > release > thermostat-0.9
changeset 1078:7f100b629033
Fix Eclipse Build
This commit fixes the currently broken Eclipse build. This slipped by due
to a repository not being cleaned out at build time, which caused by
local build to succeed. This commit mostly reverts the build order to
what we had before. The main difference is now installing the Eclipse
client into the m2 cache so it can be found later when creating the test
dependencies feature and repository.
Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-May/006473.html
| author | Elliott Baron <ebaron@redhat.com> |
|---|---|
| date | Fri, 03 May 2013 12:39:38 -0400 |
| parents | 00c6bf165dce |
| children | dff087c3c875 |
| files | Makefile eclipse/README.building eclipse/pom.xml |
| diffstat | 3 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu May 02 16:21:24 2013 -0400 +++ b/Makefile Fri May 03 12:39:38 2013 -0400 @@ -41,7 +41,7 @@ cp keyring/target/libGnomeKeyringWrapper.so eclipse/com.redhat.thermostat.client.feature/linux_x86; \ fi -eclipse-test: eclipse +eclipse-test: eclipse eclipse-test-p2 ifeq ($(USE_VNC),true) $(VNC) $(VNC_DISPLAY) $(VNC_FLAGS) endif @@ -54,11 +54,18 @@ eclipse-test-deps: copy-core-natives $(MAVEN) -f eclipse/test-deps-bundle-wrapping/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean install +eclipse-test-p2: eclipse-test-deps + $(MAVEN) -f eclipse/com.redhat.thermostat.eclipse.test.deps.feature/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean install + $(MAVEN) -f eclipse/test-deps-p2-repository/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL) + jfreechart-deps: copy-core-natives $(MAVEN) -f eclipse/jfreechart-bundle-wrapping/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean install -eclipse: jfreechart-deps eclipse-test-deps - $(MAVEN) -f eclipse/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL) +jfreechart-p2: jfreechart-deps + $(MAVEN) -f eclipse/jfreechart-p2-repository/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL) + +eclipse: jfreechart-p2 + $(MAVEN) -f eclipse/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean install create-repo-dir: mkdir -p $(REPO_LOC) @@ -68,6 +75,9 @@ find $(REPO_LOC) -name '*thermostat*' -print0 | xargs -0 rm -rf ; \ fi rm -rf $(REPO_LOC).cache/tycho/ + rm -rf eclipse/core-p2-repository/target + rm -rf eclipse/test-deps-p2-repository/target + rm -rf eclipse/jfreechart-p2-repository/target echo-repo: echo "Using private Maven repository: $(REPO_LOC)"
--- a/eclipse/README.building Thu May 02 16:21:24 2013 -0400 +++ b/eclipse/README.building Fri May 03 12:39:38 2013 -0400 @@ -6,9 +6,10 @@ # Build Eclipse client mvn -f eclipse/jfreechart-bundle-wrapping/pom.xml clean install mvn -f eclipse/jfreechart-p2-repository/pom.xml clean package -mvn -f eclipse/pom.xml clean package +mvn -f eclipse/pom.xml clean install # Build and run Eclipse client tests mvn -f eclipse/test-deps-bundle-wrapping/pom.xml clean install +mvn -f eclipse/com.redhat.thermostat.eclipse.test.deps.feature/pom.xml clean install mvn -f eclipse/test-deps-p2-repository/pom.xml clean package mvn -f eclipse/com.redhat.thermostat.eclipse.test/pom.xml clean package mvn -f eclipse/com.redhat.thermostat.eclipse.test.ui/pom.xml clean package
--- a/eclipse/pom.xml Thu May 02 16:21:24 2013 -0400 +++ b/eclipse/pom.xml Fri May 03 12:39:38 2013 -0400 @@ -96,12 +96,9 @@ <module>com.redhat.thermostat.eclipse.chart.vmclassstat</module> <module>com.redhat.thermostat.client.feature</module> <module>com.redhat.thermostat.eclipse.feature</module> - <module>com.redhat.thermostat.eclipse.test.deps.feature</module> <module>com.redhat.thermostat.eclipse.target_platform</module> <module>com.redhat.thermostat.eclipse.p2-repo</module> <module>core-p2-repository</module> - <module>test-deps-p2-repository</module> - <module>jfreechart-p2-repository</module> <module>composite-repo</module> </modules>