summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--common.mk2
-rw-r--r--debian/control2
-rwxr-xr-xinstall-webserver.sh22
-rwxr-xr-xremote-install.sh24
-rw-r--r--tests/Makefile4
6 files changed, 32 insertions, 30 deletions
diff --git a/Makefile b/Makefile
index c9b0d66..862fa51 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ VERSION=$(shell dpkg-parsechangelog --show-field Version)
DISTROS=base debian11 ubuntu2204 ubuntu2210
PROJECTNAME=webserver
-TGZNAME=$(shell ls -t ../webserver-*.tar.xz | head -n1 | sed -e 's,^../,,')
+TGZNAME=$(shell ls -t ../$(PROJECTNAME)-*.tar.xz | head -n1 | sed -e 's,^../,,')
PLUGINS= \
cgi \
fcgi \
@@ -106,9 +106,9 @@ debs: $(DISTROS)
upload:
scp ../$(TGZNAME) antcom.de:/var/www/reichwein.it-download/
scp -r result antcom.de:
- scp -r install-webserver.sh antcom.de:
- ssh antcom.de ./install-webserver.sh $(VERSION)
- ssh antcom.de rm -rf install-webserver.sh result
+ scp -r remote-install.sh antcom.de:
+ ssh antcom.de ./remote-install.sh $(PROJECTNAME) $(VERSION)
+ ssh antcom.de rm -rf remote-install.sh result
clean:
-rm -f $(PROJECTNAME)
diff --git a/common.mk b/common.mk
index 74bfb03..5770d7d 100644
--- a/common.mk
+++ b/common.mk
@@ -97,8 +97,6 @@ LIBS+= \
CXXTYPE=g++
endif
-CXXFLAGS+=$(shell pkg-config --cflags fmt)
-
SRC_ROOT=$(shell echo $(MAKEFILE_LIST) | tr " " "\n" | grep common.mk | sed -e 's/\([^ ]*\)common.mk/\1/g')
VERSION=$(shell dpkg-parsechangelog --show-field Version --file $(SRC_ROOT)/debian/changelog)
CXXFLAGS+=-DVERSION=\"$(VERSION)\"
diff --git a/debian/control b/debian/control
index 92d025c..2ffe331 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: webserver
Section: httpd
Priority: optional
Maintainer: Roland Reichwein <mail@reichwein.it>
-Build-Depends: debhelper (>= 12), libssl-dev, libboost-all-dev | libboost1.71-all-dev, clang | g++, llvm | g++, lld | g++, libc++-dev | g++, libc++abi-dev | g++, uglifyjs, python3-pkg-resources, htmlmin, cleancss, libreichwein-dev, gcovr, libfmt-dev
+Build-Depends: debhelper (>= 12), libssl-dev, libboost-all-dev | libboost1.71-all-dev, clang | g++, llvm | g++, lld | g++, libc++-dev | g++, libc++abi-dev | g++, uglifyjs, python3-pkg-resources, htmlmin, cleancss, libreichwein-dev, gcovr, libfmt-dev, pkg-config
Standards-Version: 4.5.0
Homepage: http://www.reichwein.it/webserver/
diff --git a/install-webserver.sh b/install-webserver.sh
deleted file mode 100755
index 7a3d54e..0000000
--- a/install-webserver.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# Script to be run on webserver to install *.deb and *.tgz
-#
-
-set -e
-
-if [ "$#" != "1" ] ; then
- echo "Usage: install-webserver.sh <Version>"
-fi
-
-VERSION=$1
-DISTROS="debian11 ubuntu2204 ubuntu2210"
-
-cd /var/www/reichwein.it-debian
-
-for i in $DISTROS; do
- echo "Installing webserver for $i ..."
- reprepro -C $i --ignore=wrongdistribution include stable /home/rr/result/$i/webserver_${VERSION}_amd64.changes
- echo "Copying webserver for $i to direct download location ..."
- cp /home/rr/result/$i/webserver_${VERSION}_*.deb /var/www/reichwein.it-download/$i/
-done
diff --git a/remote-install.sh b/remote-install.sh
new file mode 100755
index 0000000..69d24e4
--- /dev/null
+++ b/remote-install.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# Script to be run on target server to install *.deb and *.tgz
+#
+
+set -e
+
+if [ "$#" != "2" ] ; then
+ echo "Usage: remote-install.sh <ProjectName> <Version>"
+ exit 0
+fi
+
+PROJECTNAME=$1
+VERSION=$2
+DISTROS="debian11 ubuntu2204 ubuntu2210"
+
+cd /var/www/reichwein.it-debian
+
+for i in $DISTROS; do
+ echo "Installing ${PROJECTNAME} for $i ..."
+ reprepro -C $i --ignore=wrongdistribution include stable /home/rr/result/$i/${PROJECTNAME}_${VERSION}_amd64.changes
+ echo "Copying ${PROJECTNAME} for $i to direct download location ..."
+ #cp /home/rr/result/$i/${PROJECTNAME}_${VERSION}_*.deb /var/www/reichwein.it-download/$i/
+done
diff --git a/tests/Makefile b/tests/Makefile
index 9ce3dad..5f162de 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -17,7 +17,9 @@ CXXFLAGS+= -I. -I.. -fPIE
CXXTESTFLAGS=
-LIBS=\
+CXXFLAGS+=$(shell pkg-config --cflags fmt)
+
+LIBS+=\
-lreichwein \
-lboost_context \
-lboost_filesystem \