couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [34/50] [abbrv] couch commit: updated refs/heads/import-rcouch to e2dbc79
Date Thu, 06 Feb 2014 17:40:16 GMT
add release build


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/22581695
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/22581695
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/22581695

Branch: refs/heads/import-rcouch
Commit: 225816958952f5168cf1783b655a63a550593860
Parents: 943be4a
Author: benoitc <benoitc@apache.org>
Authored: Tue Jan 7 15:18:21 2014 +0100
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Thu Feb 6 11:38:29 2014 -0600

----------------------------------------------------------------------
 c_src/couch_js/help.h | 2 +-
 rebar.config.script   | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/22581695/c_src/couch_js/help.h
----------------------------------------------------------------------
diff --git a/c_src/couch_js/help.h b/c_src/couch_js/help.h
index f4ddb24..81bae4d 100644
--- a/c_src/couch_js/help.h
+++ b/c_src/couch_js/help.h
@@ -73,7 +73,7 @@ static const char USAGE_TEMPLATE[] =
             USAGE_TEMPLATE,                     \
             basename,                           \
             basename,                           \
-            PACKAGE_NAME,                       \
+            VENDOR_NAME,                       \
             basename,                           \
             PACKAGE_BUGREPORT)
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/22581695/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index df8c48e..e8b987c 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -14,14 +14,13 @@
 %% the License.
 
 
-Cfg = case file:consult("../../vars.config") of
+Cfg = case file:consult("../../pkg.vars.config") of
           {ok, Terms} ->
               Terms;
           _Err ->
               []
       end,
 
-
 %% get version infos
 MajorVersion = integer_to_list(proplists:get_value(version_major, Cfg, 0)),
 MinorVersion = integer_to_list(proplists:get_value(version_minor, Cfg, 0)),
@@ -39,7 +38,7 @@ Version = case os:getenv("RELEASE") of
         BaseVersion ++ SecondaryVersion
 end,
 
-Cfg1 = [{package_string, proplists:get_value(package_name, Cfg, "")
+Cfg1 = [{package_string, proplists:get_value(vendor_name, Cfg, "")
                          ++ " " ++ Version },
         {package_version, Version}] ++ Cfg,
 
@@ -55,7 +54,6 @@ CfgStr = lists:foldl(fun({K, V}, Acc) ->
 ok = file:write_file("c_src/couch_js/config.h", iolist_to_binary(CfgStr)),
 
 
-
 GetFlag = fun(Name, Default) ->
         case os:getenv(Name) of
             false -> Default;


Mime
View raw message