Add version.py into generated raw source archive

Resolves #751

bin/build-helper

@@ -195,9 +195,14 @@ eof
         then
             archivename="$3"
         else
-            archivename="cdist-${tag}.tar.gz"
+            archivename="cdist-${tag}.tar"
             git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
                 || exit 1
+            # make sure target version is generated
+            "$0" target-version
+            tar -r -f "${archivename}" cdist/version.py || exit 1
+            gzip "${archivename}" || exit 1
+            archivename="${archivename}.gz"
         fi
         gpg --armor --detach-sign "${archivename}" || exit 1
 
@@ -232,7 +237,7 @@ eof
             || exit 1
 
         # remove generated files (archive and asc)
-        if [ $# -eq 2]
+        if [ $# -eq 2 ]
         then
             rm -f "${archivename}"
         fi

bin/build-helper.freebsd

@@ -230,9 +230,14 @@ eof
         then
             archivename="$3"
         else
-            archivename="cdist-${tag}.tar.gz"
+            archivename="cdist-${tag}.tar"
             git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
                 || exit 1
+            # make sure target version is generated
+            "$0" target-version
+            tar -r -f "${archivename}" cdist/version.py || exit 1
+            gzip "${archivename}" || exit 1
+            archivename="${archivename}.gz"
         fi
         gpg --armor --detach-sign "${archivename}" || exit 1
 
@@ -267,7 +272,7 @@ eof
             || exit 1
 
         # remove generated files (archive and asc)
-        if [ $# -eq 2]
+        if [ $# -eq 2 ]
         then
             rm -f "${archivename}"
         fi

docs/changelog

@@ -3,6 +3,7 @@ Changelog
 
 next:
 	* Core: Fix broken quiet mode (Darko Poljak)
+	* Build: Add version.py into generated raw source archive (Darko Poljak)
 
 4.10.10: 2019-04-11
 	* New types: __ufw and __ufw_rule (Mark Polyakov)