Move {dist,build}-recursor to buildscripts/

  And make travis aware of the new dist-recursor location

diff --git a/.travis.yml b/.travis.yml
index 52758a45c35b15b9b0a7b19bfb6103e3355d4c27..1f9f29c0f9a6d47b169e5d906acc86d641150f47 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -106,8 +106,9 @@ script:
  - cd pdns
  - make -k -j 4 pdns_recursor
  - rm -f pdns_recursor
- - ./dist-recursor
- - cd pdns-recursor-*/
+ - cd ..
+ - ./build-scripts/dist-recursor
+ - cd pdns/pdns-recursor-*/
  - ./configure
  - make -k -j 4
  - cd ..

diff --git a/pdns/build-recursor b/build-scripts/build-recursor
similarity index 88%
rename from pdns/build-recursor
rename to build-scripts/build-recursor
index 80888cb0c24981d9ec5619bb2811ec0a024bc9c4..5d4b22ca43bce84611d323bd9f7d5320f3b019da 100755 (executable)
--- a/pdns/build-recursor
+++ b/build-scripts/build-recursor
@@ -2,19 +2,19 @@
 set -e
 set -x
 
-if [ -z "$1" ]; then
+if [ -z "$VERSION" ]; then
   VERSION=$(git describe --always --dirty=+ 2>/dev/null || true)
   if [ -z "$VERSION" ]; then
     VERSION="UNKNOWN"
   else
     VERSION="git-"$VERSION
   fi
-  DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)"
 else
   VERSION=$1
 fi
 
-cd pdns-recursor-$VERSION
+DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)"
+
 export DEBFULLNAME="PowerDNS.COM BV"
 DEBPKGNAME=pdns-recursor_$VERSION
 

diff --git a/pdns/dist-recursor b/build-scripts/dist-recursor
similarity index 92%
rename from pdns/dist-recursor
rename to build-scripts/dist-recursor
index 6e085bbf341689fe44eefce0a3e0dd71729f0669..e719e41df4e3498f93b1532e9b02f4e8c177def2 100755 (executable)
--- a/pdns/dist-recursor
+++ b/build-scripts/dist-recursor
@@ -2,16 +2,19 @@
 
 set -e
 
+if [ "$0" != "./build-scripts/dist-recursor" ]; then
+  echo "Please run me from the root checkout dir"
+  exit 1
+fi
+
+cd pdns
+
 ragel dnslabeltext.rl -o dnslabeltext.cc
 
 cd ../docs
 pandoc -s -t man manpages/pdns_recursor.1.md -o pdns_recursor.1
 pandoc -s -t man manpages/rec_control.1.md -o rec_control.1
 cd -
-## The following lines will be patched by set-version-recursor.
-VERSION=""
-DIST_HOST=""
-## End patch area.
 
 if [ -z "$VERSION" ]; then
   VERSION=$(git describe --always --dirty=+ 2>/dev/null || true)
@@ -20,9 +23,10 @@ if [ -z "$VERSION" ]; then
   else
     VERSION="git-"$VERSION
   fi
-  DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)"
 fi
 
+DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)"
+
 INCLUDES="iputils.hh arguments.hh base64.hh zoneparser-tng.hh \
 rcpgenerator.hh lock.hh dnswriter.hh  dnsrecords.hh dnsparser.hh utility.hh \
 recursor_cache.hh rec_channel.hh qtype.hh misc.hh dns.hh syncres.hh \
@@ -77,6 +81,7 @@ cp powerdns-example-script.lua $DIRNAME
 mkdir -p $DIRNAME/contrib
 cp ../contrib/systemd-pdns-recursor.service $DIRNAME/contrib
 mkdir -p $DIRNAME/build-scripts/redhat
+cp ../build-scripts/build-recursor $DIRNAME/build-scripts
 cp ../build-scripts/redhat/pdns-recursor-test.spec $DIRNAME/build-scripts/redhat
 cp pdns-recursor.spec $DIRNAME