From df57a07dd5d760d7956500caa3262ff84538a560 Mon Sep 17 00:00:00 2001 From: Mickael Remond Date: Mon, 29 Jun 2015 23:14:18 +0200 Subject: [PATCH] Keep the version hardcoded in mix.exs file Generated the mix.exs file through configure is not possible when using mix, as it does not run configure after having downloaded the dependencies. #621 --- .gitignore | 1 - configure.ac | 3 +-- mix.exs.in => mix.exs | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) rename mix.exs.in => mix.exs (98%) diff --git a/.gitignore b/.gitignore index d44a41f3f..21f8cfada 100644 --- a/.gitignore +++ b/.gitignore @@ -41,4 +41,3 @@ XmppAddr.hrl /test/*.beam /logs/ /priv/sql -mix.exs diff --git a/configure.ac b/configure.ac index 6ae0a2455..a3e26384b 100644 --- a/configure.ac +++ b/configure.ac @@ -235,8 +235,7 @@ esac],[if test "x$lager" = "x"; then lager=true; fi]) AC_CONFIG_FILES([Makefile vars.config - src/ejabberd.app.src - mix.exs]) + src/ejabberd.app.src]) ENABLEUSER="" AC_ARG_ENABLE(user, diff --git a/mix.exs.in b/mix.exs similarity index 98% rename from mix.exs.in rename to mix.exs index d7b236e01..c93a08811 100644 --- a/mix.exs.in +++ b/mix.exs @@ -3,7 +3,7 @@ defmodule Ejabberd.Mixfile do def project do [app: :ejabberd, - version: "@PACKAGE_VERSION@", + version: "15.06", elixir: "~> 1.0", elixirc_paths: ["lib"], compile_path: ".",