Skip to content
Snippets Groups Projects
Commit 0ffc0268 authored by felmer's avatar felmer
Browse files

LMS-2760 some refactoring of build scripts in openbis, rtd_phosphonetx, and... 

LMS-2760 some refactoring of build scripts in openbis, rtd_phosphonetx, and screening. build script for openbis_standard_technologies extended with targets 'compile-javascript' and 'war'.

SVN: 24282
parent a1fb5f10
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
openbis/build/build.xml
+ 1
− 0
View file @ 0ffc0268
...@@ -333,6 +333,7 @@ ...@@ -333,6 +333,7 @@
<delete includeEmptyDirs="true"> <delete includeEmptyDirs="true">
<fileset dir="${webapp.dist}" excludes="*.jar"/> <fileset dir="${webapp.dist}" excludes="*.jar"/>
</delete> </delete>
<echo>GWT-sources: ${gwt.sources}</echo>
<java classpath="${ecp}:${gwt.sources}" <java classpath="${ecp}:${gwt.sources}"
classname="com.google.gwt.dev.Compiler" fork="true"> classname="com.google.gwt.dev.Compiler" fork="true">
<jvmarg value="-Xmx1024M" /> <jvmarg value="-Xmx1024M" />
......
openbis_standard_technologies/build/build.xml
+ 23
− 8
View file @ 0ffc0268
<project name="openbis_standard_technologies" default="dist" basedir=".."> <project name="openbis_standard_technologies" default="dist" basedir="..">
<import file="../../openbis/build/build.xml" /> <import file="../../screening/build/build.xml" />
<!--import file="../../screening/build/build.xml" /> <import file="../../rtd_phosphonetx/build/build.xml" />
<import file="../../rtd_phosphonetx/build/build.xml" /-->
<project-classpath name="ecp" classes="${classes}" /> <project-classpath name="ecp" classes="${classes}" />
<project-classpath name="ecp.gwt" classes="${targets}/www/WEB-INF/classes" /> <project-classpath name="ecp.gwt" classes="${targets}/www/WEB-INF/classes" />
<property name="gwt.extended.sources" value="${gwt.sources}:../rtd_phosphonetx/${sources}:../screening/${sources}" /> <property name="gwt.extended.sources" value="${gwt.sources}:../rtd_phosphonetx/${sources}:../screening/${sources}" />
<target name="dist" depends="compile"> <target name="dist" depends="openbis.make-dist">
</target>
<target name="war" depends="rtd_phosphonetx.war, screening.war">
</target> </target>
<!--
// Compiles the javascript using GWT compiler.
-->
<target name="compile-javascript"
depends="prepare-web-client"
description="Compiles the javascript using GWT compiler.">
<antcall target="compile-gwt-module">
<param name="gwt.sources" value="${gwt.extended.sources}" />
<param name="gwt.module.name" value="ch.systemsx.cisd.openbis.OpenBIS" />
</antcall>
</target>
<!--
// Targets for Eclipse environment
-->
<target name="compile-and-run-openbis-from-eclipse" <target name="compile-and-run-openbis-from-eclipse"
description="Compile and run openbis from Eclipse"> description="Compile and run openbis from Eclipse">
<antcall target="compile-module-test"> <antcall target="compile-module-test">
<param name="gwt.sources" value="${gwt.extended.sources}" /> <param name="gwt.sources" value="${gwt.extended.sources}" />
<param name="module-test.path" value="openbis-test" /> <param name="module-test.path" value="openbis-test" />
<param name="module-test.module" <param name="module-test.module" value="ch.systemsx.cisd.openbis.OpenBIS" />
value="ch.systemsx.cisd.openbis.OpenBIS" />
</antcall> </antcall>
<antcall target="run-openbis-from-eclipse" /> <antcall target="run-openbis-from-eclipse" />
</target> </target>
...@@ -26,8 +42,7 @@ ...@@ -26,8 +42,7 @@
<antcall target="run-module-test"> <antcall target="run-module-test">
<param name="gwt.sources" value="${gwt.extended.sources}" /> <param name="gwt.sources" value="${gwt.extended.sources}" />
<param name="module-test.path" value="openbis-test" /> <param name="module-test.path" value="openbis-test" />
<param name="module-test.module" <param name="module-test.module" value="ch.systemsx.cisd.openbis.OpenBIS" />
value="ch.systemsx.cisd.openbis.OpenBIS" />
</antcall> </antcall>
</target> </target>
......
openbis_standard_technologies/dist/.gitignore 0 → 100644
+ 0
− 0
View file @ 0ffc0268
rtd_phosphonetx/.classpath
+ 2
− 2
View file @ 0ffc0268
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<classpathentry kind="src" path="source/java"/> <classpathentry kind="src" path="source/java"/>
<classpathentry kind="src" path="sourceTest/java"/> <classpathentry kind="src" path="sourceTest/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/datastore_server"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/datastore_server"/>
<classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/dbmigration"/> <classpathentry combineaccessrules="false" kind="src" path="/dbmigration"/>
<classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/> <classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/>
<classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/> <classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/>
......
rtd_phosphonetx/build/build.xml
+ 7
− 2
View file @ 0ffc0268
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
--> -->
<target name="war" depends="openbis.war, make-api-dist" description="Creates project war file."> <target name="war" depends="openbis.war, make-api-dist" description="Creates project war file.">
<war warfile="${webapp.file}" update="true"> <war warfile="${webapp.file}" update="true">
<classes dir="source/sql"> <classes dir="../rtd_phosphonetx/source/sql">
<include name="**/*.sql" /> <include name="**/*.sql" />
</classes> </classes>
<classes dir="../openbis/${sources}"> <classes dir="../openbis/${sources}">
...@@ -128,7 +128,12 @@ ...@@ -128,7 +128,12 @@
<exclude name="**/*.gwt.xml" /> <exclude name="**/*.gwt.xml" />
<include name="**/*.xsd" /> <include name="**/*.xsd" />
</classes> </classes>
<zipfileset dir="${original.dist}/core-plugins" prefix="core-plugins"> <classes dir="../rtd_phosphonetx/${sources}">
<include name="**/*.xml" />
<exclude name="**/*.gwt.xml" />
<include name="**/*.xsd" />
</classes>
<zipfileset dir="../rtd_phosphonetx/dist/core-plugins" prefix="core-plugins">
<include name="**/*.*" /> <include name="**/*.*" />
<exclude name="**/.svn/*.*" /> <exclude name="**/.svn/*.*" />
</zipfileset> </zipfileset>
......
screening/.classpath
+ 2
− 2
View file @ 0ffc0268
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<classpath> <classpath>
<classpathentry kind="src" path="source/java"/> <classpathentry kind="src" path="source/java"/>
<classpathentry kind="src" path="sourceTest/java"/> <classpathentry kind="src" path="sourceTest/java"/>
<classpathentry combineaccessrules="false" kind="src" path="/datastore_server"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/datastore_server"/>
<classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
<classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/> <classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/>
<classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/> <classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/>
<classpathentry kind="lib" path="/libraries/commons-lang/commons-lang.jar" sourcepath="/libraries/commons-lang/src.zip"/> <classpathentry kind="lib" path="/libraries/commons-lang/commons-lang.jar" sourcepath="/libraries/commons-lang/src.zip"/>
......
screening/build/build.xml
+ 9
− 4
View file @ 0ffc0268
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<fail if="system.tests.failed" message="At least one system test failed." /> <fail if="system.tests.failed" message="At least one system test failed." />
</target> </target>
<target name="ci" depends="run-tests, check-restrictions, dist, check-dependencies" /> <target name="ci" depends="check-dependencies, run-tests, check-restrictions, dist" />
<!-- <!--
// Compiles the javascript using GWT compiler. // Compiles the javascript using GWT compiler.
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
<copy file="${dir}/${jar}" todir="${webapp.dist}" /> <copy file="${dir}/${jar}" todir="${webapp.dist}" />
<copy file="${dir}/${jar}" todir="${jars.to.be.signed.dir}" /> <copy file="${dir}/${jar}" todir="${jars.to.be.signed.dir}" />
<signjar jar="${webapp.dist}/${jar}" <signjar jar="${webapp.dist}/${jar}"
keystore="etc/dev.keystore" keystore="../screening/etc/dev.keystore"
alias="openbis" alias="openbis"
storepass="openbistest"/> storepass="openbistest"/>
<copy file="${webapp.dist}/${jar}" todir="${targets.www.openbis}"/> <copy file="${webapp.dist}/${jar}" todir="${targets.www.openbis}"/>
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
<target name="war" depends="openbis.war" description="Creates project war file."> <target name="war" depends="openbis.war" description="Creates project war file.">
<unzip src="${webapp.file}" dest="${webapp.file}.unpacked"/> <unzip src="${webapp.file}" dest="${webapp.file}.unpacked"/>
<copy todir="${webapp.file}.unpacked/WEB-INF/classes" overwrite="true"> <copy todir="${webapp.file}.unpacked/WEB-INF/classes" overwrite="true">
<fileset dir="source"> <fileset dir="../screening/source">
<include name="**/*.sql" /> <include name="**/*.sql" />
</fileset> </fileset>
<fileset dir="../openbis/${sources}"> <fileset dir="../openbis/${sources}">
...@@ -288,6 +288,11 @@ ...@@ -288,6 +288,11 @@
<exclude name="**/*.gwt.xml" /> <exclude name="**/*.gwt.xml" />
<include name="**/*.xsd" /> <include name="**/*.xsd" />
</fileset> </fileset>
<fileset dir="../screening/${sources}">
<include name="**/*.xml" />
<exclude name="**/*.gwt.xml" />
<include name="**/*.xsd" />
</fileset>
</copy> </copy>
<copy todir="${webapp.file}.unpacked/WEB-INF/lib" overwrite="true"> <copy todir="${webapp.file}.unpacked/WEB-INF/lib" overwrite="true">
<fileset dir="${lib}/jaxb"> <fileset dir="${lib}/jaxb">
...@@ -304,7 +309,7 @@ ...@@ -304,7 +309,7 @@
</fileset> </fileset>
</copy> </copy>
<copy todir="${webapp.file}.unpacked/core-plugins" overwrite="true"> <copy todir="${webapp.file}.unpacked/core-plugins" overwrite="true">
<fileset dir="${original.dist}/core-plugins"> <fileset dir="../screening/dist/core-plugins">
<include name="**/*.*" /> <include name="**/*.*" />
<exclude name="**/.svn/*.*" /> <exclude name="**/.svn/*.*" />
</fileset> </fileset>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment