From a996c5545e06e5e886c8a51f9dd56e8a8b2358b0 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 16 Jul 2017 16:59:00 +0200 Subject: [PATCH] Created better structure of files --- .gitignore | 2 ++ Makefile | 28 +++++++++++++++++++--------- releases/.gitignore | 1 + scripts/create-release.sh | 19 +++++++++++++++++++ scripts/create-update-xml.sh | 0 serial/major | 1 + serial/minor | 1 + serial/release | 1 + 8 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 .gitignore create mode 100644 releases/.gitignore create mode 100755 scripts/create-release.sh create mode 100755 scripts/create-update-xml.sh create mode 100644 serial/major create mode 100644 serial/minor create mode 100644 serial/release diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9545a98 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/slt.tar.gz +*~ diff --git a/Makefile b/Makefile index de1c0b9..bd5e7ea 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,25 @@ -UPDATE_PATH=/srv/slt-update -PACKAGES = slt1.tar.gz +# UPDATE_PATH=/srv/slt-update +PACKAGES = slt.tar.gz -all: package update +all: package package: $(PACKAGES) -.PHONY: slt1.tar.gz -slt1.tar.gz: - cd slt1 ; tar czf ../$@ * +.PHONY: slt.tar.gz +slt.tar.gz: + cd slt ; tar czf ../$@ * -.PHONY: update -update: $(PACKAGES) - cp slt.xml slt1.tar.gz $(UPDATE_PATH) +.PHONY: release +release: + ./scripts/create-release.sh + +.PHONY: upload +upload: + ./scripts/create-update-xml.sh +# rsync -a releases/ $UPDATE_PATH/rel + +# +# .PHONY: update +# update: $(PACKAGES) +# cp slt.xml slt1.tar.gz $(UPDATE_PATH) diff --git a/releases/.gitignore b/releases/.gitignore new file mode 100644 index 0000000..335ec95 --- /dev/null +++ b/releases/.gitignore @@ -0,0 +1 @@ +*.tar.gz diff --git a/scripts/create-release.sh b/scripts/create-release.sh new file mode 100755 index 0000000..bd14db9 --- /dev/null +++ b/scripts/create-release.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +MAJOR=`cat serial/major` +MINOR=`cat serial/minor` +RELEASE=`cat serial/release` +TOTRELEASE="$MAJOR.$MINOR.$RELEASE" + +outname="releases/slt-$TOTRELEASE.tar.gz" + +mkdir -p releases + +# First check if the named release exists already +if [ -f "$outname" ]; then + echo "The file $outname existes already. Either remove the release from the folder manually or increase the release version." + echo "Aborting." + exit 1 +fi + +cp slt.tar.gz "$outname" diff --git a/scripts/create-update-xml.sh b/scripts/create-update-xml.sh new file mode 100755 index 0000000..e69de29 diff --git a/serial/major b/serial/major new file mode 100644 index 0000000..573541a --- /dev/null +++ b/serial/major @@ -0,0 +1 @@ +0 diff --git a/serial/minor b/serial/minor new file mode 100644 index 0000000..573541a --- /dev/null +++ b/serial/minor @@ -0,0 +1 @@ +0 diff --git a/serial/release b/serial/release new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/serial/release @@ -0,0 +1 @@ +1