diff --git a/installation/.classpath b/installation/.classpath deleted file mode 100644 index b7b9fcbe104c63f10956262ecf36e058cc37546b..0000000000000000000000000000000000000000 --- a/installation/.classpath +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="source/java"/> - <classpathentry kind="src" path="sourceTest/java"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <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/log4j/log4j.jar" sourcepath="/libraries/log4j/src.zip"/> - <classpathentry kind="lib" path="/libraries/commons-collections/commons-collections.jar" sourcepath="/libraries/commons-collections/src.jar"/> - <classpathentry kind="lib" path="/libraries/junit/junit.jar" sourcepath="/libraries/junit/src.jar"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-ant.jar"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-api.jar" sourcepath="/libraries/izpack/sources/izpack.zip"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-compiler.jar"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-core.jar" sourcepath="/libraries/izpack/sources/izpack.zip"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-event.jar"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-gui.jar"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-ini4j.jar"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-installer.jar" sourcepath="/libraries/izpack/sources/izpack.zip"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-native.jar"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-panel.jar"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-tools.jar"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-uninstaller.jar" sourcepath="/libraries/izpack/sources/izpack.zip"/> - <classpathentry kind="lib" path="/libraries/izpack/izpack-util.jar" sourcepath="/libraries/izpack/sources/izpack.zip"/> - <classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/> - <classpathentry kind="lib" path="/libraries/commons-io/commons-io.jar" sourcepath="/libraries/commons-io/src.zip"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/installation/.project b/installation/.project deleted file mode 100644 index ced61925f6ac3dbcb3cfbcfaccd17c31180f47f0..0000000000000000000000000000000000000000 --- a/installation/.project +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>installation</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.python.pydev.PyDevBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.python.pydev.pythonNature</nature> - </natures> -</projectDescription> diff --git a/installation/build/antrun.sh b/installation/build/antrun.sh deleted file mode 100755 index 5ff1a62b259d6011d228440f2fb89ec0dbecf747..0000000000000000000000000000000000000000 --- a/installation/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/installation/build/build.xml b/installation/build/build.xml deleted file mode 100644 index 5f83b1e93799c146f2594ca4f020d4b30a92f833..0000000000000000000000000000000000000000 --- a/installation/build/build.xml +++ /dev/null @@ -1,184 +0,0 @@ -<project name="installation" default="dist" basedir=".."> - - <import file="../../openbis-common/build/build-common.xml" /> - - <project-classpath name="ecp" classes="${classes}" /> - - <property name="original.dist" value="dist" /> - <property name="mainfolder" value="installation" /> - - <property name="classes.installation" value="../installation/targets/ant/classes" /> - <property name="classes.common" value="../common/targets/ant/classes" /> - - <!-- absolute path referenced from IzPack Ant task --> - <property name="installer.basedir" value="${basedir}/resource/installer" /> - <!-- relative path referenced from within the installer compilation --> - <property name="installer.dist.dir" value="${basedir}/${dist}/installer" /> - <property name="installer.resourcedir" value="${installer.dist.dir}" /> - <property name="installer.jar.file" value="${basedir}/${dist}/openBIS-installer.jar" /> - - <path id="izpack.classpath"> - <pathelement path="${classpath}"/> - <fileset dir="${lib}"> - <include name="izpack/*.jar"/> - <include name="commons-io/commons-io.jar"/> - <include name="commons-lang/commons-lang.jar"/> - </fileset> - </path> - <taskdef name="izpack" classpathref="izpack.classpath" classname="com.izforge.izpack.ant.IzPackTask"/> - - <target name="compile" depends="build-common.compile" /> - - <target name="run-tests"> - <antcall target="build-common.run-tests"> - <param name="test.suite" value="tests.xml" /> - </antcall> - </target> - - <target name="dist" depends="dist-standard-technologies"> - </target> - - <target name="dist-standard-technologies" depends="compile"> - <build-info revision="revision.number" version="version.number" clean="clean.flag" /> - - <antcall target="create-installation-tarball"> - <param name="openbis.server.zip.folder" value="../openbis_standard_technologies/targets/dist" /> - <param name="datastore.server.zip.folder" value="../openbis_standard_technologies/targets/dist" /> - <param name="variant" value="-standard-technologies" /> - <param name="database.kind" value="standard-technologies" /> - <param name="installation.customize.folder" value="../openbis_standard_technologies/dist/tarball/installer" /> - <param name="is-standard-technologies" value="true" /> - </antcall> - </target> - - <target name="create-installation-tarball"> - <pathconvert property="extracted.version"> - <path> - <fileset dir="${openbis.server.zip.folder}"> - <include name="openBIS-server${variant}-*.zip"/> - </fileset> - </path> - <chainedmapper> - <flattenmapper/> - <filtermapper> - <replaceregex pattern="openBIS-server${variant}-(.*)\.zip" replace="\1"/> - </filtermapper> - </chainedmapper> - </pathconvert> - <property name="tarball.basename" value="openBIS-installation${variant}-${extracted.version}" /> - - <antcall target="create-installer"/> - - <tar destfile="${basedir}/${dist}/${tarball.basename}.tar.gz" compression="gzip"> - <tarfileset dir="${basedir}/resource/tarball" - prefix="${tarball.basename}/"> - <include name="*.*"/> - <exclude name="*.sh"/> - </tarfileset> - <tarfileset dir="${basedir}/resource/tarball" - prefix="${tarball.basename}/" - filemode="755"> - <include name="*.sh"/> - </tarfileset> - <tarfileset dir="${dist}" - prefix="${tarball.basename}/"> - <include name="*-installer.jar"/> - </tarfileset> - </tar> - <delete file="${installer.jar.file}" /> - </target> - - - <!-- - params - 1) openbis.server.zip.folder - 2) datastore.server.zip.folder - 3) variant ("" or "-screening") - 4) database.kind - 5) installation.customize.folder - declares a local folder for (e.g. screening/dist/installer), where the different - installation can define customizations for their installers. - 6) is-standard-technologies - if true wizard page for selecting/deselecting technologies will be shown - --> - <target name="create-installer"> - - <mkdir dir="${installer.dist.dir}" /> - - <unzip dest="${installer.dist.dir}"> - <fileset dir="${openbis.server.zip.folder}"> - <include name="openBIS-server${variant}-*.zip"/> - </fileset> - <fileset dir="${datastore.server.zip.folder}"> - <include name="datastore_server${variant}-*.zip"/> - </fileset> - </unzip> - - <copy todir="${installer.dist.dir}"> - <fileset dir="${installer.basedir}"> - <include name="**/*"/> - <exclude name="**/.svn/*"/> - </fileset> - </copy> - <copy todir="${installer.dist.dir}" overwrite="true"> - <fileset dir="${installation.customize.folder}"> - <include name="**/*"/> - <exclude name="**/.svn/*"/> - </fileset> - </copy> - - <!-- this suffix will be used by the installer to check if there are database connections --> - <property name="installer.database.kind" value="${database.kind}" /> - <replace file="${installer.dist.dir}/install.xml" token="is-standard-technologies-value-created-by-ant-script" value="${is-standard-technologies}"/> - - <izpack input="${installer.dist.dir}/install.xml" - output="${installer.jar.file}" - inheritAll="true" - installerType="standard" - basedir="${basedir}"/> - - <jar update="true" destfile="${installer.jar.file}"> - <fileset dir="${classes.installation}"> - <include name="ch/systemsx/cisd/openbis/installer/izpack/**/*"/> - </fileset> - <fileset dir="${classes.common}"> - <include name="**/*.class"/> - </fileset> - - <zipfileset src="${lib}/postgresql/postgresql.jar"> - <exclude name="META_INF/*"/> - <include name="**/*"/> - </zipfileset> - <zipfileset src="${lib}/cisd-base/cisd-base.jar"> - <exclude name="META_INF/*"/> - <include name="**/*"/> - </zipfileset> - <zipfileset src="${lib}/commons-io/commons-io.jar"> - <exclude name="META_INF/*"/> - <include name="**/*"/> - </zipfileset> - <zipfileset src="${lib}/log4j/log4j.jar"> - <exclude name="META_INF/*"/> - <include name="**/*"/> - </zipfileset> - </jar> - - <delete dir="${installer.dist.dir}" /> - - </target> - - - <!-- - // Task for continuous integration server. - --> - <target name="clean" description="Cleans distribution directory."> - <delete dir="${dist}" failonerror="true" /> - <mkdir dir="${dist}" /> - <!-- make Hudson happy (it expects a test-output folder --> - <mkdir dir="${dist}/../test-output" /> - </target> - - <target name="ci" depends="clean, dist, build-common.ci" /> - - -</project>