From 4a5405e4b824b9f935f3f398c53fb83b8d07a15c Mon Sep 17 00:00:00 2001 From: Stephen Dolan Date: Sat, 11 May 2013 14:57:58 +0100 Subject: [PATCH] Rake task to build website including source dist and binaries. --- .gitignore | 4 ++-- build/.gitignore | 1 + docs/Rakefile | 4 ++-- build/compile => scripts/crosscompile | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 build/.gitignore rename build/compile => scripts/crosscompile (94%) diff --git a/.gitignore b/.gitignore index 96cd2892..06c87dda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ *.o *~ -build jq jq.1 @@ -22,4 +21,5 @@ config.log config.status autom4te.cache config.h -Makefile \ No newline at end of file +Makefile +jq-*.tar.gz \ No newline at end of file diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 00000000..f59ec20a --- /dev/null +++ b/build/.gitignore @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/docs/Rakefile b/docs/Rakefile index 6ef83d01..4ca5752f 100644 --- a/docs/Rakefile +++ b/docs/Rakefile @@ -75,7 +75,7 @@ $BINARIES = { $BINARIES.each do |name, args| file "../build/#{name}" do |t| - sh "MAKEFLAGS=-j4 ../build/compile #{name} #{args}" + sh "MAKEFLAGS=-j4 ../scripts/crosscompile #{name} #{args}" end task :binaries => ["../build/#{name}"] end @@ -139,7 +139,7 @@ end directory "output/download/source" task :tarball => ["output/download/source"] do - sh "cd ..; make dist" + sh "cd ..; ./configure && make dist && make distclean" sh "cp ../jq-*.tar.gz output/download/source" end diff --git a/build/compile b/scripts/crosscompile similarity index 94% rename from build/compile rename to scripts/crosscompile index 7cfa94de..7ee086b7 100755 --- a/build/compile +++ b/scripts/crosscompile @@ -11,7 +11,7 @@ # e.g. $0 win32 --host=i686-w64-mingw32 set -e -cd `dirname "$0"` +cd `dirname "$0"`/../build plat="$1" [ -z "$plat" ] && exit 1