From b63c51c245066654e912315664087dc759d59637 Mon Sep 17 00:00:00 2001 From: Sonny Scroggin Date: Tue, 29 Sep 2015 13:18:49 -0500 Subject: [PATCH 1/2] Add additional package information for hex.pm --- mix.exs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mix.exs b/mix.exs index 128514896..b71c7e255 100644 --- a/mix.exs +++ b/mix.exs @@ -10,6 +10,7 @@ defmodule Ejabberd.Mixfile do compilers: [:asn1] ++ Mix.compilers, erlc_options: erlc_options, erlc_paths: ["asn1", "src"], + package: package, deps: deps] end @@ -45,6 +46,12 @@ defmodule Ejabberd.Mixfile do {:eredis, git: "https://github.com/wooga/eredis"}, {:exrm, "~> 0.19.2"} ] + + defp package do + [licenses: ["GPLv2"], + links: %{"Site" => "https://www.ejabberd.im", + "Documentation" => "http://docs.ejabberd.im", + "Source" => "https://github.com/processone/ejabberd"}] end end From 6b81a1ed90fb98a8158cdd2f6b51b7d659b4c802 Mon Sep 17 00:00:00 2001 From: Sonny Scroggin Date: Tue, 29 Sep 2015 13:19:35 -0500 Subject: [PATCH 2/2] clean up whitespace --- mix.exs | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/mix.exs b/mix.exs index b71c7e255..a708df675 100644 --- a/mix.exs +++ b/mix.exs @@ -20,32 +20,31 @@ defmodule Ejabberd.Mixfile do included_applications: [:p1_logger,:p1_yaml,:p1_tls,:p1_xml,:p1_stringprep,:p1_zlib,:p1_cache_tab,:mnesia,:p1_utils, :p1_iconv,:esip,:p1_stun,:ehyperloglog,:p1_mysql,:p1_pgsql,:eredis]] end - + defp erlc_options do # Use our own includes + includes from all dependencies includes = ["include"] ++ Path.wildcard(Path.join("..", "/*/include")) [:debug_info] ++ Enum.map(includes, fn(path) -> {:i, path} end) end - + defp deps do - [ - {:p1_xml, git: "https://github.com/processone/xml"}, - {:p1_logger, git: "https://github.com/processone/p1_logger"}, - {:p1_yaml, git: "https://github.com/processone/p1_yaml"}, - {:p1_tls, git: "https://github.com/processone/tls"}, - {:p1_stringprep, git: "https://github.com/processone/stringprep"}, - {:p1_zlib, git: "https://github.com/processone/zlib"}, - {:p1_cache_tab, git: "https://github.com/processone/cache_tab"}, - {:p1_utils, git: "https://github.com/processone/p1_utils"}, - {:p1_iconv, git: "https://github.com/processone/eiconv"}, - {:esip, git: "https://github.com/processone/p1_sip"}, - {:p1_stun, git: "https://github.com/processone/stun"}, - {:ehyperloglog, git: "https://github.com/vaxelfel/eHyperLogLog"}, - {:p1_mysql, git: "https://github.com/processone/mysql"}, - {:p1_pgsql, git: "https://github.com/processone/pgsql"}, - {:eredis, git: "https://github.com/wooga/eredis"}, - {:exrm, "~> 0.19.2"} - ] + [{:p1_xml, git: "https://github.com/processone/xml"}, + {:p1_logger, git: "https://github.com/processone/p1_logger"}, + {:p1_yaml, git: "https://github.com/processone/p1_yaml"}, + {:p1_tls, git: "https://github.com/processone/tls"}, + {:p1_stringprep, git: "https://github.com/processone/stringprep"}, + {:p1_zlib, git: "https://github.com/processone/zlib"}, + {:p1_cache_tab, git: "https://github.com/processone/cache_tab"}, + {:p1_utils, git: "https://github.com/processone/p1_utils"}, + {:p1_iconv, git: "https://github.com/processone/eiconv"}, + {:esip, git: "https://github.com/processone/p1_sip"}, + {:p1_stun, git: "https://github.com/processone/stun"}, + {:ehyperloglog, git: "https://github.com/vaxelfel/eHyperLogLog"}, + {:p1_mysql, git: "https://github.com/processone/mysql"}, + {:p1_pgsql, git: "https://github.com/processone/pgsql"}, + {:eredis, git: "https://github.com/wooga/eredis"}, + {:exrm, "~> 0.19.2"}] + end defp package do [licenses: ["GPLv2"],