Merge branch 'master' of http://wagnertech.de/git/projects

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..4034bfd
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,14 @@
+Source: projects
+Section: main
+Priority: optional
+Maintainer: Michael Wagner <michael@wagnertech.de>
+Build-Depends: git
+ 
+Package: mbuild
+Architecture: all
+Depends: dpkg-dev
+Description: WagnerTech build environment
+ Simple build environment for Debian packages
+ .
+ This package contains scripts and makefiles for
+ script and C/C++ packages.

diff --git a/debian/mbuild.changelog b/debian/mbuild.changelog
new file mode 100644 (file)
index 0000000..5346c34
--- /dev/null
+++ b/debian/mbuild.changelog
@@ -0,0 +1,12 @@
+projects (0.2-%BUILD%) unstable; urgency=medium
+
+  * Build in svn-Umgebung
+
+ -- Michael Wagner <michael@wagnertech.de>  Mon, 18 Apr 2018 09:45:25 +0100
+
+projects (0.1-%BUILD%) unstable; urgency=medium
+
+  * Build in neuer git-Umgebung
+
+ -- Michael Wagner <michael@wagnertech.de>  Mon, 12 Feb 2018 09:45:25 +0100
+

diff --git a/debian/mbuild.cp b/debian/mbuild.cp
new file mode 100755 (executable)
index 0000000..0a78def
--- /dev/null
+++ b/debian/mbuild.cp
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+base=$1
+
+mkdir -p $base/usr/bin/
+cp tools/make/mconfigure $base/usr/bin/
+cp tools/make/treecopy $base/usr/bin/
+
+mkdir -p $base/usr/share/mbuild/
+cp tools/make/rules $base/usr/share/mbuild/
+

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index a5e92977f50ec0aa7de0016eb7e05accfef587ed..8ce366eca347332396bd07fab8ab2e269ef37173 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,23 +2,49 @@
 set -e
 
 function echo_usage {
-       echo "usage: configure <package> [options]"
+       echo "usage: mconfigure <package> [options]"
        echo "  -a <arch>"
+       echo "  -p : prepare build, but not do it"
 }
 
 function set_build {
        if [ -e .svn ]
        then
+               version="0.0"
                build=$(svnversion)
+               build=${build/:/-}
        elif [ -e .git ]
        then
-               build=$(git describe --tags 2>/dev/null)
-               test -n "$build" || build="TOP"
+               tag=$(git describe --tags 2>/dev/null) || true
+               if test -z "$tag"
+               then
+                       tag="0.0-TOP"
+               fi
                changes=$(git status -s |grep "^ *M") || true
-               test -z "$changes" || build="${build}M"
+               if test -n "$changes"
+               then
+                       tag="${tag}M"
+               fi
+               version=${tag%%-*}
+               build=${tag#*-}
        fi
 }
 
+function check_version {
+       vline=$(head -1 debian/$paket.changelog)
+       vline=${vline%-*}
+       clversion=${vline#*(}
+       if [ $version = "0.0" ]
+       then
+               version=$clversion
+               return
+       fi
+       if [ "$clversion" != $version ]
+       then
+               echo "version mismatch: git: $version, changelog: $clversion"
+               exit 1
+       fi
+}
 # to build a package you need ...
 # <package>.cp (optional): copy step for package production
 # <package>.cpp.sh (optional): commands to setup the C++ compile environment
@@ -29,19 +55,38 @@ then
        exit 1
 fi
 
+if [ ! -d debian ]
+then
+       echo "run mconfigure in the project base directory!"
+       exit 2
+fi
+
 paket=$1
+echo "export paket=$1" > debian/setenv.sh
 shift
 ARCH=""
 cpp_build=0
-delete_src=1
 
 set_build
-echo "building $paket with build $build"
+check_version
+echo "export version=$version" >> debian/setenv.sh
+echo "export build=$build" >> debian/setenv.sh
+
+# get repository name
+tmp=$(pwd)
+pwd=${tmp##*/}
+pwd=${pwd,,*}
+echo "export pwd=$pwd" >> debian/setenv.sh
+
+echo "building $paket with build $version-$build"
 
-while getopts ":a" opt; do
+prepare=0
+while getopts ":ap" opt; do
        case $opt in
                a) ARCH=$OPTARG
                        ;;
+               p) prepare=1
+                       ;;
                \?) echo "Invalid option: -$OPTARG"
                        echo_usage
                        exit 1
@@ -52,24 +97,26 @@ while getopts ":a" opt; do
                        ;;
        esac
 done
+#
+## clean dirs and check out
+#if [ -d build -a $delete_src -eq 1 ]
+#then
+#      rm -rf build
+#fi
+#
 
-# clean dirs and check out
-if [ -d build -a $delete_src -eq 1 ]
-then
-       rm -rf build
-fi
+pushd debian >/dev/null
 
-mkdir -p build
-pushd build >/dev/null
+ln -sf /usr/share/mbuild/rules .
 
-ln -sf /usr/share/mbuild/makefile .
+#if [ -e tmp ]
+#then
+#      rm -rf tmp
+#fi
+#rm *.stamp 2>/dev/null || true
+#rm make.pre 2>/dev/null || true
 
-if [ -e $paket ]
-then
-       rm -rf $paket
-fi
-rm *.stamp || true
-rm make.pre || true
+mkdir -p tmp/DEBIAN
 
 # load util functions for C/C++ - build
 if [ -f $paket.cpp.sh ]
@@ -79,58 +126,78 @@ then
        . $paket.cpp.sh
 fi
 
+popd >/dev/null
+
 # copy package control
-control=$(find -L src -name $paket.control)
-build_number=${build#*_}
-if [ -z "$control" ]
+if [ ! -f debian/control ]
 then
-       echo "warning: control file not found"
-       echo "  this file is necessary for any package production."
-else   
-       sed "s/%BUILD%/$build_number/" $control |sed "s/%ARCH%/$ARCH/" >$paket.control
-       echo "$paket.control written."
-
-       # extract version
-       version=$(grep Version $paket.control |sed "s/Version: //")
+       control=$(find etc -name $paket.control)
+       if [ -z "$control" ]
+       then
+               echo "warning: control file not found"
+               echo "  this file is necessary for any package production."
+       else    
+               echo "Source: $pwd
+Section: main
+Priority: optional
+Maintainer: WagnerTech UG <mail@wagnertech.de>
+" > debian/control
+               grep -v "Version:" $control |grep -v "Maintainer:" >> debian/control 
+       fi
 fi
 
-# check for copy file
-copy=$(find -L src -name $paket.cp)
-if [ -n "$copy" ]
+if [ $prepare = 1 ]
 then
-       ln -sf $copy .
-else
-       echo "warning: file $paket.cp missing or not executable:"
-       echo "  this file is necessary for any package production."
+       exit 0
 fi
 
-# check for installation scripts
-files=$(find src -name $paket.preinst)
-files="$files $(find -L src -name $paket.postinst)"
-files="$files $(find -L src -name $paket.prerm)"
-files="$files $(find -L src -name $paket.postrm)"
-for file in $files
-do
-       ln -sf $file .
-done
+# check for copy file
+#if [ ! -f debian/$paket.cp ]
+#then
+#      # search for copy file
+#      copy=$(find . -name $paket.cp)
+#      if [ -n "$copy" ]
+#      then
+#              echo "ln -sf ../$copy debian/"
+#              ln -sf ../$copy debian/
+#      else
+#              echo "warning: file $paket.cp missing or not executable:"
+#              echo "  this file is necessary for any package production."
+#      fi
+#fi
+
+# build package
+. debian/setenv.sh
+debian/rules binary
+
+#
+## check for installation scripts
+#files=$(find .. -name $paket.preinst)
+#files="$files $(find .. -name $paket.postinst)"
+#files="$files $(find .. -name $paket.prerm)"
+#files="$files $(find .. -name $paket.postrm)"
+#for file in $files
+#do
+#      ln -sf $file .
+#done
 
 # create generic make.pre, if not existing
-if [ ! -f make.pre ]
-then
-       cat  >>make.pre <<MAKE_PRE
-# mBuild make.pre script (auto generated)
-project = $paket
-COPY = ./$paket.cp
-MAKE_PRE
-       if [ -n "$ARCH" ]
-       then
-               echo "arch = $ARCH" >>make.pre
-               echo "_arch = _${ARCH}" >>make.pre
-       fi
-       echo "make.pre written."
-fi
-
-# append version to make.pre
-echo "version = $version" >> make.pre
-echo "build = $build" >> make.pre
+#if [ ! -f make.pre ]
+#then
+#      cat  >>make.pre <<MAKE_PRE
+## mBuild make.pre script (auto generated)
+#project = $paket
+#COPY = ./$paket.cp
+#MAKE_PRE
+#      if [ -n "$ARCH" ]
+#      then
+#              echo "arch = $ARCH" >>make.pre
+#              echo "_arch = _${ARCH}" >>make.pre
+#      fi
+#      echo "make.pre written."
+#fi
+#
+## append version to make.pre
+#echo "version = $version" >> make.pre
+#echo "build = $build" >> make.pre
 

diff --git a/tools/make/rules b/tools/make/rules
new file mode 100755 (executable)
index 0000000..da98ee5
--- /dev/null
+++ b/tools/make/rules
@@ -0,0 +1,60 @@
+#!/usr/bin/make -f
+
+# Generic rules for mBuild build process
+
+# defile default operations
+NOP = @echo "No operation for target $@"
+DEB = fakeroot dpkg-deb --build debian/tmp
+
+default:
+       echo "no default rule available"
+
+# Löschen aller kompilierten, erzeugten und nicht benötigten Dateien im Bauverzeichnis
+clean:
+       -rm -rf debian/tmp
+
+# Bauen der kompilierten Programme und formatierten Dokumente aus den Quellen im Bauverzeichnis
+build:
+
+# Bauen der kompilierten architekturabhängigen Programme aus den Quellen im Bauverzeichnis
+build-arch:
+
+# Bauen der architekturunabhängigen formatierten Dokumente aus den Quellen im Bauverzeichnis
+build-indep:
+
+# Installieren der Dateien in einen Verzeichnisbaum unterhalb des Verzeichnisses debian für jedes Binärpaket. Falls sie festgelegt wurden, hängen binary*-Ziele effektiv von diesem Ziel ab (optional)
+install: 
+
+# Erstellen aller Binärpakete (effektiv ist dies die Kombination der binary-arch- und binary-indep-Ziele)
+binary: binary-arch binary-indep 
+
+# Erstellen Architektur-abhängiger (Architecture: any) Binärpakete im übergeordneten Verzeichnis
+binary-arch:
+
+# Erstellen Architektur-unabhängiger (Architecture: all) Binärpakete im übergeordneten Verzeichnis
+binary-indep: copy ../$(paket)_$(version)-$(build)$(_arch).deb
+
+copy: debian/$(paket).cp
+       debian/$(paket).cp debian/tmp
+
+../$(paket)_$(version)-$(build)$(_arch).deb:debian/tmp/DEBIAN/control
+       $(DEB)
+       mv debian/tmp.deb ../$(paket)_$(version)-$(build)$(_arch).deb
+
+debian/tmp/DEBIAN/control: debian/control debian/changelog
+       dpkg-gencontrol
+
+debian/changelog: debian/$(paket).changelog debian/setenv.sh
+       sed "s/%BUILD%/$(build)/" debian/$(paket).changelog > debian/changelog
+#      echo "${pwd} (${build}) unstable; urgency=medium" > debian/changelog
+#      echo "  * generated by mbuild" >> debian/changelog
+#      echo " -- Michael Wagner <info@wagnertech.de>  Sun, 11 Feb 2018 20:03:04 +0100" >> debian/changelog
+#      mb_create_changelog
+
+# Load project specification
+-include rules.post
+
+# if debian/control is missing, try old mbuild way
+#debian/control:
+#      if [ -e  debian/$(paket).control ]; then echo "trallala"; fi
+