Merge branch 'master' of ecommons@wax.hive:bdberl

Conflicts:
	Rakefile

Rakefile

@@ -41,11 +41,16 @@ task :int_test do
   run_tests "int_test", "+A10"
 end
 
-# task :compile_perf_tests do
-#   do_compile_tests("perftest")
-# end
-# 
-# desc "Run performance tests"
-# task :perftest => [:compile, :compile_perf_tests] do
-#   run_tests "perftest", "+A10"
-# end
+task :package => [:compile] do
+  app = File.basename(APP, ".app")
+  vsn = erl_app_version(app)
+  target_dir = "#{app}-#{vsn}"
+  Dir.mkdir target_dir
+  cp_r 'ebin', target_dir
+  cp_r 'include', target_dir
+  cp_r 'src', target_dir
+  cp_r 'priv', target_dir
+  Dir.mkdir "#{target_dir}/priv/bin"
+  cp_r Dir.glob('c_src/system/bin/*'), "#{target_dir}/priv/bin"
+  puts "Packaged to #{target_dir}"
+end

base.rake

@@ -73,6 +73,26 @@ def erl_app_modules(app)
   end
 end
 
+def erl_app_version(app)
+  script = <<-ERL
+     ok = application:load(#{app}),
+     {ok, Vsn} = application:get_key(#{app}, vsn),
+     io:format("~s\\n", [Vsn]).
+     ERL
+  output = erl_run(script, "-pa ebin")
+  output.strip()
+end
+
+def erl_app_version(app)
+  script = <<-ERL
+     ok = application:load(#{app}),
+     {ok, Vsn} = application:get_key(#{app}, vsn),
+     io:format("~s\\n", [Vsn]).
+     ERL
+  output = erl_run(script, "-pa ebin")
+  output.strip()
+end
+
 def erts_dir()
   script = <<-ERL
       io:format("~s\n", [lists:concat([code:root_dir(), "/erts-", erlang:system_info(version)])])

c_src/buildlib.sh

@@ -22,7 +22,6 @@ tar -xzf db-${DB_VER}.tar.gz && \
 (cd db-${DB_VER}/build_unix && \
     ../dist/configure --prefix=$WORKDIR --disable-shared --with-pic && make && ranlib libdb-*.a && make install) && \
     mkdir -p $TARGETDIR/utils && \
-    cp $WORKDIR/bin/* $TARGETDIR/utils && \
     rm -rf db-${DB_VER}