wip

Makefile

@@ -4,10 +4,10 @@ DEP := \
 	config/headfoot.tex	\
 	config/sourcelst.tex	\
 	config/titlepage.tex	\
-	content.tex		\
-	title.tex		\
 	Makefile
 
+DEP += $(wildcard ./*.tex)
+
 all: $(MAIN)
 
 clean:

config/framework.tex

@@ -20,8 +20,11 @@ citecolor = black]{hyperref}%
 \usepackage{amsfonts}%
 \usepackage{mathrsfs}%
 \usepackage{hyperref}%
-\usepackage{xcolor}%
+\usepackage[dvipsnames]{xcolor}%
 \usepackage{scrpage2}%
+\usepackage{multido}
+\usepackage{pstricks}
+\usepackage{colortbl}
 
 \newcommand*\euler{\mathrm{e}}
 \input{title.tex}
@@ -37,6 +40,9 @@ citecolor = black]{hyperref}%
 \pagestyle{scrheadings}		% switch on head and foot line
 \newpage
 \tableofcontents
+\listoffigures
+\listoftables
+\lstlistoflistings
 \input{config/headfoot.tex}
 \newpage
 \input{content.tex}

content.tex

@@ -1,241 +1,195 @@
-\section{Installation}
+\section{Gitlab workflow} \label{sec:glw}
-\subsection{SD card preparation}
+
-\subsubsection{Partitions}
+\begin{figure}
-Format the SD card with two new partitions:
+	\begin{center}
-\lstsetbash
+		\input{img_gitlab.tex}
-\begin{lstlisting}
+		\caption{Gitlab workflow}
-fdisk /dev/mmcblk0
+		\label{fig:gitlab_workflow}
-\end{lstlisting}
+	\end{center}
+\end{figure}
+
+Figure \ref{fig:gitlab_workflow} gives an overview of the gitlab workflow.
+The workflow is splitted in different phases:\\
+
+\begin{itemize}
+	\item Implementation phase
+	\item Code freeze
+	\item Release phase
+\end{itemize}
+
+For these different phases The continuous integration/delivery system
+triggers different build stages. For further details please refer to
+section \ref{sec:ci}.
+
+\subsection{Implementation phase}
+
+While in implementation phase every implementation for the next release is
+done. Every implementation has to be done on a seperate branch. After
+finishing an implementation the branch it was made on has to be merged back
+to the master branch. As defined an implementation could be one of:\\
+
+\begin{itemize}
+	\item Feature
+	\item Fix
+\end{itemize}
+
+\subsubsection{Feature implementation}
+
+A feature is a a new piece of code that implements new functionality into
+the system.
+
+\subsubsection{Fix implementation}
+
+If in any testing phase an issue is detected these issue can be fixed with
+a fix implementation.
+
+\subsubsection{Further kinds of implementation}
+
+Beside these defined implementations any other kind of implementation is
+possible but has to be made also on a seperate branch.
+
+\subsection{Code freeze}
+
+The transition between implementation phase and release phase is called
+code freeze. Code freeze means each for the upcoming release planned
+feature is implemented and merged to the main branch (normally master) of
+the project's git repository (see figure \ref{fig:gitlab_workflow}). For
+the upcoming release a "\texttt{release/...}" named branch is created.
+For a proper release configuration it is necessary to configure the ci
+build job before creating the release branch (see section \ref{sec:ci_conf})
+.
+
+\subsection{Release phase}
+
+Any release relevant issue that is detected while release phase has to be
+fixed at the release branch. The release phase is splitted into different
+stages:
+
+\begin{itemize}
+	\item Internal release(s)
+	\item External release
+\end{itemize}
+
+\subsubsection{Internal release(s)}
+
+Each push to a release branch triggers the creation of an internal release.
+Only internal releases must be used to system test the release branch. For
+details please refer to section \ref{sec:ci_int}.
+
+\subsubsection{External release}
+
+If no further release relevant issues could be found (or are accepted as
+known issues) an external release is created by tagging the commit which
+should be delivered to the customer. For details please refer to section
+\ref{sec:ci_ext}.
+
+\section{Continuous integration/delivery} \label{sec:ci}
+
+As continuous integration system the gitlab built in ci-system
+\textit{gitlab-ci} is used. Beside the most important task of ci, ensure
+constant high code quality, the ci system is used for various tasks:
+
+\FloatBarrier
+\begin{itemize}
+	\item Automated static code analysis
+	\item Automated build
+	\item Automated test (not implemented yet)
+	\item Internal release deployment
+	\item External release deployment
+	\item Automated release note generation (not implemented yet)
+\end{itemize}
+\FloatBarrier
+
+\subsection{Internal release deployment} \label{sec:ci_int}
+
+\begin{figure}
+	\begin{center}
+		\input{img_deploy.tex}
+		\caption{Deployment of release candidats and releases}
+		\label{fig:deployment}
+	\end{center}
+\end{figure}
+
+For a branch named \texttt{release/...} the creation of a release candidate
+is triggered automatically. Figure \ref{fig:deployment} illustrates the
+deployment process. The internal release is processing the following steps:
+\\
+
 \begin{enumerate}
-\item Type \textbf{o} to erase all former partitions
+	\item Build project variant specific configuration
-\item Type \textbf{p} to list all existing partitions
+	\item Static code analysis of project variant specific configuration
-\item Type \textbf{n}, then \textbf{p} to create the boot partition. Press
+	\item Name the release depending on the release naming convention
-\textbf{RETURN} to accept the first sector, then \textbf{+100M} for the
+	\item Build release notes for the release candidate
-last sector
+	\item Deploy the release to the project's release candidate deploy
-\item Type \textbf{t}, then \textbf{c} to set the partition type to FAT32
+location
-\item Type \textbf{n}, then \textbf{p} to create the root partition. Press
-\textbf{RETURN} to accept the first sector, then \textbf{RETURN} for the
-last sector
-\item Type \textbf{w} to write the new partition table
 \end{enumerate}
 
-\subsubsection{File systems}
+\subsection{External release deployment} \label{sec:ci_ext}
-Create the file systems for the new partitions:
+
-\begin{lstlisting}
+To create an external release the commit to be released must be tagged
-mkfs.vfat /dev/mmcblk0p1
+using the following naming convention:\\
-mkfs.ext4 /dev/mmcblk0p2
+\texttt{release/<project\_specific\_name>}.\\
-\end{lstlisting}
+The project specific naming convention for Agricola ruby is:\\
-Create mount points and mount the new partitions:
+\texttt{release/174\_AG*}.\\
-\begin{lstlisting}
+
-mkdir boot
+\begin{enumerate}
-mkdir root
+	\item Build project variant specific configuration
-mount /dev/mmcblk0p1 boot
+	\item Static code analysis of project variant specific configuration
-mount /dev/mmcblk0p2 root
+	\item Name the release depending on the release naming convention
+	\item Build release notes for the release
+	\item Deploy the release to the project's release deploy location
+\end{enumerate}
+
+\subsection{Release note generation} \label{sec:rel_note}
+
+\begin{figure}
+	\begin{center}
+		\input{img_history.tex}
+		\caption{Git commit history}
+		\label{fig:git_commit_history}
+	\end{center}
+\end{figure}
+
+To generate release notes by commit messages special tagged commit messages
+are used. Release notes are generated for release candidats and releases.
+For release candidats (internal releases) more tags are analyzed. The
+definition of the commit tag rules are somewhere in the Polarion :) Because
+the release notes content is taken from the log history of a release branch
+each commit in it's history has to use tagged commits. To show logs only of
+direct parents (commits on the current release branch and commits on the
+master) the log command\\
+\texttt{git log <first\_commit>..HEAD --first parent master}\\
+can be used. Figure \ref{fig:git_commit_history} illustrates the flow of the
+log history of the release branch shown in figure \ref{fig:gitlab_workflow}.
+
+\subsection{Configuring the build jobs} \label{sec:ci_conf}
+
+The configuration of gitlab-ci is made in the \texttt{.gitlab-ci.yml} file
+in the root directory of the project's repository. The certain build stages
+are using variables to customize the build. These variables are defined in
+the \texttt{variables} section of the config file. Table \ref{tab:conf_var}
+and listing \ref{lst:ag_cfg} gives an overview about customizing a release
+phase.
+
+\captionof{table}{Variables to customize a release phase}
+\label{tab:conf_var}
+\begin{tabular}{l l l}
+	\cellcolor{black}\color{white}variable & \cellcolor{black}\color{white}meaning & \cellcolor{black}\color{white}example\\
+	PRODUCT\_NAME & Short of the product name & AG\\
+	PRODUCT\_VARIANT & Short of the product variant & NA\\
+	PROJECT\_VERSION & ?? & 10\\
+	SW\_MAJOR & Software major number & 1\\
+	SW\_MINOR & Software minor number & 2\\\\
+\end{tabular}
+\newline
+
+\lstsetbash
+\begin{lstlisting}[caption=variables configuration, label=lst:ag_cfg]
+variables:
+  PRODUCT_NAME: "AG"
+  PRODUCT_VARIANT: "NA"
+  PROJECT_VERSION: "10"
+  SW_MAJOR: "1"
+  SW_MINOR: "2"
 \end{lstlisting}
 
-\subsubsection{Download and extract root file system}
-\begin{lstlisting}
-wget http://archlinuxarm.org/os/\
-ArchLinuxARM-rpi-2-latest.tar.gz
-bsdtar -xpf ArchLinuxARM-rpi-2-latest.tar.gz -C root
-sync
-mv root/boot/* boot
-\end{lstlisting}
-Enable ssh root login:
-\begin{lstlisting}
-vim root/etc/ssh/sshd\_config
-\end{lstlisting}
-Find \texttt{\#PermitRootLogin yes} and uncommend it
-\begin{lstlisting}
-PermitRootLogin yes
-\end{lstlisting}
-Unmount both partitions
-\begin{lstlisting}
-umount boot root
-\end{lstlisting}
-
-\section{Configuration}
-\subsection{User management}
-\subsubsection{Create new user}
-\begin{lstlisting}
-useradd -m -g users -G wheel -s /bin/bash tkl
-\end{lstlisting}
-\begin{tabular}{ l l }
-\texttt{-m} & create user name home directory\\
-\texttt{-g} & initial login group\\
-\texttt{-G} & list of supplementary groups - comma separated\\
-\texttt{-s} & path and file name of default login shell\\
-\end{tabular}\\
-Set password for the new user:
-\begin{lstlisting}
-passwd tkl
-\end{lstlisting}
-Enable wheel group members as sudoers:
-\begin{lstlisting}
-EDITOR=vim visudo
-\end{lstlisting}
-Uncomment:
-\begin{lstlisting}
-%wheel		ALL=(ALL) ALL
-\end{lstlisting}
-
-\subsection{Aliasing}
-\begin{lstlisting}
-cd ~
-vi .bashrc
-\end{lstlisting}
-Add:\\
-\texttt{alias vi='vim'}
-
-\subsection{Customize vim}
-Edit \texttt{.vimrc}:
-\begin{lstlisting}
-syntax on	"Syntax highlightning
-set number	"Line numbering
-\end{lstlisting}
-
-\subsection{Wifi}
-Configure wifi network:
-\begin{lstlisting}
-wifi-menu
-\end{lstlisting}
-Enable wifi network permanent:
-\begin{lstlisting}
-netctl enable wlan0-<network_name>
-\end{lstlisting}
-\subsubsection{Deactivate wifi device sleep mode}
-\begin{lstlisting}
-pacman -S iw
-echo ACTION=="add", SUBSYSTEM=="net", KERNEL=="wlan*", \
-RUN+="/usr/bin/iw dev \%k set power\_save off\" \
-> etc/udev/rules.d/70-wifi-powersave.rules
-\end{lstlisting}
-
-\subsection{Ssh key login}
-\begin{itemize}
-\item Create \texttt{.ssh/} folder in users home directory
-\item Copy public key file (i.e. \texttt{id\_rsa.pub}) into \texttt{.ssh}
-folder
-\item Authorize public key:
-\begin{lstlisting}
-cat id_rsa.pub >> authorized_keys
-\end{lstlisting}
-\end{itemize}
-
-\subsection{Interfaces}
-\subsubsection{I2C}
-To enable i2c interface edit \texttt{/boot/config.txt}. \\
-Uncomment \texttt{\#device\_tree\_param=i2c\_arm=on}\\
-Load i2c modules while boot:
-\begin{lstlisting}
-/etc/modules-load.d/raspberry.conf
-
-i2c-dev
-i2c-bcm2708
-\end{lstlisting}
-Install package \texttt{i2c-tools}
-Test i2c bus after reboot:
-\begin{lstlisting}
-i2cdetect -y 1
-\end{lstlisting}
-Set permissions for i2c device access:
-\begin{lstlisting}
-/etc/udev/rules.d/99-i2c.rules
-
-KERNEL=="i2c-1", MODE="0777"
-\end{lstlisting}
-
-\subsubsection{SPI}
-To enable spi interface edit \texttt{/boot/config.txt}. \\
-Uncomment \texttt{\#device\_tree\_param=spi=on}
-
-\subsubsection{GPIO}
-Create an udev rule to enable others than root accessing the gpio files:
-\begin{lstlisting}
-/etc/udev/rules.d/98-gpio.rules
-
-SUBSYSTEM=="gpio*", PROGRAM="/bin/sh -c 'chown -R root:gpio\
-/sys/class/gpio; chmod -R 0777 /sys/class/gpio; chown -R \
-root:gpio /sys/devices/virtual/gpio; chmod -R 0777 \
-/sys/devices/virtual/gpio'"
-\end{lstlisting}
-
-\subsection{tools}
-\begin{itemize}
-\item \texttt{fakeroot}
-\item \texttt{gcc}
-\item \texttt{git}
-\item \texttt{make}
-\item \texttt{patch}
-\item \texttt{python2, python2-pip}
-\item \texttt{wget}
-\end{itemize}
-\subsection{Hostname}
-\begin{lstlisting}
-echo "hostname" > /etc/hostname
-\end{lstlisting}
-
-\section{Applications}
-\subsection{I2C-OLED}
-\subsubsection{Oled Test application}
-Clone test application:
-\begin{lstlisting}
-git clone git@dabgit01.internal.novero.com:raspberry/\
-oledpi.git
-\end{lstlisting}
-\subsubsection{Install driver}
-Clone oled driver:
-\begin{lstlisting}
-git clone https://github.com/rm-hull/ssd1306.git
-\end{lstlisting}
-Install it:
-\begin{lstlisting}
-python2 setup.py install
-\end{lstlisting}
-\subsubsection{Dependencies}
-\begin{itemize}
-\item \texttt{python-smbus/python2-smbus} (AUR)
-\item \texttt{i2c-tool-git} (AUR)
-\item \texttt{libjpeg-turbo}
-\item \texttt{pillow} install using pip \texttt{(pip/pip2 install pillow)}
-\end{itemize}
-
-\subsection{Weatherpi}
-\subsubsection{Usb weatherstation test application}
-Clone test application:
-\begin{lstlisting}
-git clone git@dabgit01.internal.novero.com:raspberry/\
-weatherpi.git
-\end{lstlisting}
-
-\subsubsection{Dependencies}
-\begin{itemize}
-\item \texttt{python2-pyusb} (AUR) (edit \texttt{PKGBUILD} and add
-\texttt{'armv7h'} to \texttt{arch})
-\item \texttt{libusb-compat}
-\end{itemize}
-
-\subsection{MQTT Broker}
-Install mosquitto (AUR)\\
-Install paho-mqtt client library:\\
-\begin{lstlisting}
-pip2 install paho-mqtt
-\end{lstlisting}
-Create config file:
-\begin{lstlisting}
-cp /etc/mosquitto.conf.example /etc/mosquitto.conf
-\end{lstlisting}
-Start mosquitto broker service:
-\begin{lstlisting}
-systemctl enable mosquitto.service
-systemctl start mosquitto.service
-\end{lstlisting}
-\subsubsection{Test}
-Subscribe to a topic:
-\begin{lstlisting}
-mosquitto_sub -t "topic/path"
-\end{lstlisting}
-Populate a message:
-\begin{lstlisting}
-mosquitto_pub -t "topic/path" -m "message payload"
-\end{lstlisting}

img_deploy.tex

@@ -0,0 +1,97 @@
+\psset{griddots=0,gridlabels=8pt,subgriddiv=5}
+\psset{xunit=10mm,yunit=10mm}
+\begin{pspicture}(12,10)
+%	\psgrid
+	\newcommand{\clr}{black}
+	% phases
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,2)(12,2)
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,8)(12,8)
+	\rput{0}(1.5,2){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{code freeze}}
+	}
+	\psline[linewidth=1pt,linecolor=\clr]{<->}(11.5,2)(11.5,8)
+	\rput{90}(11.5,5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{release phase}}
+	}
+
+
+	% master
+	\newcommand{\masterx}{10}
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,1)(\masterx,9)
+	\psset{fillcolor=\clr}
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,2)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,8)
+	\rput(\masterx,0.5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{master}}
+	}
+	% feature/anti_osc
+	\renewcommand{\clr}{RedOrange}
+	\newcommand{\featurex}{8}
+	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\featurex,3)
+	\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\featurex,7)
+	\psline[linewidth=2pt,linecolor=\clr,linestyle=dashed,arrowsize=15pt]{->}(\featurex,7)(\masterx,8)
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\featurex,2)(\featurex,8)
+	\multido{\nA=3+2}{3}{
+		\psset{fillcolor=\clr}
+		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,\nA)
+	}
+	\rput(\featurex,1.5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{release/NAR\_C0}}
+	}
+	\newcommand{\rccolor}{Blue}
+	\psset{fillcolor=\rccolor}
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\rccolor](\masterx,2)
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\rccolor](\featurex,3)
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\rccolor](\featurex,5)
+	\psline[linewidth=1pt,linecolor=\rccolor,arrowsize=10pt]{->}(\masterx,2)(5.7,2.8)
+	\psline[linewidth=1pt,linecolor=\rccolor,arrowsize=10pt]{->}(\featurex,3)(5.7,4.6)
+	\psline[linewidth=1pt,linecolor=\rccolor,arrowsize=10pt]{->}(\featurex,5)(5.7,6.6)
+	\rput(3,3){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\rccolor}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\rccolor}{deploy: release candidate 1}}
+	}
+	\rput(3,5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\rccolor}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\rccolor}{deploy: release candidate 2}}
+	}
+	\rput(3,7){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\rccolor}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\rccolor}{deploy: release candidate 3}}
+	}
+	\newcommand{\rcolor}{ForestGreen}
+	\psset{fillcolor=\rcolor}
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\rcolor](\featurex,7)
+	\psline[linewidth=1pt,linecolor=\rcolor,arrowsize=10pt]{->}(\featurex,7)(4.6,8.6)
+	\rput(3,9){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\rcolor}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\rcolor}{deploy: release}}
+	}
+\end{pspicture}

img_gitlab.tex

@@ -0,0 +1,136 @@
+\psset{griddots=0,gridlabels=8pt,subgriddiv=5}
+\psset{xunit=10mm,yunit=10mm}
+\begin{pspicture}(14,16)
+%	\psgrid
+	\newcommand{\clr}{black}
+	% phases
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,2)(14,2)
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,8)(14,8)
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,14)(14,14)
+	\rput{0}(1.5,8){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{code freeze}}
+	}
+	\psline[linewidth=1pt,linecolor=\clr]{<->}(13.5,2)(13.5,8)
+	\rput{90}(13.5,5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{implementation phase}}
+	}
+	\psline[linewidth=1pt,linecolor=\clr]{<->}(13.5,8)(13.5,14)
+	\rput{90}(13.5,11){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{release phase}}
+	}
+
+
+	% master
+	\newcommand{\masterx}{7}
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,1)(\masterx,15)
+	\psset{fillcolor=\clr}
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,2)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,3)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,7)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,8)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,14)
+	\rput(\masterx,0.5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{master}}
+	}
+	% feature/anti_osc
+	\renewcommand{\clr}{ForestGreen}
+	\newcommand{\featurex}{5}
+	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\featurex,3)
+	\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\featurex,7)
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\featurex,7)(\masterx,8)
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\featurex,2)(\featurex,8)
+	\multido{\nA=3+2}{3}{
+		\psset{fillcolor=\clr}
+		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,\nA)
+	}
+	\rput(\featurex,1.5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{feature/anti\_osc}}
+	}
+	% old_branch
+	\renewcommand{\clr}{Gray}
+	\newcommand{\xpos}{9}
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\xpos,2)(\masterx,3)
+	\psline[linewidth=2pt,linecolor=\clr](\xpos,1)(\xpos,2)
+	
+	% fix/calibration_crc
+	\renewcommand{\clr}{Maroon}
+	\newcommand{\fixx}{9}
+	\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
+	\psline[linewidth=2pt,linecolor=\clr](\fixx,4)(\fixx,6)
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,6)(\masterx,7)
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,3)(\fixx,7)
+	\multido{\nA=4+2}{2}{
+		\psset{fillcolor=\clr}
+		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,\nA)
+	}
+	\rput(\fixx,2.5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{fix/calibration\_crc}}
+	}
+	% feature/dynamic_monitoring
+	\renewcommand{\clr}{RoyalBlue}
+	\renewcommand{\fixx}{11}
+	\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,4)(\fixx,12)
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,3)(\fixx,4)
+	\rput(\fixx,12.5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{feature/dyn\_mon}}
+	}
+	\psset{fillcolor=\clr}
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,4)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,6)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,8)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,10)
+	% release/NAR_C0
+	\renewcommand{\clr}{RedOrange}
+	\renewcommand{\fixx}{5}
+	\psline[linewidth=2pt,linecolor=\clr](\masterx,8)(\fixx,9)
+	\psline[linewidth=2pt,linecolor=\clr](\fixx,9)(\fixx,13)
+	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,8)(\fixx,14)
+	\psline[linewidth=2pt,linecolor=\clr,linestyle=dashed,arrowsize=15pt]{->}(\fixx,13)(\masterx,14)
+	\rput(\fixx,14.5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{release/NAR\_C0}}
+	}
+	\rput(2.5,13){
+		\psset{fillcolor=\clr}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{white}{\shortstack{tags/release/\\174\_AG\_NA\_10-01.02}}}
+	}
+	\psset{fillcolor=\clr}
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,9)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,11)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,13)
+\end{pspicture}

img_history.tex

@@ -0,0 +1,74 @@
+\psset{griddots=0,gridlabels=8pt,subgriddiv=5}
+\psset{xunit=10mm,yunit=10mm}
+\begin{pspicture}(14,16)
+%	\psgrid
+	\newcommand{\clr}{Gray}
+	\newcommand{\bclr}{RedOrange}
+	\newcommand{\hclr}{Blue}
+	\newcommand{\mclr}{black}
+
+	% master
+	\newcommand{\masterx}{7}
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,8)(\masterx,15)
+	\psline[linewidth=2pt,linecolor=\hclr](\masterx,1)(\masterx,8)
+	\psset{fillcolor=\hclr}
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,2)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,3)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,7)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,8)
+	\rput(\masterx,0.5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\mclr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\mclr}{master}}
+	}
+	% feature/anti_osc
+	\newcommand{\featurex}{5}
+	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\featurex,3)
+	\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\featurex,7)
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\featurex,7)(\masterx,8)
+	\multido{\nA=3+2}{3}{
+		\psset{fillcolor=\clr}
+		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,\nA)
+	}
+	% old_branch
+	\newcommand{\xpos}{9}
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\xpos,2)(\masterx,3)
+	\psline[linewidth=2pt,linecolor=\clr](\xpos,1)(\xpos,2)
+	
+	% fix/calibration_crc
+	\newcommand{\fixx}{9}
+	\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
+	\psline[linewidth=2pt,linecolor=\clr](\fixx,4)(\fixx,6)
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,6)(\masterx,7)
+	\multido{\nA=4+2}{2}{
+		\psset{fillcolor=\clr}
+		\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,\nA)
+	}
+	% feature/dynamic_monitoring
+	\renewcommand{\fixx}{11}
+	\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
+	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,4)(\fixx,12)
+	\psset{fillcolor=\clr}
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,4)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,6)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,8)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,10)
+	% release/NAR_C0
+	\renewcommand{\fixx}{5}
+	\psline[linewidth=1pt,linecolor=\bclr,linestyle=dashed](\fixx,8)(\fixx,14)
+	\psline[linewidth=2pt,linecolor=\hclr](\masterx,8)(\fixx,9)
+	\psline[linewidth=2pt,linecolor=\hclr](\fixx,9)(\fixx,13)
+	\rput(\fixx,14.5){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\bclr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\bclr}{release/NAR\_C0}}
+	}
+	\psset{fillcolor=\hclr}
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,9)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,11)
+	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,13)
+\end{pspicture}

title.tex

@@ -1,4 +1,4 @@
-\newcommand{\docname}{HowTo}
+\newcommand{\docname}{Release Process}
-\newcommand{\prjname}{arch linux on raspberry pi}
+\newcommand{\prjname}{Agricola}
 \newcommand{\docversion}{0.1}
 \newcommand{\docauthor}{Thomas Klaehn}