Rake task to build website including source dist and binaries.

diff --git a/.gitignore b/.gitignore
index 96cd2892d1e080cdc8565b6da1aac3f7b6cabd54..06c87ddafc5125b0d334ecf202181e15b6baf4ae 100644 (file)
--- 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 (file)
index 0000000..f59ec20
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1 @@
+*
\ No newline at end of file

diff --git a/docs/Rakefile b/docs/Rakefile
index 6ef83d01e9b971d36b9770ed7bb28a0250eca7e9..4ca5752f14a9423de4936d055328338ab615b797 100644 (file)
--- 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 7cfa94de41b995c2874d5baf6c734549540e5af2..7ee086b79ad342f8553e1220c806722f3cee841e 100755 (executable)
--- 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