From 97258d7314095c227b300d4fea643cd08a0be774 Mon Sep 17 00:00:00 2001 From: pkupczyk <pkupczyk> Date: Mon, 14 Jul 2014 13:24:28 +0000 Subject: [PATCH] SSDM-133 : Remove .classpath, .project, build/ from gradle-built projects - convert more projects SVN: 32039 --- openbis_standard_technologies/.classpath | 11 -- openbis_standard_technologies/.project | 17 --- openbis_standard_technologies/build/antrun.sh | 6 - openbis_standard_technologies/build/build.xml | 121 ------------------ 4 files changed, 155 deletions(-) delete mode 100644 openbis_standard_technologies/.classpath delete mode 100644 openbis_standard_technologies/.project delete mode 100755 openbis_standard_technologies/build/antrun.sh delete mode 100644 openbis_standard_technologies/build/build.xml diff --git a/openbis_standard_technologies/.classpath b/openbis_standard_technologies/.classpath deleted file mode 100644 index 90205157fcb..00000000000 --- a/openbis_standard_technologies/.classpath +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="source/java"/> - <classpathentry kind="src" path="sourceTest/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/rtd_phosphonetx"/> - <classpathentry combineaccessrules="false" kind="src" path="/screening"/> - <classpathentry kind="lib" path="/libraries/gwt2.4/gwt-user.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/deep_sequencing_unit"/> - <classpathentry kind="output" path="targets/www/WEB-INF/classes"/> -</classpath> diff --git a/openbis_standard_technologies/.project b/openbis_standard_technologies/.project deleted file mode 100644 index 6b19f1395cd..00000000000 --- a/openbis_standard_technologies/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>openbis_standard_technologies</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/openbis_standard_technologies/build/antrun.sh b/openbis_standard_technologies/build/antrun.sh deleted file mode 100755 index 5ff1a62b259..00000000000 --- a/openbis_standard_technologies/build/antrun.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash - -ME="$0" -MYDIR=${ME%/*} -cd $MYDIR -ant -lib ../../build_resources/lib/ecj.jar "$@" diff --git a/openbis_standard_technologies/build/build.xml b/openbis_standard_technologies/build/build.xml deleted file mode 100644 index 385234ca26a..00000000000 --- a/openbis_standard_technologies/build/build.xml +++ /dev/null @@ -1,121 +0,0 @@ -<project name="openbis_standard_technologies" default="dist" basedir=".."> - <import file="../../screening/build/build.xml" /> - <import file="../../rtd_phosphonetx/build/build.xml" /> - <import file="../../deep_sequencing_unit/build/build.xml" /> - <project-classpath name="ecp" classes="${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}" /> - - <target name="ci" depends="build-common.ci, dist" /> - - <target name="core-plugins-dist" depends="openbis.core-plugins-dist"> - <antcall target="copy-core-plugins"> - <param name="project-path" value="../rtd_phosphonetx/"/> - <param name="plugin-kind" value="as"/> - </antcall> - <antcall target="copy-core-plugins"> - <param name="project-path" value="../screening/"/> - <param name="plugin-kind" value="as"/> - </antcall> - <antcall target="copy-core-plugins"> - <param name="project-path" value="../deep_sequencing_unit/"/> - <param name="plugin-kind" value="as"/> - </antcall> - <copy todir="${dist}/core-plugins" file="dist/etc/core-plugins.properties"/> - </target> - - <target name="dist" depends="clean"> - <antcall target="openbis.make-dist"> - <param name="actual.build.info.filename" value="BUILD-openbis.INFO" /> - <param name="variant" value="-standard-technologies" /> - </antcall> - <antcall target="screening.screening-api"/> - <mkdir dir="${dist.datastore_server.lib}" /> - - <antcall target="dist-upload-gui"> - <param name="variant" value="" /> - </antcall> - <antcall target="datastore_server.add-dss-dist-libs"/> - <build-info revision="revision.number" version="version.number" clean="clean.flag" /> - <antcall target="make-dss-jar"/> - - <!-- metabolomics jars --> - <ant dir="../rtd_yeastx/build" target="jar" useNativeBasedir="true"/> - <copy file="../rtd_yeastx/targets/dist/datastore_server-plugin.jar" tofile="${dist.datastore_server.lib}/datastore_server_metabolomics.jar"/> - <copy todir="${dist.datastore_server.lib}"> - <fileset dir="${lib}/jfreechart" > - <include name="*.jar"/> - </fileset> - </copy> - - <!-- illumina ngs --> - <antcall target="deep_sequencing_unit.make-dss-plugin-jar"/> - <move file="${plugin-jar.file}" tofile="${dist.datastore_server.lib}/datastore_server_plugin-illumina-ngs.jar" /> - <antcall target="openbis.copy-core-plugins"> - <param name="project-path" value="../deep_sequencing_unit/" /> - <param name="plugin-kind" value="dss" /> - </antcall> - - <!-- proteomics --> - <antcall target="rtd_phosphonetx.make-dss-plugin-jar"/> - <move file="${plugin-jar.file}" tofile="${dist.datastore_server.lib}/datastore_server_plugin-proteomics.jar" /> - <antcall target="openbis.copy-core-plugins"> - <param name="project-path" value="../rtd_phosphonetx/" /> - <param name="plugin-kind" value="dss" /> - </antcall> - - <!-- screening --> - <antcall target="screening.make-dss-plugin-jar"/> - <move file="${plugin-jar.file}" tofile="${dist.datastore_server.lib}/datastore_server_plugin-screening.jar" /> - <antcall target="openbis.copy-core-plugins"> - <param name="project-path" value="../screening/" /> - <param name="plugin-kind" value="dss" /> - </antcall> - <delete file="${dist}/core-plugins/core-plugins.properties"/> - <antcall target="screening.add-stuff-to-dss-dist"/> - <antcall target="screening.compute-dss-checksum"/> - - <antcall target="datastore_server.create-distribution"> - <param name="variant" value="-standard-technologies" /> - </antcall> - <delete dir="${dist}/core-plugins"/> - </target> - - <target name="war" depends="rtd_phosphonetx.war, screening.war"> - </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" - description="Compile and run openbis from Eclipse"> - <antcall target="compile-module-test"> - <param name="gwt.sources" value="${gwt.extended.sources}" /> - <param name="module-test.path" value="openbis-test" /> - <param name="module-test.module" value="ch.systemsx.cisd.openbis.OpenBIS" /> - </antcall> - <antcall target="run-openbis-from-eclipse" /> - </target> - - <target name="run-openbis-from-eclipse" - description="run openbis from Eclipse"> - <antcall target="run-module-test"> - <param name="gwt.sources" value="${gwt.extended.sources}" /> - <param name="module-test.path" value="openbis-test" /> - <param name="module-test.module" value="ch.systemsx.cisd.openbis.OpenBIS" /> - </antcall> - </target> - -</project> \ No newline at end of file -- GitLab