From d0f08feb9440fbfe72c4221a93c6be68ec924d0c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 29 Aug 2012 10:22:45 +0000
Subject: [PATCH] SP-239, SWE-6: create empty module folder in targets/www:
This is needed for injection webapps when launching openBSI in dev mode.
SVN: 26477
---
openbis-common/build/build-common.xml | 1 +
openbis/build/build.xml | 8 +++++++-
rtd_phosphonetx/build/build.xml | 6 ++++++
screening/build/build.xml | 6 ++++++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/openbis-common/build/build-common.xml b/openbis-common/build/build-common.xml
index b64467d106f..bf9307c4ef1 100644
--- a/openbis-common/build/build-common.xml
+++ b/openbis-common/build/build-common.xml
@@ -18,6 +18,7 @@
<fileset dir="${targets.www}" followsymlinks="false"/>
</delete>
<mkdir dir="${targets.www}" />
+ <mkdir dir="${targets.www}/${module-test.module}" />
<mkdir dir="${targets.www.web-inf}" />
<copy todir="${targets.www.web-inf}" overwrite="true" failonerror="true">
<fileset dir="../${ant.project.name}/${server-resource}" includes="*.xml" />
diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index abbb2d39638..2cb750acdae 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -362,7 +362,13 @@
// Override 'prepare-gwt' target by writing out 'OpenBIS.gwt-without-entry-point.xml' and updating
'ClientPluginProvider.java'.
-->
- <target name="prepare-gwt"
+ <target name="prepare-gwt">
+ <antcall target="do-prepare-gwt">
+ <param name="module-test.module" value="ch.systemsx.cisd.openbis.OpenBIS" />
+ </antcall>
+ </target>
+
+ <target name="do-prepare-gwt"
depends="prepare-web-client, compile-tests, openbis-common-common.prepare-gwt"
description="Override 'prepare-gwt' by writing out 'OpenBIS.gwt-without-entry-point.xml' and updating 'ClientPluginProvider.java'.">
diff --git a/rtd_phosphonetx/build/build.xml b/rtd_phosphonetx/build/build.xml
index 013b8566272..ebee07653f7 100644
--- a/rtd_phosphonetx/build/build.xml
+++ b/rtd_phosphonetx/build/build.xml
@@ -190,6 +190,12 @@
depends="prepare-gwt, module-test"
description="Prepare, compile, and run the module test mode">
</target>
+
+ <target name="prepare-gwt">
+ <antcall target="openbis.do-prepare-gwt">
+ <param name="module-test.module" value="ch.systemsx.cisd.openbis.plugin.proteomics.OpenBIS" />
+ </antcall>
+ </target>
<target name="compile-and-run-openbis-proteomics-from-eclipse"
description="Compile and run the proteomics openbis from Eclipse">
diff --git a/screening/build/build.xml b/screening/build/build.xml
index ad41fdf1944..6388537c239 100644
--- a/screening/build/build.xml
+++ b/screening/build/build.xml
@@ -210,6 +210,12 @@
-->
<target name="prepare-gwt-with-image-viewer" depends="prepare-gwt, jar"/>
+ <target name="prepare-gwt">
+ <antcall target="openbis.do-prepare-gwt">
+ <param name="module-test.module" value="ch.systemsx.cisd.openbis.plugin.screening.OpenBIS" />
+ </antcall>
+ </target>
+
<target name="jar" depends="openbis.jar">
<property name="dist.file.name"
value="${ant.project.name}-${version.number}-r${revision.number}" />
--
GitLab