Added dockers for mono 2.0, 3.5 and 4.0 and refactored log4net.build to build properly
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/043bc612 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/043bc612 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/043bc612 Branch: refs/heads/develop Commit: 043bc612d1500b63aea39191c538254d852b303c Parents: bc8cb0a Author: Dominik Psenner <[email protected]> Authored: Mon Jul 3 10:06:15 2017 +0200 Committer: Dominik Psenner <[email protected]> Committed: Mon Jul 3 10:06:15 2017 +0200 ---------------------------------------------------------------------- Jenkinsfile | 16 ++++++++++++++-- buildtools/docker/builder-mono-2.0/Dockerfile | 9 +++++++++ buildtools/docker/builder-mono-3.5/Dockerfile | 9 +++++++++ buildtools/docker/builder-mono-4.0/Dockerfile | 9 +++++++++ buildtools/docker/builder-mono3/Dockerfile | 9 --------- log4net.build | 1 - log4net.include | 6 ------ 7 files changed, 41 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/043bc612/Jenkinsfile ---------------------------------------------------------------------- diff --git a/Jenkinsfile b/Jenkinsfile index a47e58a..a9ae831 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,12 +41,24 @@ pipeline { bat "${NAnt} -buildfile:log4net.build" } } - stage('Build on builder-mono3') { - agent { dockerfile { dir 'buildtools/docker/builder-mono3' } } + stage('Build on builder-mono-2.0') { + agent { dockerfile { dir 'buildtools/docker/builder-mono-2.0' } } + steps { + sh "nant -buildfile:log4net.build compile-momo-2.0" + } + } + stage('Build on builder-mono-3.5') { + agent { dockerfile { dir 'buildtools/docker/builder-mono-3.5' } } steps { sh "nant -buildfile:log4net.build compile-momo-3.5" } } + stage('Build on builder-mono-4.0') { + agent { dockerfile { dir 'buildtools/docker/builder-mono-4.0' } } + steps { + sh "nant -buildfile:log4net.build compile-momo-4.0" + } + } stage('Test on Windows') { steps { bat "${NAnt} -buildfile:tests\\nant.build" http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/043bc612/buildtools/docker/builder-mono-2.0/Dockerfile ---------------------------------------------------------------------- diff --git a/buildtools/docker/builder-mono-2.0/Dockerfile b/buildtools/docker/builder-mono-2.0/Dockerfile new file mode 100644 index 0000000..aa3a0a0 --- /dev/null +++ b/buildtools/docker/builder-mono-2.0/Dockerfile @@ -0,0 +1,9 @@ +# Name of container: docker-ubuntu-latest-nant +FROM mono:3 + +# set the maintainer of this docker image +MAINTAINER "[email protected]" + +# install nant +RUN apt-get update && apt-get install -y nant git mono-reference-assemblies-2.0 + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/043bc612/buildtools/docker/builder-mono-3.5/Dockerfile ---------------------------------------------------------------------- diff --git a/buildtools/docker/builder-mono-3.5/Dockerfile b/buildtools/docker/builder-mono-3.5/Dockerfile new file mode 100644 index 0000000..be55006 --- /dev/null +++ b/buildtools/docker/builder-mono-3.5/Dockerfile @@ -0,0 +1,9 @@ +# Name of container: docker-ubuntu-latest-nant +FROM mono:3 + +# set the maintainer of this docker image +MAINTAINER "[email protected]" + +# install nant +RUN apt-get update && apt-get install -y nant git mono-reference-assemblies-3.5 + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/043bc612/buildtools/docker/builder-mono-4.0/Dockerfile ---------------------------------------------------------------------- diff --git a/buildtools/docker/builder-mono-4.0/Dockerfile b/buildtools/docker/builder-mono-4.0/Dockerfile new file mode 100644 index 0000000..7c32d70 --- /dev/null +++ b/buildtools/docker/builder-mono-4.0/Dockerfile @@ -0,0 +1,9 @@ +# Name of container: docker-ubuntu-latest-nant +FROM mono:4 + +# set the maintainer of this docker image +MAINTAINER "[email protected]" + +# install nant +RUN apt-get update && apt-get install -y nant git mono-reference-assemblies-4.0 + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/043bc612/buildtools/docker/builder-mono3/Dockerfile ---------------------------------------------------------------------- diff --git a/buildtools/docker/builder-mono3/Dockerfile b/buildtools/docker/builder-mono3/Dockerfile deleted file mode 100644 index a653ea9..0000000 --- a/buildtools/docker/builder-mono3/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# Name of container: docker-ubuntu-latest-nant -FROM mono:3 - -# set the maintainer of this docker image -MAINTAINER "[email protected]" - -# install nant -RUN apt-get update && apt-get install -y nant git - http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/043bc612/log4net.build ---------------------------------------------------------------------- diff --git a/log4net.build b/log4net.build index 0ad18c2..fe31d90 100644 --- a/log4net.build +++ b/log4net.build @@ -25,7 +25,6 @@ limitations under the License. <include buildfile="${log4net.basedir}/log4net.include"/> <!-- Targets that should always be executed --> <call target="set-build-configuration"/> - <call target="set-framework-configuration"/> <!-- Targets that check settings --> <target name="check-htmlhelp-compiler"> <if test="${not property::exists('htmlhelp.compiler')}"> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/043bc612/log4net.include ---------------------------------------------------------------------- diff --git a/log4net.include b/log4net.include index f8f7de0..7c9bf4a 100644 --- a/log4net.include +++ b/log4net.include @@ -187,12 +187,6 @@ limitations under the License. <property name="current.build.config.release" value="false" /> <property name="current.build.config.${current.build.config}" value="true" /> </target> - <target name="set-framework-configuration" depends="check-current-build-config"> - <if test="${not target::exists('set-' + framework::get-target-framework() + '-runtime-configuration')}"> - <fail message="The current target framework (${framework::get-description(framework::get-target-framework())}) is not supported by log4net." /> - </if> - <call target="set-${framework::get-target-framework()}-runtime-configuration" /> - </target> <target name="set-net-1.0-runtime-configuration" depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines"> <property name="nant.settings.currentframework" value="net-1.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" />
