aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2020-04-17 14:19:52 +0000
committers-ol <s-ol@users.noreply.github.com>2020-04-17 14:19:52 +0000
commit67a124f6a9b34cda21058ced323144c4f04921cb (patch)
tree626f339349b86dce772acc188ac31fc9ab488fa5
parentmove extra/ to docs/gen/ and split up (diff)
downloadalive-67a124f6a9b34cda21058ced323144c4f04921cb.tar.gz
alive-67a124f6a9b34cda21058ced323144c4f04921cb.zip
mvoe rockspecs to dist/
-rw-r--r--Makefile4
-rwxr-xr-xdist/release (renamed from rockspecs/gen-rockspec.sh)24
-rw-r--r--dist/rockspecs/alive-scm-1.rockspec (renamed from rockspecs/alive-scm-1.rockspec)0
-rwxr-xr-xdocs/gen/git-version25
4 files changed, 23 insertions, 30 deletions
diff --git a/Makefile b/Makefile
index b6ac592..72d2cb1 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,6 @@ docs: docs/index.html docs/guide.html reference internals
test:
busted
-release:
- rm -f alv/version.moon
- docs/gen/git-version >alv/version.moon
-
# docs parts
reference: $(MODREFS) docs/reference/index.html
internals: docs/internals/index.html
diff --git a/rockspecs/gen-rockspec.sh b/dist/release
index d832bb1..e7b6923 100755
--- a/rockspecs/gen-rockspec.sh
+++ b/dist/release
@@ -5,6 +5,28 @@ REVISION="${2:-1}"
if [ "$VERSION" = scm ]; then
WHERE=
else
+ git tag "$VERSION"
+
+ cat <<EOF >"alv/version.moon"
+----
+-- \`alive\` source code version information.
+--
+-- @module version
+
+--- exports
+-- @table exports
+-- @tfield string tag the last versions git tag
+-- @tfield string web the repo web URL
+-- @tfield string repo the git repo URL
+-- @tfield string release the web URL of this release
+{
+ tag: "${VERSION}"
+ web: "https://github.com/s-ol/alivecoding"
+ repo: "https://github.com/s-ol/alivecoding.git"
+ release: "https://github.com/s-ol/alivecoding/releases/tag/${VERSION}"
+}
+EOF
+
WHERE="
tag = \"$VERSION\","
VERSION="${VERSION#v}"
@@ -18,7 +40,7 @@ list_modules() {
' sh {} \;
}
-cat <<STOP > "rockspecs/alive-$VERSION-$REVISION.rockspec"
+cat <<STOP >"dist/rockspecs/alive-$VERSION-$REVISION.rockspec"
package = "alive"
version = "$VERSION-$REVISION"
diff --git a/rockspecs/alive-scm-1.rockspec b/dist/rockspecs/alive-scm-1.rockspec
index a416842..a416842 100644
--- a/rockspecs/alive-scm-1.rockspec
+++ b/dist/rockspecs/alive-scm-1.rockspec
diff --git a/docs/gen/git-version b/docs/gen/git-version
deleted file mode 100755
index 495b679..0000000
--- a/docs/gen/git-version
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-TAG=$(git describe --abbrev=0 HEAD)
-# REV_SHORT=$(git rev-parse --short HEAD)
-# REV_LONG=$(git rev-parse HEAD)
-
-cat <<EOF
-----
--- \`alive\` source code version information.
---
--- @module version
-
---- exports
--- @table exports
--- @tfield string tag the last versions git tag
--- @tfield string web the repo web URL
--- @tfield string repo the git repo URL
--- @tfield string release the web URL of this release
-{
- tag: "${TAG}"
- web: "https://github.com/s-ol/alivecoding"
- repo: "https://github.com/s-ol/alivecoding.git"
- release: "https://github.com/s-ol/alivecoding/releases/tag/${TAG}"
-}
-EOF